From abb10975d6920bc6e96fff8f3a8b2d92261a18fe Mon Sep 17 00:00:00 2001
From: Ross Burton <ross@openedhand.com>
Date: Tue, 8 Apr 2008 14:33:40 +0000
Subject: glib-2.0: upgrade to 2.16.3
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4197 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
meta/conf/distro/poky.conf | 4 +-
.../glib-2.0-2.16.1/configure-libtool.patch | 29 -------------
.../glib-2.0-2.16.1/glib-gettextize-dir.patch | 11 -----
.../glib-2.0-2.16.3/configure-libtool.patch | 29 +++++++++++++
.../glib-2.0-2.16.3/glib-gettextize-dir.patch | 11 +++++
meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb | 50 ----------------------
meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb | 50 ++++++++++++++++++++++
meta/packages/glib-2.0/glib-2.0_2.16.1.bb | 7 ---
meta/packages/glib-2.0/glib-2.0_2.16.3.bb | 7 +++
9 files changed, 99 insertions(+), 99 deletions(-)
delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch
delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch
create mode 100644 meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch
create mode 100644 meta/packages/glib-2.0/glib-2.0-2.16.3/glib-gettextize-dir.patch
delete mode 100644 meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb
create mode 100644 meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb
delete mode 100644 meta/packages/glib-2.0/glib-2.0_2.16.1.bb
create mode 100644 meta/packages/glib-2.0/glib-2.0_2.16.3.bb
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 757007c00..3f789e6cb 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -206,8 +206,8 @@ PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1"
PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
PREFERRED_VERSION_sato-icon-theme ?= "0.4.1"
-PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
-PREFERRED_VERSION_glib-2.0-native ?= "2.16.1"
+PREFERRED_VERSION_glib-2.0 ?= "2.16.3"
+PREFERRED_VERSION_glib-2.0-native ?= "2.16.3"
PREFERRED_VERSION_atk ?= "1.20.0"
PREFERRED_VERSION_cairo ?= "1.4.14"
PREFERRED_VERSION_pango ?= "1.18.3"
diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch
deleted file mode 100644
index a52327c8c..000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
-+++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
-@@ -1174,7 +1174,7 @@
- G_MODULE_LDFLAGS=
- else
- export SED
-- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
- fi
- dnl G_MODULE_IMPL= don't reset, so cmd-line can override
- G_MODULE_NEED_USCORE=0
-@@ -1265,7 +1265,7 @@
- LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
- dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
- echo "void glib_plugin_test(void) { }" > plugin.c
-- ${SHELL} ./libtool --mode=compile ${CC} -shared \
-+ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
- -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
- AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
- glib_cv_rtldglobal_broken,[
-@@ -1339,7 +1339,7 @@
-
- AC_MSG_CHECKING(for the suffix of shared libraries)
- export SED
--shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-+shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
- eval $shrext_cmds
- module=yes eval std_shrext=$shrext_cmds
- # chop the initial dot
diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch
deleted file mode 100644
index efe332557..000000000
--- a/meta/packages/glib-2.0/glib-2.0-2.16.1/glib-gettextize-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100
-+++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100
-@@ -49,7 +49,7 @@
- ;;
- esac
-
--gettext_dir=$prefix/share/glib-2.0/gettext
-+gettext_dir=@datadir@/glib-2.0/gettext
-
- while test $# -gt 0; do
- case "$1" in
diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch
new file mode 100644
index 000000000..a52327c8c
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch
@@ -0,0 +1,29 @@
+--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100
+@@ -1174,7 +1174,7 @@
+ G_MODULE_LDFLAGS=
+ else
+ export SED
+- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ fi
+ dnl G_MODULE_IMPL= don't reset, so cmd-line can override
+ G_MODULE_NEED_USCORE=0
+@@ -1265,7 +1265,7 @@
+ LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
+ dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
+ echo "void glib_plugin_test(void) { }" > plugin.c
+- ${SHELL} ./libtool --mode=compile ${CC} -shared \
++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \
+ -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
+ AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
+ glib_cv_rtldglobal_broken,[
+@@ -1339,7 +1339,7 @@
+
+ AC_MSG_CHECKING(for the suffix of shared libraries)
+ export SED
+-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='`
+ eval $shrext_cmds
+ module=yes eval std_shrext=$shrext_cmds
+ # chop the initial dot
diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.3/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.3/glib-gettextize-dir.patch
new file mode 100644
index 000000000..efe332557
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.16.3/glib-gettextize-dir.patch
@@ -0,0 +1,11 @@
+--- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100
++++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100
+@@ -49,7 +49,7 @@
+ ;;
+ esac
+
+-gettext_dir=$prefix/share/glib-2.0/gettext
++gettext_dir=@datadir@/glib-2.0/gettext
+
+ while test $# -gt 0; do
+ case "$1" in
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb b/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb
deleted file mode 100644
index b26480dd0..000000000
--- a/meta/packages/glib-2.0/glib-2.0-native_2.16.1.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "GLib is a general-purpose utility library, \
-which provides many useful data types, macros, \
-type conversions, string utilities, file utilities, a main \
-loop abstraction, and so on. It works on many \
-UNIX-like platforms, Windows, OS/2 and BeOS."
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS += "gtk-doc-native"
-PR="r2"
-
-SRC_URI = "http://download.gnome.org/sources/glib/2.16/glib-${PV}.tar.bz2 \
- file://glib-gettextize-dir.patch;patch=1 \
- file://configure-libtool.patch;patch=1 \
- file://glibconfig-sysdefs.h"
-
-S = "${WORKDIR}/glib-${PV}"
-
-inherit autotools pkgconfig native gettext
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
-
-acpaths = ""
-do_configure_prepend () {
- install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
-}
-
-do_stage () {
- install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
- install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
- install -m 0755 glib-gettextize ${STAGING_BINDIR}/
- oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
- autotools_stage_includes
- install -d ${STAGING_INCDIR}/glib-2.0/glib
- install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
- install -d ${STAGING_DATADIR}/aclocal
- install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
- install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
- install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
- install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
- install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
-}
-
-do_install () {
- :
-}
-
diff --git a/meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb b/meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb
new file mode 100644
index 000000000..b26480dd0
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-native_2.16.3.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "GLib is a general-purpose utility library, \
+which provides many useful data types, macros, \
+type conversions, string utilities, file utilities, a main \
+loop abstraction, and so on. It works on many \
+UNIX-like platforms, Windows, OS/2 and BeOS."
+LICENSE = "LGPL"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS += "gtk-doc-native"
+PR="r2"
+
+SRC_URI = "http://download.gnome.org/sources/glib/2.16/glib-${PV}.tar.bz2 \
+ file://glib-gettextize-dir.patch;patch=1 \
+ file://configure-libtool.patch;patch=1 \
+ file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/glib-${PV}"
+
+inherit autotools pkgconfig native gettext
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-2.0-${PV}"
+
+acpaths = ""
+do_configure_prepend () {
+ install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
+}
+
+do_stage () {
+ install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
+ install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
+ install -m 0755 glib-gettextize ${STAGING_BINDIR}/
+ oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+ autotools_stage_includes
+ install -d ${STAGING_INCDIR}/glib-2.0/glib
+ install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+ install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+ install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+ install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+ install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
+}
+
+do_install () {
+ :
+}
+
diff --git a/meta/packages/glib-2.0/glib-2.0_2.16.1.bb b/meta/packages/glib-2.0/glib-2.0_2.16.1.bb
deleted file mode 100644
index 7ac48e14f..000000000
--- a/meta/packages/glib-2.0/glib-2.0_2.16.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require glib.inc
-
-PR = "r1"
-
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
- file://glibconfig-sysdefs.h \
- file://configure-libtool.patch;patch=1"
diff --git a/meta/packages/glib-2.0/glib-2.0_2.16.3.bb b/meta/packages/glib-2.0/glib-2.0_2.16.3.bb
new file mode 100644
index 000000000..7ac48e14f
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0_2.16.3.bb
@@ -0,0 +1,7 @@
+require glib.inc
+
+PR = "r1"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
+ file://glibconfig-sysdefs.h \
+ file://configure-libtool.patch;patch=1"
--
cgit v1.2.3