From 7ea7a1d8e4f88426e290575a2639b6ab1c1eab2b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sat, 4 Aug 2007 09:52:03 +0000 Subject: Upgrade glib git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2358 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch | 40 ---------------------- .../glib-2.0-2.13.7/configure-libtool.patch | 29 ---------------- .../glib-2.0-2.14.0/configure-libtool.patch | 29 ++++++++++++++++ meta/packages/glib-2.0/glib-2.0_2.13.7.bb | 8 ----- meta/packages/glib-2.0/glib-2.0_2.14.0.bb | 5 +++ 5 files changed, 34 insertions(+), 77 deletions(-) delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch delete mode 100644 meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch create mode 100644 meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch delete mode 100644 meta/packages/glib-2.0/glib-2.0_2.13.7.bb create mode 100644 meta/packages/glib-2.0/glib-2.0_2.14.0.bb (limited to 'meta/packages') diff --git a/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch b/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch deleted file mode 100644 index d48072e202..0000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: glib/gthread.c -=================================================================== ---- glib/gthread.c (revision 5636) -+++ glib/gthread.c (revision 5639) -@@ -223,11 +223,11 @@ - g_once_init_leave (volatile gsize *value_location, - gsize initialization_value) - { -- g_return_if_fail (g_atomic_pointer_get (value_location) == 0); -+ g_return_if_fail (g_atomic_pointer_get ((void**) value_location) == 0); - g_return_if_fail (initialization_value != 0); - g_return_if_fail (g_once_init_list != NULL); - -- g_atomic_pointer_set (value_location, initialization_value); -+ g_atomic_pointer_set ((void**) value_location, (void*) initialization_value); - g_mutex_lock (g_once_mutex); - g_once_init_list = g_slist_remove (g_once_init_list, (void*) value_location); - g_cond_broadcast (g_once_cond); -@@ -255,7 +255,7 @@ - g_mutex_lock (g_once_mutex); - - if (!(*mutex)) -- g_atomic_pointer_set (mutex, g_mutex_new()); -+ g_atomic_pointer_set ((void**) mutex, g_mutex_new()); - - g_mutex_unlock (g_once_mutex); - -Index: glib/gthread.h -=================================================================== ---- glib/gthread.h (revision 5636) -+++ glib/gthread.h (revision 5639) -@@ -332,7 +332,7 @@ - G_INLINE_FUNC gboolean - g_once_init_enter (volatile gsize *value_location) - { -- if G_LIKELY (g_atomic_pointer_get (value_location) !=0) -+ if G_LIKELY (g_atomic_pointer_get ((void**) value_location) !=0) - return FALSE; - else - return g_once_init_enter_impl (value_location); diff --git a/meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch deleted file mode 100644 index a52327c8c9..0000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.13.7/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.14.0/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch new file mode 100644 index 0000000000..a52327c8c9 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.14.0/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.13.7.bb b/meta/packages/glib-2.0/glib-2.0_2.13.7.bb deleted file mode 100644 index 7542ed2e14..0000000000 --- a/meta/packages/glib-2.0/glib-2.0_2.13.7.bb +++ /dev/null @@ -1,8 +0,0 @@ -require glib.inc - -PR = "r1" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.13/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ - file://casts.patch;patch=1;pnum=0" diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.0.bb b/meta/packages/glib-2.0/glib-2.0_2.14.0.bb new file mode 100644 index 0000000000..995efbd119 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0_2.14.0.bb @@ -0,0 +1,5 @@ +require glib.inc + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" -- cgit v1.2.3