From 76d54d6d937be68ce5e3e6f69f1a1c7841e4de4b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sun, 27 Jul 2008 16:35:21 +0000 Subject: glib-2.0: upgrade to 2.16.5 git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4964 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/conf/distro/include/poky-fixed-revisions.inc | 4 +-- .../glib-2.0-2.16.4/configure-libtool.patch | 34 ---------------------- .../glib-2.0-2.16.4/glib-gettextize-dir.patch | 11 ------- .../glib-2.0-2.16.5/configure-libtool.patch | 34 ++++++++++++++++++++++ .../glib-2.0-2.16.5/glib-gettextize-dir.patch | 11 +++++++ meta/packages/glib-2.0/glib-2.0_2.16.4.bb | 7 ----- meta/packages/glib-2.0/glib-2.0_2.16.5.bb | 7 +++++ 7 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.16.4/glib-gettextize-dir.patch create mode 100644 meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch create mode 100644 meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch delete mode 100644 meta/packages/glib-2.0/glib-2.0_2.16.4.bb create mode 100644 meta/packages/glib-2.0/glib-2.0_2.16.5.bb diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 7ef62ae76..2083ab754 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc @@ -143,8 +143,8 @@ PREFERRED_VERSION_libmatchbox ?= "1.9" PREFERRED_VERSION_gtk-sato-engine ?= "0.3.1" PREFERRED_VERSION_matchbox-theme-sato ?= "0.1" -PREFERRED_VERSION_glib-2.0 ?= "2.16.4" -PREFERRED_VERSION_glib-2.0-native ?= "2.16.4" +PREFERRED_VERSION_glib-2.0 ?= "2.16.5" +PREFERRED_VERSION_glib-2.0-native ?= "2.16.5" PREFERRED_VERSION_atk ?= "1.20.0" PREFERRED_VERSION_cairo ?= "1.6.4" PREFERRED_VERSION_pango ?= "1.18.3" diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch deleted file mode 100644 index 3ba79b898..000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch +++ /dev/null @@ -1,34 +0,0 @@ -# Poky renames libtool to $host_alias-libtool. -# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 -# so we can't call # it at this point. We can safely assume a version is available -# from PATH though - ---- 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.4/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.4/glib-gettextize-dir.patch deleted file mode 100644 index efe332557..000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.16.4/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.5/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch new file mode 100644 index 000000000..3ba79b898 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch @@ -0,0 +1,34 @@ +# Poky renames libtool to $host_alias-libtool. +# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 +# so we can't call # it at this point. We can safely assume a version is available +# from PATH though + +--- 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.5/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch new file mode 100644 index 000000000..efe332557 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.16.5/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_2.16.4.bb b/meta/packages/glib-2.0/glib-2.0_2.16.4.bb deleted file mode 100644 index 0a009e6da..000000000 --- a/meta/packages/glib-2.0/glib-2.0_2.16.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require glib.inc - -PR = "r2" - -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.5.bb b/meta/packages/glib-2.0/glib-2.0_2.16.5.bb new file mode 100644 index 000000000..0a009e6da --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0_2.16.5.bb @@ -0,0 +1,7 @@ +require glib.inc + +PR = "r2" + +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