deleted file mode 100644
@@ -1,26 +0,0 @@
---- glib-2.30.0/tests/threadpool-test.c.orig 2011-09-28 16:04:18.011953746 +0200
-+++ glib-2.30.0/tests/threadpool-test.c 2011-09-28 16:04:59.153608739 +0200
-@@ -5,8 +5,8 @@
-
- #include <glib.h>
-
--#define DEBUG_MSG(x)
--/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */
-+/*#define DEBUG_MSG(x)*/
-+ #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
-
- #define WAIT 5 /* seconds */
- #define MAX_THREADS 10
-@@ -130,10 +130,10 @@
- test_count_threads () == 0)
- break;
-
-- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
-+ DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
-
- /* Some time for threads to die. */
-- g_usleep (G_USEC_PER_SEC);
-+ g_usleep (5 * G_USEC_PER_SEC);
- }
-
- DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
deleted file mode 100644
@@ -1,24 +0,0 @@
-fix g_once_init_enter compile failure
-
-Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded
-back in the 2.22 timeframe. It appears to still be present in 2.27.
-
-http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg005
-
-Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-
-Upstream-Status: Pending
-
-Index: glib-2.27.5/glib/gthread.h
-===================================================================
---- glib-2.27.5.orig/glib/gthread.h
-+++ glib-2.27.5/glib/gthread.h
-@@ -344,7 +344,7 @@ void g_once_init_leav
- G_INLINE_FUNC gboolean
- g_once_init_enter (volatile gsize *value_location)
- {
-- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL)
-+ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL)
- return FALSE;
- else
- return g_once_init_enter_impl (value_location);
similarity index 100%
rename from recipes/glib/glib-2.30.3/0005-glib-mkenums-interpreter.patch.patch
rename to recipes/glib/glib-2.34.0/0005-glib-mkenums-interpreter.patch.patch
new file mode 100644
@@ -0,0 +1,24 @@
+--- glib-2.34.0/tests/threadpool-test.c.orig 2012-10-10 13:13:53.705427296 +0200
++++ glib-2.34.0/tests/threadpool-test.c 2012-10-10 13:13:53.705427296 +0200
+@@ -5,7 +5,7 @@
+
+ #include <glib.h>
+
+-/* #define DEBUG 1 */
++#define DEBUG 1
+
+ #ifdef DEBUG
+ # define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n");
+@@ -113,10 +113,10 @@
+ if (g_thread_pool_get_num_unused_threads () == 0)
+ break;
+
+- DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
++ DEBUG_MSG (("[unused] waiting FIVE seconds for threads to die"));
+
+ /* Some time for threads to die. */
+- g_usleep (G_USEC_PER_SEC);
++ g_usleep (5 * G_USEC_PER_SEC);
+ }
+
+ DEBUG_MSG (("[unused] stopped idle threads, %d remain",
similarity index 47%
rename from recipes/glib/glib-2.30.3/configure-libtool.patch
rename to recipes/glib/glib-2.34.0/configure-libtool.patch
@@ -1,7 +1,6 @@
-diff -uri glib-2.26.1.orig/configure.ac glib-2.26.1/configure.ac
---- glib-2.26.1.orig/configure.ac 2010-11-14 06:59:52.000000000 +0100
-+++ glib-2.26.1/configure.ac 2010-12-01 16:48:16.653342967 +0100
-@@ -1386,7 +1386,7 @@
+--- glib-2.34.0.orig/configure.ac.org 2012-10-10 13:08:39.413662089 +0200
++++ glib-2.34.0/configure.ac 2012-10-10 13:09:09.642022583 +0200
+@@ -1477,7 +1477,7 @@
G_MODULE_LDFLAGS=
else
export SED
@@ -10,21 +9,29 @@ diff -uri glib-2.26.1.orig/configure.ac glib-2.26.1/configure.ac
fi
dnl G_MODULE_IMPL= don't reset, so cmd-line can override
G_MODULE_NEED_USCORE=0
-@@ -1451,7 +1451,7 @@
+@@ -1542,13 +1542,13 @@
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
+- ${SHELL} ./libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
++ ${SHELL} $host_alias-libtool --mode=compile --tag=CC ${CC} ${CFLAGS} \
+ ${CPPFLAGS} -c -o plugin.lo plugin.c >/dev/null 2>&1
+- ${SHELL} ./libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
++ ${SHELL} $host_alias-libtool --mode=link --tag=CC ${CC} ${CFLAGS} \
+ ${LDFLAGS} -module -o plugin.la -export-dynamic \
+ -shrext ".o" -avoid-version plugin.lo \
+ -rpath /dont/care >/dev/null 2>&1
+- eval `./libtool --config | grep ^objdir`
++ eval `$host_alias-libtool --config | grep ^objdir`
AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
glib_cv_rtldglobal_broken,[
-@@ -1525,7 +1525,7 @@
+ AC_TRY_RUN([
+@@ -1621,7 +1621,7 @@
AC_MSG_CHECKING(for the suffix of module shared libraries)
export SED
-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
-+shrext_cmds=`${host_prefix}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
similarity index 100%
rename from recipes/glib/glib-2.30.3/glibconfig-sysdefs.h
rename to recipes/glib/glib-2.34.0/glibconfig-sysdefs.h
@@ -29,6 +29,7 @@ do_install[postfuncs] += "do_install_unmangle"
do_install_unmangle() {
sed -i -e s:${STAGE_DIR}/native${stage_bindir}:${bindir}:g \
${D}${bindir}/glib-mkenums || true
+ rm -r ${D}${datadir}/bash-completion/completions/
}
PACKAGES =+ "${PN}-utils ${PN}-gdb"
deleted file mode 120000
@@ -1 +0,0 @@
-glib-2.30.3
\ No newline at end of file
new file mode 120000
@@ -0,0 +1 @@
+glib-2.34.0/
\ No newline at end of file
deleted file mode 120000
@@ -1 +0,0 @@
-glib_2.30.3.oe.sig
\ No newline at end of file
similarity index 80%
rename from recipes/glib/glib-initial_2.30.3.oe
rename to recipes/glib/glib-initial_2.34.0.oe
@@ -4,9 +4,8 @@ LICENSE = "LGPL-2.0+"
require ${PN}.inc
SRC_URI += "file://glibconfig-sysdefs.h"
-SRC_URI += "file://configure-libtool.patch"
+#SRC_URI += "file://configure-libtool.patch"
SRC_URI += "file://60_wait-longer-for-threads-to-die.patch"
-SRC_URI += "file://g_once_init_enter.patch"
SRC_URI += "file://0005-glib-mkenums-interpreter.patch.patch"
do_patch[postfuncs] += "do_patch_extra_files"
new file mode 100644
@@ -0,0 +1 @@
+f695d4d3a6ded331e4d45f077a9774d6ca8a47e4 glib-2.34.0.tar.xz
deleted file mode 100644
@@ -1,2 +0,0 @@
-dfb91843185927376df8c2552488f3dffb0548a0 glib-2.30.0.tar.bz2
-ec97dd659862dca05d18093a6ea6c309dcff0cdd glib-2.30.3.tar.xz
similarity index 80%
rename from recipes/glib/glib_2.30.3.oe
rename to recipes/glib/glib_2.34.0.oe
@@ -4,9 +4,7 @@ LICENSE = "LGPL-2.0+"
require ${PN}.inc
SRC_URI += "file://glibconfig-sysdefs.h"
-SRC_URI += "file://configure-libtool.patch"
SRC_URI += "file://60_wait-longer-for-threads-to-die.patch"
-SRC_URI += "file://g_once_init_enter.patch"
SRC_URI += "file://0005-glib-mkenums-interpreter.patch.patch"
do_patch[postfuncs] += "do_patch_extra_files"