diff options
Diffstat (limited to 'recipes/glib-2.0')
68 files changed, 791 insertions, 1661 deletions
diff --git a/recipes/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch deleted file mode 100644 index 50ffc628db..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.12.10/configure-libtool.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /tmp/configure.in 2007-02-04 12:07:05.000000000 +0100 -+++ glib-2.12.9/configure.in 2007-02-04 12:08:04.655251000 +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 -@@ -1239,7 +1239,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,[ diff --git a/recipes/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch deleted file mode 100644 index 50ffc628db..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.12.11/configure-libtool.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /tmp/configure.in 2007-02-04 12:07:05.000000000 +0100 -+++ glib-2.12.9/configure.in 2007-02-04 12:08:04.655251000 +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 -@@ -1239,7 +1239,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,[ diff --git a/recipes/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch deleted file mode 100644 index bfec12eec9..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.12.13/configure-libtool.patch +++ /dev/null @@ -1,11 +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 diff --git a/recipes/glib-2.0/glib-2.0-2.12.9/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.12.9/configure-libtool.patch deleted file mode 100644 index 50ffc628db..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.12.9/configure-libtool.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /tmp/configure.in 2007-02-04 12:07:05.000000000 +0100 -+++ glib-2.12.9/configure.in 2007-02-04 12:08:04.655251000 +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 -@@ -1239,7 +1239,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,[ diff --git a/recipes/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch deleted file mode 100644 index a52327c8c9..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.14.0/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/recipes/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch b/recipes/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch deleted file mode 100644 index ea2b41e900..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.14.0/gcc-4.2-inline-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: glib-2.12.9/glib/gutils.h -=================================================================== ---- glib-2.12.9.orig/glib/gutils.h 2007-10-07 19:13:53.000000000 +0200 -+++ glib-2.12.9/glib/gutils.h 2007-10-07 19:15:04.000000000 +0200 -@@ -97,7 +97,11 @@ - # define G_INLINE_FUNC - # undef G_CAN_INLINE - #elif defined (__GNUC__) --# define G_INLINE_FUNC extern inline -+# if defined (__GNUC_GNU_INLINE__) -+# define G_INLINE_FUNC extern __attribute__((gnu_inline)) inline -+# else -+# define G_INLINE_FUNC extern inline -+# endif - #elif defined (G_CAN_INLINE) - # define G_INLINE_FUNC static inline - #else /* can't inline */ diff --git a/recipes/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.14.1/configure-libtool.patch deleted file mode 100644 index a52327c8c9..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.14.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/recipes/glib-2.0/glib-2.0-2.14.1/gcc-4.2-inline-fix.patch b/recipes/glib-2.0/glib-2.0-2.14.1/gcc-4.2-inline-fix.patch deleted file mode 100644 index ea2b41e900..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.14.1/gcc-4.2-inline-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: glib-2.12.9/glib/gutils.h -=================================================================== ---- glib-2.12.9.orig/glib/gutils.h 2007-10-07 19:13:53.000000000 +0200 -+++ glib-2.12.9/glib/gutils.h 2007-10-07 19:15:04.000000000 +0200 -@@ -97,7 +97,11 @@ - # define G_INLINE_FUNC - # undef G_CAN_INLINE - #elif defined (__GNUC__) --# define G_INLINE_FUNC extern inline -+# if defined (__GNUC_GNU_INLINE__) -+# define G_INLINE_FUNC extern __attribute__((gnu_inline)) inline -+# else -+# define G_INLINE_FUNC extern inline -+# endif - #elif defined (G_CAN_INLINE) - # define G_INLINE_FUNC static inline - #else /* can't inline */ diff --git a/recipes/glib-2.0/glib-2.0-2.14.4/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.14.4/configure-libtool.patch deleted file mode 100644 index a52327c8c9..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.14.4/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/recipes/glib-2.0/glib-2.0-2.14.4/gcc-4.2-inline-fix.patch b/recipes/glib-2.0/glib-2.0-2.14.4/gcc-4.2-inline-fix.patch deleted file mode 100644 index ea2b41e900..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.14.4/gcc-4.2-inline-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: glib-2.12.9/glib/gutils.h -=================================================================== ---- glib-2.12.9.orig/glib/gutils.h 2007-10-07 19:13:53.000000000 +0200 -+++ glib-2.12.9/glib/gutils.h 2007-10-07 19:15:04.000000000 +0200 -@@ -97,7 +97,11 @@ - # define G_INLINE_FUNC - # undef G_CAN_INLINE - #elif defined (__GNUC__) --# define G_INLINE_FUNC extern inline -+# if defined (__GNUC_GNU_INLINE__) -+# define G_INLINE_FUNC extern __attribute__((gnu_inline)) inline -+# else -+# define G_INLINE_FUNC extern inline -+# endif - #elif defined (G_CAN_INLINE) - # define G_INLINE_FUNC static inline - #else /* can't inline */ diff --git a/recipes/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.15.6/configure-libtool.patch deleted file mode 100644 index a52327c8c9..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.15.6/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/recipes/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.16.1/configure-libtool.patch deleted file mode 100644 index a52327c8c9..0000000000 --- a/recipes/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/recipes/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch b/recipes/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch deleted file mode 100644 index b21851bd63..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -Stole from gentoo bugzilla -http://bugs.gentoo.org/show_bug.cgi?id=156475 - -Lets this work with gcc 4.2/4.3 --Khem -Index: glib-2.16.1/glib/gutils.h -=================================================================== ---- glib-2.16.1.orig/glib/gutils.h 2008-03-10 17:31:56.000000000 -0700 -+++ glib-2.16.1/glib/gutils.h 2008-06-04 15:19:12.000000000 -0700 -@@ -96,13 +96,14 @@ - #ifdef G_IMPLEMENT_INLINES - # define G_INLINE_FUNC - # undef G_CAN_INLINE --#elif defined (__GNUC__) --# ifdef __GNUC_STDC_INLINE__ --# define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__)) -+#elif defined (__GNUC__) -+# if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \ -+ && __STDC_VERSION__ >= 199901L -+# define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__)) - # else --# define G_INLINE_FUNC extern inline -+# define G_INLINE_FUNC extern __inline - # endif --#elif defined (G_CAN_INLINE) -+#elif defined (G_CAN_INLINE) - # define G_INLINE_FUNC static inline - #else /* can't inline */ - # define G_INLINE_FUNC diff --git a/recipes/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch b/recipes/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch deleted file mode 100644 index 36c9d15908..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.16.1/hurd-arg-max.patch +++ /dev/null @@ -1,76 +0,0 @@ -Source: http://bugzilla.gnome.org/show_bug.cgi?id=522335 - -This patch fixes the following error. - -| make[4]: Entering directory `/home/khem/oe/build/eglibc/tmp-qemuarm/work/armv5te-angstrom-linux-gnueabi/glib-2.0-2.16.1-r3/glib-2.16.1/glib' -| if ccache arm-angstrom-linux-gnueabi-gcc -march=armv5te -mtune=arm926ej-s -DHAVE_CONFIG_H -I. -I. -I.. -I.. -DG_LOG_DOMAIN=\"GLib\" -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -DPCRE_STATIC -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -pthread -isystem/home/khem/oe/build/eglibc/tmp-qemuarm/staging/arm-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -Wall -MT gtester.o -MD -MP -MF ".deps/gtester.Tpo" -c -o gtester.o gtester.c; \ -| then mv -f ".deps/gtester.Tpo" ".deps/gtester.Po"; else rm -f ".deps/gtester.Tpo"; exit 1; fi -| gtester.c: In function 'launch_test_binary': -| gtester.c:276: error: 'ARG_MAX' undeclared (first use in this function) -| gtester.c:276: error: (Each undeclared identifier is reported only once -| gtester.c:276: error: for each function it appears in.) -| gtester.c:276: warning: unused variable 'argv' -| make[4]: *** [gtester.o] Error 1 - - -Index: glib-2.16.1/glib/gtester.c -=================================================================== ---- glib-2.16.1.orig/glib/gtester.c (Revision 6750) -+++ glib-2.16.1/glib/gtester.c (Arbeitskopie) -@@ -273,7 +273,8 @@ - GTestLogBuffer *tlb; - GSList *slist, *free_list = NULL; - GError *error = NULL; -- const gchar *argv[ARG_MAX]; -+ int argc = 0; -+ const gchar **argv; - GPid pid = 0; - gint report_pipe[2] = { -1, -1 }; - guint child_report_cb_id = 0; -@@ -289,7 +290,34 @@ - return FALSE; - } - -+ /* setup argc */ -+ for (slist = subtest_args; slist; slist = slist->next) -+ argc++; -+ /* argc++; */ -+ if (subtest_quiet) -+ argc++; -+ if (subtest_verbose) -+ argc++; -+ if (!subtest_mode_fatal) -+ argc++; -+ if (subtest_mode_quick) -+ argc++; -+ else -+ argc++; -+ if (subtest_mode_perf) -+ argc++; -+ if (gtester_list_tests) -+ argc++; -+ if (subtest_seedstr) -+ argc++; -+ argc++; -+ if (skip_tests) -+ argc++; -+ for (slist = subtest_paths; slist; slist = slist->next) -+ argc++; -+ - /* setup argv */ -+ argv = g_malloc ((argc + 1) * sizeof(gchar *)); - argv[i++] = binary; - for (slist = subtest_args; slist; slist = slist->next) - argv[i++] = (gchar*) slist->data; -@@ -343,8 +371,10 @@ - else - g_warning ("Failed to execute test binary: %s: %s", argv[0], error->message); - g_clear_error (&error); -+ g_free (argv); - return FALSE; - } -+ g_free (argv); - - subtest_running = TRUE; - subtest_io_pending = TRUE; - diff --git a/recipes/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.16.4/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/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/recipes/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.16.5/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/recipes/glib-2.0/glib-2.0-2.18.0/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.18.0/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.0/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/recipes/glib-2.0/glib-2.0-2.18.1/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.18.1/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.1/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/recipes/glib-2.0/glib-2.0-2.18.3/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.18.3/atomic-thumb.patch deleted file mode 100644 index d7aa08821f..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.3/atomic-thumb.patch +++ /dev/null @@ -1,42 +0,0 @@ -# gatomic.c uses SWP, which doesn't work in Thumb mode. -# Put that source file into a separate convenience library which is always built as ARM. - -Index: glib-2.18.1/glib/Makefile.am -=================================================================== ---- glib-2.18.1/glib/Makefile.am 2008-09-18 00:33:57.000000000 +0200 -+++ glib-2.18.1/glib/Makefile.am 2008-11-08 10:13:27.000000000 +0100 -@@ -80,6 +80,7 @@ - galiasdef.c - - lib_LTLIBRARIES = libglib-2.0.la -+noinst_LTLIBRARIES = libgatomic.la - - if OS_WIN32_AND_DLL_COMPILATION - if MS_LIB_AVAILABLE -@@ -96,10 +97,14 @@ - uninstall-ms-lib: - $(uninstall_ms_lib_cmd) - -+libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb -+ -+libgatomic_la_SOURCES = \ -+ gatomic.c -+ - libglib_2_0_la_SOURCES = \ - garray.c \ - gasyncqueue.c \ -- gatomic.c \ - gbacktrace.c \ - gbase64.c \ - gbookmarkfile.c \ -@@ -286,8 +291,8 @@ - pcre_inc = - endif - --libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) --libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) -+libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) libgatomic.la -+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def) libgatomic.la - - libglib_2_0_la_LDFLAGS = \ - $(glib_win32_res_ldflag) \ diff --git a/recipes/glib-2.0/glib-2.0-2.18.3/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.18.3/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.18.3/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/recipes/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch b/recipes/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch deleted file mode 100644 index 02e9b5f25e..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.2.3/automake-lossage.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- glib-2.2.3/gobject/Makefile.am.old 2004-03-06 20:48:33.000000000 +0000 -+++ glib-2.2.3/gobject/Makefile.am 2004-03-06 20:50:58.000000000 +0000 -@@ -87,7 +87,7 @@ - gobject_private_h_sources = @STRIP_BEGIN@ \ - @STRIP_END@ - # GObject library C sources to build the library from --gobject_c_sources = @STRIP_BEGIN@ \ -+gobject_c_sources = \ - gboxed.c \ - gclosure.c \ - genums.c \ -@@ -102,8 +102,7 @@ - gvalue.c \ - gvaluearray.c \ - gvaluetransform.c \ -- gvaluetypes.c \ --@STRIP_END@ -+ gvaluetypes.c - - # we use our own built_sources variable rules to avoid automake's - # BUILT_SOURCES oddities -@@ -135,9 +134,9 @@ - # - gobject_target_headers = $(gobject_public_h_sources) $(gobject_built_public_sources) - gobject_target_sources = $(gobject_c_sources) --MAINTAINERCLEANFILES += $(gobject_built_sources) --EXTRA_HEADERS += --EXTRA_DIST += $(gobject_private_h_sources) $(gobject_extra_sources) -+MAINTAINERCLEANFILES = $(gobject_built_sources) -+EXTRA_HEADERS = -+EXTRA_DIST = $(gobject_private_h_sources) $(gobject_extra_sources) - EXTRA_DIST += $(gobject_built_sources) - - # -@@ -145,7 +144,7 @@ - # - # setup autogeneration dependancies - gen_sources = xgen-gmh xgen-gmc xgen-gms --CLEANFILES += $(gen_sources) -+CLEANFILES = $(gen_sources) - - $(libgobject_2_0_la_OBJECTS): $(gobject_built_sources) ${gobject_built_public_sources} # this is our oldest file, used for implicit auto-generation deps - # initial creation of the real stamp-* files diff --git a/recipes/glib-2.0/glib-2.0-2.2.3/configure.patch b/recipes/glib-2.0/glib-2.0-2.2.3/configure.patch deleted file mode 100644 index f6a04e34c5..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.2.3/configure.patch +++ /dev/null @@ -1,174 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- glib-2.1.3/configure.in~configure -+++ glib-2.1.3/configure.in -@@ -15,7 +15,9 @@ - cflags_set=${CFLAGS+set} - - # we rewrite this file -+if "x$cross_compiling" != xyes; then - rm -f glibconfig-sysdefs.h -+fi - - GLIB_AC_DIVERT_BEFORE_HELP([ - # -@@ -402,10 +404,13 @@ - fi - fi - -+AC_CHECK_LIBM -+LIBS="$LIBS $LIBM" -+ - dnl DU4 native cc currently needs -std1 for ANSI mode (instead of K&R) - AC_MSG_CHECKING([for extra flags to get ANSI library prototypes]) - glib_save_LIBS=$LIBS --LIBS="$LIBS -lm" -+#LIBS="$LIBS -lm" - AC_TRY_RUN([#include <math.h> - int main (void) { return (log(1) != log(1.)); }], - AC_MSG_RESULT(none needed), -@@ -417,8 +422,10 @@ - AC_MSG_RESULT() - CFLAGS=$glib_save_CFLAGS - AC_MSG_WARN( -- [No ANSI prototypes found in library. (-std1 didn't work.)]) -- ) -+ [No ANSI prototypes found in library. (-std1 didn't work.)]), -+ AC_MSG_RESULT() -+ ), -+ AC_MSG_RESULT([assuming none needed]) - ) - LIBS=$glib_save_LIBS - -@@ -844,18 +851,18 @@ - dnl *** strlcpy/strlcat *** - dnl **************************************** - # Check for strlcpy --AC_MSG_CHECKING(for OpenBSD strlcpy/strlcat) --AC_TRY_RUN([ --#include <string.h> --int main() { -- char *p = malloc (10); -- (void) strlcpy (p, "hi", 10); -- if (strlcat (p, "bye", 0) != 3) -- exit (1); -- return 0; --}], glib_ok=yes, glib_ok=no) --AC_MSG_RESULT($glib_ok) --if test "$glib_ok" = "yes"; then -+AC_CACHE_CHECK([for OpenBSD strlcpy/strlcat],[glib_cv_strlcpy], -+ AC_TRY_RUN([ -+ #include <string.h> -+ int main() { -+ char *p = malloc (10); -+ (void) strlcpy (p, "hi", 10); -+ if (strlcat (p, "bye", 0) != 3) -+ exit (1); -+ return 0; -+ }], glib_cv_strlcpy=yes, glib_cv_strlcpy=no) -+) -+if test "x$glib_cv_strlcpy" = xyes; then - AC_DEFINE(HAVE_STRLCPY,1,[Have functions strlcpy and strlcat]) - fi - -@@ -1302,16 +1309,15 @@ - for flag in pthread pthreads; do - glib_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -$flag" -- AC_TRY_RUN([#include <pthread.h> -+ AC_TRY_LINK([#include <pthread.h>],[ - int check_me = 0; - void* func(void* data) {return check_me = 42;} -- main() -- { pthread_t t; -+ pthread_t t; - void *ret; - pthread_create (&t, 0, func, 0); - pthread_join (t, &ret); - exit (check_me != 42 || ret != 42); -- }], -+ ], - [G_THREAD_CFLAGS=-$flag - G_THREAD_LIBS=-$flag]) - CFLAGS="$glib_save_CFLAGS" -@@ -1431,16 +1437,15 @@ - LIBS="$glib_save_LIBS $add_thread_lib" - - AC_MSG_CHECKING(for pthread_create/pthread_join$IN) -- AC_TRY_RUN([#include <pthread.h> -+ AC_TRY_LINK([#include <pthread.h>],[ - int check_me = 0; - void* func(void* data) {check_me = 42;} -- main() -- { pthread_t t; -+ pthread_t t; - void *ret; - pthread_create (&t, $defattr, func, 0); - pthread_join (t, &ret); - exit (check_me != 42); -- }], -+ ], - [AC_MSG_RESULT(yes) - G_THREAD_LIBS="$add_thread_lib" - break], -@@ -1466,12 +1471,11 @@ - LIBS="$glib_save_LIBS $add_thread_lib" - - AC_MSG_CHECKING(for sched_get_priority_min$IN) -- AC_TRY_RUN([#include <sched.h> -- #include <errno.h> -- int main() { -+ AC_TRY_LINK([#include <sched.h> -+ #include <errno.h>],[ - errno = 0; - return sched_get_priority_min(SCHED_OTHER)==-1 -- && errno != 0;}], -+ && errno != 0;], - [AC_MSG_RESULT(yes) - G_THREAD_LIBS="$G_THREAD_LIBS $add_thread_lib" - posix_priority_min="sched_get_priority_min(SCHED_OTHER)" -@@ -1636,7 +1640,8 @@ - AC_DEFINE_UNQUOTED(POSIX_YIELD_FUNC,$posix_yield_func,[The POSIX RT yield function]) - CPPFLAGS="$glib_save_CPPFLAGS" - -- AC_MSG_CHECKING(whether to use the PID niceness surrogate for thread priorities) -+ AC_CACHE_CHECK([whether to use the PID niceness surrogate for thread priorities], -+ [glib_cv_sys_use_pid_niceness_surrogate], - AC_TRY_RUN([#include <pthread.h> - #include <sys/types.h> - #include <unistd.h> -@@ -1651,10 +1656,12 @@ - exit (getpid()==other_pid || - $posix_priority_min != $posix_priority_max); - }], -- [AC_MSG_RESULT(yes) -- AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, [whether to use the PID niceness surrogate for thread priorities]) -- ], -- [AC_MSG_RESULT(no)]) -+ [ glib_cv_sys_use_pid_niceness_surrogate=yes ], -+ [ glib_cv_sys_use_pid_niceness_surrogate=no ]) -+ ) -+ if test x"$glib_cv_sys_use_pid_niceness_surrogate" = xyes; then -+ AC_DEFINE(G_THREAD_USE_PID_SURROGATE, 1, [whether to use the PID niceness surrogate for thread priorities]) -+ fi - elif test x"$have_threads" = xwin32; then - # It's a pointer to a private struct - GLIB_SIZEOF(,struct _GThreadData *, system_thread) -@@ -1717,12 +1724,14 @@ - dnl **************************************** - dnl *** GLib POLL* compatibility defines *** - dnl **************************************** -+if test x"$cross_compiling" != xyes; then - GLIB_SYSDEFS( - [#include <sys/types.h> - #include <sys/poll.h>], - POLLIN:1 POLLOUT:4 POLLPRI:2 POLLERR:8 POLLHUP:16 POLLNVAL:32, - glibconfig-sysdefs.h, - =) -+fi - - dnl ********************** - dnl *** Win32 API libs *** diff --git a/recipes/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h b/recipes/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h deleted file mode 100644 index 1329e7f21c..0000000000 --- a/recipes/glib-2.0/glib-2.0-2.2.3/glibconfig-sysdefs.h +++ /dev/null @@ -1,6 +0,0 @@ -#define GLIB_SYSDEF_POLLIN =1 -#define GLIB_SYSDEF_POLLOUT =4 -#define GLIB_SYSDEF_POLLPRI =2 -#define GLIB_SYSDEF_POLLERR =8 -#define GLIB_SYSDEF_POLLHUP =16 -#define GLIB_SYSDEF_POLLNVAL =32 diff --git a/recipes/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch b/recipes/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch new file mode 100644 index 0000000000..02fe9ff0ab --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch @@ -0,0 +1,26 @@ +--- glib/tests/threadpool-test.c.old 2008-02-12 06:11:21.000000000 +0100 ++++ glib/tests/threadpool-test.c 2008-02-12 06:11:52.000000000 +0100 +@@ -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 +@@ -124,10 +124,10 @@ + DEBUG_MSG (("[unused] stopping unused threads")); + g_thread_pool_stop_unused_threads (); + +- 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", + g_thread_pool_get_num_unused_threads (), diff --git a/recipes/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch b/recipes/glib-2.0/glib-2.0-2.24.1/atomic-thumb.patch index d7aa08821f..3c14fd048c 100644 --- a/recipes/glib-2.0/glib-2.0-2.18.1/atomic-thumb.patch +++ b/recipes/glib-2.0/glib-2.0-2.24.1/atomic-thumb.patch @@ -1,11 +1,10 @@ # gatomic.c uses SWP, which doesn't work in Thumb mode. # Put that source file into a separate convenience library which is always built as ARM. -Index: glib-2.18.1/glib/Makefile.am -=================================================================== ---- glib-2.18.1/glib/Makefile.am 2008-09-18 00:33:57.000000000 +0200 -+++ glib-2.18.1/glib/Makefile.am 2008-11-08 10:13:27.000000000 +0100 -@@ -80,6 +80,7 @@ +diff -uNr glib-2.23.6.orig//glib/Makefile.am glib-2.23.6/glib/Makefile.am +--- glib-2.23.6.orig//glib/Makefile.am 2010-03-21 19:05:08.000000000 +0100 ++++ glib-2.23.6/glib/Makefile.am 2010-03-26 11:52:49.000000000 +0100 +@@ -87,6 +87,7 @@ galiasdef.c lib_LTLIBRARIES = libglib-2.0.la @@ -13,23 +12,23 @@ Index: glib-2.18.1/glib/Makefile.am if OS_WIN32_AND_DLL_COMPILATION if MS_LIB_AVAILABLE -@@ -96,10 +97,14 @@ +@@ -103,10 +104,14 @@ uninstall-ms-lib: $(uninstall_ms_lib_cmd) +libgatomic_la_CFLAGS = $(CFLAGS) -mno-thumb + +libgatomic_la_SOURCES = \ -+ gatomic.c -+ ++ ${gatomic_c} ++ libglib_2_0_la_SOURCES = \ garray.c \ gasyncqueue.c \ -- gatomic.c \ +- $(gatomic_c) \ gbacktrace.c \ gbase64.c \ - gbookmarkfile.c \ -@@ -286,8 +291,8 @@ + gbitlock.c \ +@@ -315,8 +320,8 @@ pcre_inc = endif diff --git a/recipes/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch b/recipes/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch index 3ba79b8986..3ba79b8986 100644 --- a/recipes/glib-2.0/glib-2.0-2.16.3/configure-libtool.patch +++ b/recipes/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch diff --git a/recipes/glib-2.0/glib-2.0-2.24.1/g_once_init_enter.patch b/recipes/glib-2.0/glib-2.0-2.24.1/g_once_init_enter.patch new file mode 100644 index 0000000000..58e410884f --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.24.1/g_once_init_enter.patch @@ -0,0 +1,11 @@ +--- glib-2.22.1/glib/gthread.h.orig 2009-10-13 22:53:23.000000000 +0200 ++++ glib-2.22.1/glib/gthread.h 2009-10-13 23:34:59.000000000 +0200 +@@ -341,7 +341,7 @@ + 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); diff --git a/recipes/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch b/recipes/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch new file mode 100644 index 0000000000..5e8f836cb2 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch @@ -0,0 +1,13 @@ +Index: glib-2.23.6/glib/gatomic.h +=================================================================== +--- glib-2.23.6.orig/glib/gatomic.h 2010-03-29 13:01:28.000000000 +0400 ++++ glib-2.23.6/glib/gatomic.h 2010-03-29 13:01:35.000000000 +0400 +@@ -70,7 +70,7 @@ + (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval))) + # define g_atomic_pointer_get(atomic) \ + ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \ +- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic))) ++ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic))) + # define g_atomic_pointer_set(atomic, newval) \ + ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \ + (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval))) diff --git a/recipes/glib-2.0/glib-2.0-2.24.1/gatomic_armv6.patch b/recipes/glib-2.0/glib-2.0-2.24.1/gatomic_armv6.patch new file mode 100644 index 0000000000..b17f80dbab --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.24.1/gatomic_armv6.patch @@ -0,0 +1,260 @@ +--- glib-2.23.6.orig/configure.in ++++ glib-2.23.6/configure.in +@@ -2513,9 +2513,15 @@ + ;; + arm*) + AC_MSG_RESULT([arm]) +- AC_DEFINE_UNQUOTED(G_ATOMIC_ARM, 1, +- [arm atomic implementation]) +- glib_memory_barrier_needed=no ++ AC_MSG_CHECKING(arm atomic operations type) ++ AC_MSG_RESULT(inline asm) ++ AC_DEFINE_UNQUOTED(G_ATOMIC_ARM, 6, ++ [armv6 atomic implementation]) ++ glib_memory_barrier_needed=yes ++ dnl AC_MSG_RESULT(kernel helper) ++ dnl AC_DEFINE_UNQUOTED(G_ATOMIC_ARM_LINUX, 1, ++ dnl [special arm linux implementation]) ++ dnl glib_memory_barrier_needed=yes + ;; + crisv32*|etraxfs*) + AC_MSG_RESULT([crisv32]) +--- /tmp/gatomic.c 2009-08-27 02:08:32.000000000 +0530 ++++ glib-2.21.4/glib/gatomic.c 2009-08-27 02:08:49.000000000 +0530 +@@ -561,6 +561,7 @@ g_atomic_pointer_compare_and_exchange (v + # error "Your system has an unsupported pointer size" + # endif /* GLIB_SIZEOF_VOID_P */ + # elif defined (G_ATOMIC_ARM) ++# if (G_ATOMIC_ARM < 6) + static volatile int atomic_spin = 0; + + static int atomic_spin_trylock (void) +@@ -651,6 +652,218 @@ g_atomic_pointer_compare_and_exchange (v + + return result; + } ++ # else /* G_ATOMIC_ARM < 6 */ ++ gint ++ g_atomic_int_exchange_and_add (volatile gint *atomic, ++ gint val) ++ { ++ unsigned long result; ++ int old, tmp; ++ ++ do { ++ asm volatile ( ++ "ldrex %0, [%3]\n" ++ "add %1, %0, %4\n" ++ "strex %2, %1, [%3]\n" ++ : "=&r" (old), "=&r" (tmp), "=&r" (result) ++ : "r" (atomic), "Ir" (val) ++ : "cc", "memory"); ++ } while (result); ++ return old; ++ } ++ ++ void ++ g_atomic_int_add (volatile gint *atomic, ++ gint val) ++ { ++ unsigned long result; ++ int tmp; ++ ++ do { ++ asm volatile ( ++ "ldrex %0, [%2]\n" ++ "add %0, %0, %3\n" ++ "strex %1, %0, [%2]\n" ++ : "=&r" (tmp), "=&r" (result) ++ : "r" (atomic), "Ir" (val) ++ : "cc", "memory"); ++ } while (result); ++ } ++ ++ gboolean ++ g_atomic_int_compare_and_exchange (volatile gint *atomic, ++ gint oldval, ++ gint newval) ++ { ++ unsigned long result; ++ int old; ++ ++ asm volatile ( ++ "ldrex %1, [%2]\n" ++ "mov %0, #1\n" ++ "teq %1, %3\n" ++ "strexeq %0, %4, [%2]\n" ++ : "=&r" (result), "=&r" (old) ++ : "r" (atomic), "Ir" (oldval), "r" (newval) ++ : "cc", "memory"); ++ return (result) ? FALSE : TRUE; ++ } ++ ++ gboolean ++ g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic, ++ gpointer oldval, ++ gpointer newval) ++ { ++ unsigned long result; ++ void *old; ++ ++ asm volatile ( ++ "ldrex %1, [%2]\n" ++ "mov %0, #1\n" ++ "teq %1, %3\n" ++ "strexeq %0, %4, [%2]\n" ++ : "=&r" (result), "=&r" (old) ++ : "r" (atomic), "Ir" (oldval), "r" (newval) ++ : "cc", "memory"); ++ return (result) ? FALSE : TRUE; ++ } ++ ++ gint ++ (g_atomic_int_get) (volatile gint *atomic) ++ { ++ return *atomic; ++ } ++ ++ void ++ (g_atomic_int_set) (volatile gint *atomic, ++ gint newval) ++ { ++ unsigned long result; ++ ++ do { ++ asm volatile ( ++ "ldrex %0, [%1]\n" ++ "strex %0, %2, [%1]\n" ++ : "=&r" (result) ++ : "r" (atomic), "r" (newval) ++ : "cc", "memory"); ++ } while (result); ++ } ++ ++ gpointer ++ (g_atomic_pointer_get) (volatile gpointer *atomic) ++ { ++ return *atomic; ++ } ++ ++ void ++ (g_atomic_pointer_set) (volatile gpointer *atomic, ++ gpointer newval) ++ { ++ unsigned long result; ++ ++ do { ++ asm volatile ( ++ "ldrex %0, [%1]\n" ++ "strex %0, %2, [%1]\n" ++ : "=&r" (result) ++ : "r" (atomic), "r" (newval) ++ : "cc", "memory"); ++ } while (result); ++ } ++# endif /* G_ATOMIC_ARM < 6 */ ++ # elif defined(G_ATOMIC_ARM_LINUX) ++ /* use special helper functions provided by the linux kernel */ ++ ++ typedef void (_khelper_barrier_t)(void); ++ #define _khelper_barrier (*(_khelper_barrier_t *)0xffff0fa0) ++ #define G_ATOMIC_MEMORY_BARRIER _khelper_barrier() ++ /* scratchbox/qemu explodes on barrier */ ++ /*#define G_ATOMIC_MEMORY_BARRIER while(0)*/ ++ typedef int (_khelper_cmpxchg_t)(int oldval, int newval, volatile int *ptr); ++ #define _khelper_cmpxchg (*(_khelper_cmpxchg_t *)0xffff0fc0) ++ ++ gint ++ g_atomic_int_exchange_and_add (volatile gint *atomic, ++ gint val) ++ { ++ int result; ++ int old, new; ++ ++ do { ++ old = *atomic; ++ new = old + val; ++ result = _khelper_cmpxchg(old, new, atomic); ++ } while (result); ++ return old; ++ } ++ ++ void ++ g_atomic_int_add (volatile gint *atomic, ++ gint val) ++ { ++ int result; ++ int old, new; ++ ++ do { ++ old = *atomic; ++ new = old + val; ++ result = _khelper_cmpxchg(old, new, atomic); ++ } while (result); ++ } ++ ++ gboolean ++ g_atomic_int_compare_and_exchange (volatile gint *atomic, ++ gint oldval, ++ gint newval) ++ { ++ int result; ++ ++ result = _khelper_cmpxchg(oldval, newval, atomic); ++ return (result) ? FALSE : TRUE; ++ } ++ ++ gboolean ++ g_atomic_pointer_compare_and_exchange (volatile gpointer *atomic, ++ gpointer oldval, ++ gpointer newval) ++ { ++ int result; ++ ++ result = _khelper_cmpxchg(*((int *) &oldval), ++ *((int *) &newval), ++ (int *) atomic); ++ return (result) ? FALSE : TRUE; ++ } ++ ++ gint ++ (g_atomic_int_get) (volatile gint *atomic) ++ { ++ return *atomic; ++ } ++ ++ void ++ (g_atomic_int_set) (volatile gint *atomic, ++ gint newval) ++ { ++ while (_khelper_cmpxchg(*atomic, newval, atomic)); ++ } ++ ++ gpointer ++ (g_atomic_pointer_get) (volatile gpointer *atomic) ++ { ++ return *atomic; ++ } ++ ++ void ++ (g_atomic_pointer_set) (volatile gpointer *atomic, ++ gpointer newval) ++ { ++ while (_khelper_cmpxchg(*((int *) atomic), ++ *((int *) &newval), ++ (int *) atomic)); ++ } ++ + # elif defined (G_ATOMIC_CRIS) || defined (G_ATOMIC_CRISV32) + # ifdef G_ATOMIC_CRIS + # define CRIS_ATOMIC_INT_CMP_XCHG(atomic, oldval, newval) \ +@@ -954,7 +1167,8 @@ void + g_mutex_unlock (g_atomic_mutex); + } + #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */ +-#elif defined (G_ATOMIC_OP_MEMORY_BARRIER_NEEDED) ++#elif (defined (G_ATOMIC_OP_MEMORY_BARRIER_NEEDED) && \ ++ !defined(G_ATOMIC_ARM) && !defined(G_ATOMIC_ARM_LINUX)) + gint + (g_atomic_int_get) (volatile gint G_GNUC_MAY_ALIAS *atomic) + { diff --git a/recipes/glib-2.0/glib-2.0-2.24.1/gio.patch b/recipes/glib-2.0/glib-2.0-2.24.1/gio.patch new file mode 100644 index 0000000000..37cd300b2e --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.24.1/gio.patch @@ -0,0 +1,255 @@ +From: Jason Smith <jason.smith@canonical.com> +Subject: add new extension point in GIO for use with multiple applications + +I am providing here a patch for GIO which opens up a new extension point. This +extension point is useful to do quite a few things, however its primary target +is a window matching library called wncksync. Wncksync is used to match windows +by the XID to the .desktop file on the system they were launched from. With +this patch wncksync becomes incredibly accurate at doing this, having very few +flaws. Additionally the Zeitgeist developers are aware of this patch and intend +on using it to improve their application as well. + +I will keep this short as I am sure there will need to be a conversation here +about the patch, its implications, if and how to include it, and of course the +code itself. + +Cheers, +Jason + +https://bugzilla.gnome.org/show_bug.cgi?id=606960 + +--- + +*** a/gio/gdesktopappinfo.c 2009-10-16 23:57:29.436561111 -0400 +--- b/gio/gdesktopappinfo.c 2009-10-17 00:06:28.716984254 -0400 +*************** +*** 69,74 **** +--- 69,78 ---- + static void mime_info_cache_reload (const char *dir); + static gboolean g_desktop_app_info_ensure_saved (GDesktopAppInfo *info, + GError **error); ++ static void ++ g_desktop_app_info_launch_handler_on_launched (GDesktopAppInfoLaunchHandler *launch_handler, ++ const char *desktop_file_path, ++ gint pid); + + /** + * GDesktopAppInfo: +*************** +*** 859,864 **** +--- 863,907 ---- + g_setenv ("DESKTOP_STARTUP_ID", data->sn_id, TRUE); + } + ++ static void ++ g_desktop_app_info_on_launched (const char *desktop_file_path, gint pid) ++ { ++ static gsize lookup = 0; ++ ++ if (g_once_init_enter (&lookup)) ++ { ++ gsize setup_value = 1; ++ GDesktopAppInfoLaunchHandler *lookup_instance; ++ GIOExtensionPoint *ep; ++ GIOExtension *extension; ++ GList *l; ++ ++ /* Ensure vfs in modules loaded */ ++ _g_io_modules_ensure_loaded (); ++ ++ ep = g_io_extension_point_lookup (G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME); ++ ++ lookup_instance = NULL; ++ for (l = g_io_extension_point_get_extensions (ep); l != NULL; l = l->next) ++ { ++ extension = l->data; ++ lookup_instance = g_object_new (g_io_extension_get_type (extension), NULL); ++ if (lookup_instance != NULL) ++ break; ++ } ++ ++ if (lookup_instance != NULL) ++ setup_value = (gsize)lookup_instance; ++ ++ g_once_init_leave (&lookup, setup_value); ++ } ++ ++ if (lookup == 1) ++ return; ++ ++ g_desktop_app_info_launch_handler_on_launched (G_DESKTOP_APP_INFO_LAUNCH_HANDLER (lookup), desktop_file_path, pid); ++ } ++ + static gboolean + g_desktop_app_info_launch_uris (GAppInfo *appinfo, + GList *uris, +*************** +*** 910,922 **** + g_list_free (launched_files); + } + + if (!g_spawn_async (info->path, + argv, + NULL, + G_SPAWN_SEARCH_PATH, + child_setup, + &data, +! NULL, + error)) + { + if (data.sn_id) +--- 953,966 ---- + g_list_free (launched_files); + } + ++ gint pid; + if (!g_spawn_async (info->path, + argv, + NULL, + G_SPAWN_SEARCH_PATH, + child_setup, + &data, +! &pid, + error)) + { + if (data.sn_id) +*************** +*** 927,932 **** +--- 971,980 ---- + + goto out; + } ++ else ++ { ++ g_desktop_app_info_on_launched (info->filename, pid); ++ } + + g_free (data.sn_id); + g_free (data.display); +*************** +*** 2692,2696 **** +--- 2740,2806 ---- + return (* iface->get_default_for_uri_scheme) (lookup, uri_scheme); + } + ++ /* GDesktopAppInfoLaunchHandler interface: */ ++ ++ static void g_desktop_app_info_launch_handler_base_init (gpointer g_class); ++ static void g_desktop_app_info_launch_handler_class_init (gpointer g_class, ++ gpointer class_data); ++ ++ GType ++ g_desktop_app_info_launch_handler_get_type (void) ++ { ++ static volatile gsize g_define_type_id__volatile = 0; ++ ++ if (g_once_init_enter (&g_define_type_id__volatile)) ++ { ++ const GTypeInfo desktop_app_info_launch_handler_info = ++ { ++ sizeof (GDesktopAppInfoLaunchHandlerIface), /* class_size */ ++ g_desktop_app_info_launch_handler_base_init, /* base_init */ ++ NULL, /* base_finalize */ ++ g_desktop_app_info_launch_handler_class_init, ++ NULL, /* class_finalize */ ++ NULL, /* class_data */ ++ 0, ++ 0, /* n_preallocs */ ++ NULL ++ }; ++ GType g_define_type_id = ++ g_type_register_static (G_TYPE_INTERFACE, I_("GDesktopAppInfoLaunchHandler"), ++ &desktop_app_info_launch_handler_info, 0); ++ ++ g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_OBJECT); ++ ++ g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); ++ } ++ ++ return g_define_type_id__volatile; ++ } ++ ++ static void ++ g_desktop_app_info_launch_handler_class_init (gpointer g_class, ++ gpointer class_data) ++ { ++ } ++ ++ static void ++ g_desktop_app_info_launch_handler_base_init (gpointer g_class) ++ { ++ } ++ ++ static void ++ g_desktop_app_info_launch_handler_on_launched (GDesktopAppInfoLaunchHandler *launch_handler, ++ const char *desktop_file_path, ++ gint pid) ++ { ++ GDesktopAppInfoLaunchHandlerIface *iface; ++ ++ g_return_if_fail (G_IS_DESKTOP_APP_INFO_LAUNCH_HANDLER (launch_handler)); ++ ++ iface = G_DESKTOP_APP_INFO_LAUNCH_HANDLER_GET_IFACE (launch_handler); ++ ++ (* iface->on_launched) (launch_handler, desktop_file_path, pid); ++ } ++ + #define __G_DESKTOP_APP_INFO_C__ + #include "gioaliasdef.c" + +*** a/gio/gdesktopappinfo.h 2009-03-31 19:04:20.000000000 -0400 +--- b/gio/gdesktopappinfo.h 2009-07-21 20:34:35.565657314 -0400 +*************** +*** 89,94 **** +--- 89,123 ---- + GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup, + const char *uri_scheme); + ++ ++ ++ #define G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER (g_desktop_app_info_launch_handler_get_type ()) ++ #define G_DESKTOP_APP_INFO_LAUNCH_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER, GDesktopAppInfoLaunchHandler)) ++ #define G_IS_DESKTOP_APP_INFO_LAUNCH_HANDLER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER)) ++ #define G_DESKTOP_APP_INFO_LAUNCH_HANDLER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER, GDesktopAppInfoLaunchHandlerIface)) ++ ++ /** ++ * G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME: ++ * ++ * Extension point for default handler to launching. See ++ * <link linkend="extending-gio">Extending GIO</link>. ++ */ ++ #define G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME "gio-desktop-app-info-launch-handler" ++ ++ typedef struct _GDesktopAppInfoLaunchHandler GDesktopAppInfoLaunchHandler; ++ typedef struct _GDesktopAppInfoLaunchHandlerIface GDesktopAppInfoLaunchHandlerIface; ++ ++ struct _GDesktopAppInfoLaunchHandlerIface ++ { ++ GTypeInterface g_iface; ++ ++ void (* on_launched) (GDesktopAppInfoLaunchHandler *launch_handler, ++ const char *desktop_file_path, ++ gint pid); ++ }; ++ ++ GType g_desktop_app_info_launch_handler_get_type (void) G_GNUC_CONST; ++ + G_END_DECLS + + #endif /* __G_DESKTOP_APP_INFO_H__ */ + +*** a/gio/giomodule.c 2009-03-31 19:04:20.000000000 -0400 +--- b/gio/giomodule.c 2009-07-21 20:40:32.738157079 -0400 +*************** +*** 312,317 **** +--- 312,320 ---- + #ifdef G_OS_UNIX + ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME); + g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LOOKUP); ++ ++ ep = g_io_extension_point_register (G_DESKTOP_APP_INFO_LAUNCH_HANDLER_EXTENSION_POINT_NAME); ++ g_io_extension_point_set_required_type (ep, G_TYPE_DESKTOP_APP_INFO_LAUNCH_HANDLER); + #endif + + ep = g_io_extension_point_register (G_LOCAL_DIRECTORY_MONITOR_EXTENSION_POINT_NAME); + diff --git a/recipes/glib-2.0/glib-2.0-2.24.1/gobject.patch b/recipes/glib-2.0/glib-2.0-2.24.1/gobject.patch new file mode 100644 index 0000000000..d9c7b7e791 --- /dev/null +++ b/recipes/glib-2.0/glib-2.0-2.24.1/gobject.patch @@ -0,0 +1,99 @@ +diff --git a/gobject/gobject.c b/gobject/gobject.c +index 454d8c2..60c502b 100644 +--- a/gobject/gobject.c ++++ b/gobject/gobject.c +@@ -182,7 +182,7 @@ static GQuark quark_closure_array = 0; + static GQuark quark_weak_refs = 0; + static GQuark quark_toggle_refs = 0; + static GParamSpecPool *pspec_pool = NULL; +-static GObjectNotifyContext property_notify_context = { 0, }; ++static GObjectNotifyContext property_notify_context = { G_STATIC_PRIVATE_INIT, }; + static gulong gobject_signals[LAST_SIGNAL] = { 0, }; + static guint (*floating_flag_handler) (GObject*, gint) = object_floating_flag_handler; + G_LOCK_DEFINE_STATIC (construction_mutex); +@@ -321,7 +321,6 @@ g_object_do_class_init (GObjectClass *class) + quark_weak_refs = g_quark_from_static_string ("GObject-weak-references"); + quark_toggle_refs = g_quark_from_static_string ("GObject-toggle-references"); + pspec_pool = g_param_spec_pool_new (TRUE); +- property_notify_context.quark_notify_queue = g_quark_from_static_string ("GObject-notify-queue"); + property_notify_context.dispatcher = g_object_notify_dispatcher; + + class->constructor = g_object_constructor; +diff --git a/gobject/gobjectnotifyqueue.c b/gobject/gobjectnotifyqueue.c +index 1d5787b..173a8ed 100644 +--- a/gobject/gobjectnotifyqueue.c ++++ b/gobject/gobjectnotifyqueue.c +@@ -38,7 +38,7 @@ typedef void (*GObjectNotifyQueueDispatcher) (GObject *object, + /* --- structures --- */ + struct _GObjectNotifyContext + { +- GQuark quark_notify_queue; ++ GStaticPrivate key_notify_objects; + GObjectNotifyQueueDispatcher dispatcher; + GTrashStack *_nqueue_trash; /* unused */ + }; +@@ -68,16 +68,27 @@ static inline GObjectNotifyQueue* + g_object_notify_queue_freeze (GObject *object, + GObjectNotifyContext *context) + { ++ GHashTable *objects; + GObjectNotifyQueue *nqueue; + +- nqueue = g_datalist_id_get_data (&object->qdata, context->quark_notify_queue); ++ objects = g_static_private_get (&context->key_notify_objects); ++ if (!objects) ++ { ++ objects = g_hash_table_new_full (g_direct_hash, g_direct_equal, ++ NULL, g_object_notify_queue_free); ++ ++ g_static_private_set (&context->key_notify_objects, objects, ++ (GDestroyNotify) g_hash_table_unref); ++ } ++ ++ nqueue = g_hash_table_lookup (objects, object); + if (!nqueue) + { + nqueue = (void*) g_list_alloc (); + memset (nqueue, 0, sizeof (*nqueue)); + nqueue->context = context; +- g_datalist_id_set_data_full (&object->qdata, context->quark_notify_queue, +- nqueue, g_object_notify_queue_free); ++ ++ g_hash_table_insert (objects, object, nqueue); + } + + g_return_val_if_fail (nqueue->freeze_count < 65535, nqueue); +@@ -94,6 +105,7 @@ g_object_notify_queue_thaw (GObject *object, + GParamSpec *pspecs_mem[16], **pspecs, **free_me = NULL; + GSList *slist; + guint n_pspecs = 0; ++ GHashTable *objects; + + g_return_if_fail (nqueue->freeze_count > 0); + +@@ -119,7 +131,10 @@ g_object_notify_queue_thaw (GObject *object, + + pspecs[n_pspecs++] = pspec; + } +- g_datalist_id_set_data (&object->qdata, context->quark_notify_queue, NULL); ++ objects = g_static_private_get (&context->key_notify_objects); ++ g_hash_table_remove (objects, object); ++ if (g_hash_table_size (objects) == 0) ++ g_static_private_set (&context->key_notify_objects, NULL, NULL); + + if (n_pspecs) + context->dispatcher (object, n_pspecs, pspecs); +@@ -162,7 +177,13 @@ static inline GObjectNotifyQueue* + g_object_notify_queue_from_object (GObject *object, + GObjectNotifyContext *context) + { +- return g_datalist_id_get_data (&object->qdata, context->quark_notify_queue); ++ GHashTable *objects; ++ ++ objects = g_static_private_get (&context->key_notify_objects); ++ if (objects == NULL) ++ return NULL; ++ ++ return g_hash_table_lookup (objects, object); + } + diff --git a/recipes/glib-2.0/glib-2.0-native-2.12.4/glib-gettextize-dir.patch b/recipes/glib-2.0/glib-2.0-native-2.12.4/glib-gettextize-dir.patch deleted file mode 100644 index efe3325578..0000000000 --- a/recipes/glib-2.0/glib-2.0-native-2.12.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/recipes/glib-2.0/glib-2.0-native_2.12.4.bb b/recipes/glib-2.0/glib-2.0-native_2.12.4.bb deleted file mode 100644 index 0d4e45d918..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.12.4.bb +++ /dev/null @@ -1,52 +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 ="r1" - -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "http://download.gnome.org/sources/glib/2.12/glib-${PV}.tar.bz2 \ - file://glib-gettextize-dir.patch;patch=1 \ - file://glibconfig-sysdefs.h" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig native gettext - -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 () { - : -} - - -SRC_URI[md5sum] = "ef7b9595fa788e245a0f883bddba8a25" -SRC_URI[sha256sum] = "1b1a0dc746a07c67aad15e22e3d751c3e7068c889d171efb1ab45efbab87c75d" diff --git a/recipes/glib-2.0/glib-2.0-native_2.16.1.bb b/recipes/glib-2.0/glib-2.0-native_2.16.1.bb deleted file mode 100644 index 8ad0c8ac6c..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.16.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -require glib-2.0_${PV}.bb - -DEPENDS = "gtk-doc-native" -EXTRA_OECONF = "" -PR = "r3" - -inherit native - -do_configure_prepend() { - if [ -e ${S}/${TARGET_SYS}-libtool ] ; then - echo "${TARGET_SYS}-libtool already present" - else - cp ${STAGING_BINDIR}/${TARGET_SYS}-libtool ${S} - fi - -} - -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} - oe_libinstall -so -C gio libgio-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/recipes/glib-2.0/glib-2.0-native_2.18.0.bb b/recipes/glib-2.0/glib-2.0-native_2.18.0.bb deleted file mode 100644 index bf40524f6a..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.18.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -require glib-2.0_${PV}.bb - -DEPENDS = "gettext-native gtk-doc-native" -EXTRA_OECONF = "" -PR = "r4" - -inherit native - -do_configure_prepend() { - if [ -e ${S}/${TARGET_SYS}-libtool ] ; then - echo "${TARGET_SYS}-libtool already present" - else - cp ${STAGING_BINDIR}/${TARGET_SYS}-libtool ${S} - fi - -} - -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} - oe_libinstall -so -C gio libgio-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 () { - : -} - -SRC_URI[md5sum] = "06e5afe4ce055085dc5fd9fdab527bf7" -SRC_URI[sha256sum] = "624b9cfccc14781e699c9a3b2e332a51d63bba392c82d57b510d07a3f702362e" diff --git a/recipes/glib-2.0/glib-2.0-native_2.2.3.bb b/recipes/glib-2.0/glib-2.0-native_2.2.3.bb deleted file mode 100644 index cf3c49b47a..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.2.3.bb +++ /dev/null @@ -1,103 +0,0 @@ -SECTION = "libs" -LICENSE = "LGPL" -DEPENDS = "" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glib-2.0-${PV}" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \ - file://automake-lossage.patch;patch=1 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" -S = "${WORKDIR}/glib-${PV}" -PR = "r1" - -inherit autotools native - -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/glib-genmarshal ${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} - install -d ${STAGING_INCDIR}/glib-2.0/glib - install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h - install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h - install -m 0644 ${S}/glib/glib.h ${STAGING_INCDIR}/glib-2.0/glib.h - install -m 0644 ${S}/gmodule/gmodule.h ${STAGING_INCDIR}/glib-2.0/gmodule.h - install -m 0644 ${S}/glib/galloca.h ${STAGING_INCDIR}/glib-2.0/glib/galloca.h - install -m 0644 ${S}/glib/garray.h ${STAGING_INCDIR}/glib-2.0/glib/garray.h - install -m 0644 ${S}/glib/gasyncqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gasyncqueue.h - install -m 0644 ${S}/glib/gbacktrace.h ${STAGING_INCDIR}/glib-2.0/glib/gbacktrace.h - install -m 0644 ${S}/glib/gcache.h ${STAGING_INCDIR}/glib-2.0/glib/gcache.h - install -m 0644 ${S}/glib/gcompletion.h ${STAGING_INCDIR}/glib-2.0/glib/gcompletion.h - install -m 0644 ${S}/glib/gconvert.h ${STAGING_INCDIR}/glib-2.0/glib/gconvert.h - install -m 0644 ${S}/glib/gdataset.h ${STAGING_INCDIR}/glib-2.0/glib/gdataset.h - install -m 0644 ${S}/glib/gdate.h ${STAGING_INCDIR}/glib-2.0/glib/gdate.h - install -m 0644 ${S}/glib/gdir.h ${STAGING_INCDIR}/glib-2.0/glib/gdir.h - install -m 0644 ${S}/glib/gerror.h ${STAGING_INCDIR}/glib-2.0/glib/gerror.h - install -m 0644 ${S}/glib/gfileutils.h ${STAGING_INCDIR}/glib-2.0/glib/gfileutils.h - install -m 0644 ${S}/glib/ghash.h ${STAGING_INCDIR}/glib-2.0/glib/ghash.h - install -m 0644 ${S}/glib/ghook.h ${STAGING_INCDIR}/glib-2.0/glib/ghook.h - install -m 0644 ${S}/glib/giochannel.h ${STAGING_INCDIR}/glib-2.0/glib/giochannel.h - install -m 0644 ${S}/glib/glist.h ${STAGING_INCDIR}/glib-2.0/glib/glist.h - install -m 0644 ${S}/glib/gmacros.h ${STAGING_INCDIR}/glib-2.0/glib/gmacros.h - install -m 0644 ${S}/glib/gmain.h ${STAGING_INCDIR}/glib-2.0/glib/gmain.h - install -m 0644 ${S}/glib/gmarkup.h ${STAGING_INCDIR}/glib-2.0/glib/gmarkup.h - install -m 0644 ${S}/glib/gmem.h ${STAGING_INCDIR}/glib-2.0/glib/gmem.h - install -m 0644 ${S}/glib/gmessages.h ${STAGING_INCDIR}/glib-2.0/glib/gmessages.h - install -m 0644 ${S}/glib/gnode.h ${STAGING_INCDIR}/glib-2.0/glib/gnode.h - install -m 0644 ${S}/glib/gpattern.h ${STAGING_INCDIR}/glib-2.0/glib/gpattern.h - install -m 0644 ${S}/glib/gprimes.h ${STAGING_INCDIR}/glib-2.0/glib/gprimes.h - install -m 0644 ${S}/glib/gqsort.h ${STAGING_INCDIR}/glib-2.0/glib/gqsort.h - install -m 0644 ${S}/glib/gquark.h ${STAGING_INCDIR}/glib-2.0/glib/gquark.h - install -m 0644 ${S}/glib/gqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gqueue.h - install -m 0644 ${S}/glib/grand.h ${STAGING_INCDIR}/glib-2.0/glib/grand.h - install -m 0644 ${S}/glib/grel.h ${STAGING_INCDIR}/glib-2.0/glib/grel.h - install -m 0644 ${S}/glib/gscanner.h ${STAGING_INCDIR}/glib-2.0/glib/gscanner.h - install -m 0644 ${S}/glib/gshell.h ${STAGING_INCDIR}/glib-2.0/glib/gshell.h - install -m 0644 ${S}/glib/gslist.h ${STAGING_INCDIR}/glib-2.0/glib/gslist.h - install -m 0644 ${S}/glib/gspawn.h ${STAGING_INCDIR}/glib-2.0/glib/gspawn.h - install -m 0644 ${S}/glib/gstrfuncs.h ${STAGING_INCDIR}/glib-2.0/glib/gstrfuncs.h - install -m 0644 ${S}/glib/gstring.h ${STAGING_INCDIR}/glib-2.0/glib/gstring.h - install -m 0644 ${S}/glib/gthread.h ${STAGING_INCDIR}/glib-2.0/glib/gthread.h - install -m 0644 ${S}/glib/gthreadpool.h ${STAGING_INCDIR}/glib-2.0/glib/gthreadpool.h - install -m 0644 ${S}/glib/gtimer.h ${STAGING_INCDIR}/glib-2.0/glib/gtimer.h - install -m 0644 ${S}/glib/gtree.h ${STAGING_INCDIR}/glib-2.0/glib/gtree.h - install -m 0644 ${S}/glib/gtypes.h ${STAGING_INCDIR}/glib-2.0/glib/gtypes.h - install -m 0644 ${S}/glib/gunicode.h ${STAGING_INCDIR}/glib-2.0/glib/gunicode.h - install -m 0644 ${S}/glib/gutils.h ${STAGING_INCDIR}/glib-2.0/glib/gutils.h - install -m 0644 ${S}/glib/gwin32.h ${STAGING_INCDIR}/glib-2.0/glib/gwin32.h - install -m 0644 ${S}/glib/gprintf.h ${STAGING_INCDIR}/glib-2.0/glib/gprintf.h - install -d ${STAGING_INCDIR}/glib-2.0/gobject - install -m 0644 ${S}/gobject/gboxed.h ${STAGING_INCDIR}/glib-2.0/gobject/gboxed.h - install -m 0644 ${S}/gobject/gclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gclosure.h - install -m 0644 ${S}/gobject/genums.h ${STAGING_INCDIR}/glib-2.0/gobject/genums.h - install -m 0644 ${S}/gobject/gobject.h ${STAGING_INCDIR}/glib-2.0/gobject/gobject.h - install -m 0644 ${S}/gobject/gparam.h ${STAGING_INCDIR}/glib-2.0/gobject/gparam.h - install -m 0644 ${S}/gobject/gparamspecs.h ${STAGING_INCDIR}/glib-2.0/gobject/gparamspecs.h - install -m 0644 ${S}/gobject/gsignal.h ${STAGING_INCDIR}/glib-2.0/gobject/gsignal.h - install -m 0644 ${S}/gobject/gsourceclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gsourceclosure.h - install -m 0644 ${S}/gobject/gtype.h ${STAGING_INCDIR}/glib-2.0/gobject/gtype.h - install -m 0644 ${S}/gobject/gtypemodule.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypemodule.h - install -m 0644 ${S}/gobject/gtypeplugin.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypeplugin.h - install -m 0644 ${S}/gobject/gvalue.h ${STAGING_INCDIR}/glib-2.0/gobject/gvalue.h - install -m 0644 ${S}/gobject/gvaluearray.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluearray.h - install -m 0644 ${S}/gobject/gvaluecollector.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluecollector.h - install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h - install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c - install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/ - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/ -} - -do_install () { - : -} - -SRC_URI[md5sum] = "aa214a10d873b68ddd67cd9de2ccae55" -SRC_URI[sha256sum] = "af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5" diff --git a/recipes/glib-2.0/glib-2.0-native_2.4.6.bb b/recipes/glib-2.0/glib-2.0-native_2.4.6.bb deleted file mode 100644 index 75e847b178..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.4.6.bb +++ /dev/null @@ -1,52 +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 = "r6" - -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \ - file://visibility.patch;patch=1 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig native gettext - -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 () { - : -} - -SRC_URI[md5sum] = "a45db7d82480da431f6cd00ea041a534" -SRC_URI[sha256sum] = "d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2" diff --git a/recipes/glib-2.0/glib-2.0-native_2.6.5.bb b/recipes/glib-2.0/glib-2.0-native_2.6.5.bb deleted file mode 100644 index c6580a6330..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.6.5.bb +++ /dev/null @@ -1,54 +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 = "r4" - -export PERL_PATH="/usr/bin/env perl" -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ - file://glib-gettextize-dir.patch;patch=1 \ - file://glib-mkenums-nowarn.patch;patch=1 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig native gettext - -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 () { - : -} - -SRC_URI[md5sum] = "777d2e34a60edad28319207b576cda91" -SRC_URI[sha256sum] = "ca061bbd41c6484b4b0eabbee08f99e51ebf5f3a0c63e8b0787b8d37546cc2ca" diff --git a/recipes/glib-2.0/glib-2.0-native_2.6.6.bb b/recipes/glib-2.0/glib-2.0-native_2.6.6.bb deleted file mode 100644 index a9d52d24d5..0000000000 --- a/recipes/glib-2.0/glib-2.0-native_2.6.6.bb +++ /dev/null @@ -1,54 +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 = "r4" - -export PERL_PATH="/usr/bin/env perl" -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ - file://glib-gettextize-dir.patch;patch=1 \ - file://glib-mkenums-nowarn.patch;patch=1 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig native gettext - -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 () { - : -} - -SRC_URI[md5sum] = "6e22b0639d314536f23ee118f29b43de" -SRC_URI[sha256sum] = "de4f25424840b8e3b1fb03e6bac0c095affc3ca9c228f8b780817489914bdebf" diff --git a/recipes/glib-2.0/glib-2.0_2.12.10.bb b/recipes/glib-2.0/glib-2.0_2.12.10.bb deleted file mode 100644 index 19d2dbce04..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.12.10.bb +++ /dev/null @@ -1,9 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - - -SRC_URI[md5sum] = "82d44a53690b0eff8f7a5dc65e592f61" -SRC_URI[sha256sum] = "00f2a189ed6b16ef654c2097ad14cb4c9da42cd4c3fbae54fcb61f3c1c85e8d1" diff --git a/recipes/glib-2.0/glib-2.0_2.12.11.bb b/recipes/glib-2.0/glib-2.0_2.12.11.bb deleted file mode 100644 index ea47790a5c..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.12.11.bb +++ /dev/null @@ -1,10 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - - -SRC_URI[md5sum] = "077a9917b673a9a0bc63f351786dde24" -SRC_URI[sha256sum] = "706aa9da1c096af8d27b3ddb5da4e321dd6b10f881887639e280e4e10b81c4b3" diff --git a/recipes/glib-2.0/glib-2.0_2.12.12.bb b/recipes/glib-2.0/glib-2.0_2.12.12.bb index 3d5c7f03bc..12b24e2a7f 100644 --- a/recipes/glib-2.0/glib-2.0_2.12.12.bb +++ b/recipes/glib-2.0/glib-2.0_2.12.12.bb @@ -3,7 +3,7 @@ PR = "${INC_PR}.0" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" + file://configure-libtool.patch" SRC_URI[md5sum] = "0b3a42098243d054475ff6eb51ed2be1" diff --git a/recipes/glib-2.0/glib-2.0_2.12.13.bb b/recipes/glib-2.0/glib-2.0_2.12.13.bb deleted file mode 100644 index e0354f3995..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.12.13.bb +++ /dev/null @@ -1,11 +0,0 @@ -require glib.inc - -PR = "${INC_PR}.0" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - - -SRC_URI[md5sum] = "d76124236e4e216e8c0861341e967a76" -SRC_URI[sha256sum] = "1253d563ca2e50292d924849fe3a23c3b7bc707ab8b79bda19319f9d192b0e8e" diff --git a/recipes/glib-2.0/glib-2.0_2.12.6.bb b/recipes/glib-2.0/glib-2.0_2.12.6.bb deleted file mode 100644 index 3dd82c8ec1..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.12.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - - -SRC_URI[md5sum] = "b13d971e7de0b844fc4ced7367702003" -SRC_URI[sha256sum] = "142d5d4795bef093eb9cfd50e384ae87ba9b9934d22b667174535d377ad47f1b" diff --git a/recipes/glib-2.0/glib-2.0_2.12.9.bb b/recipes/glib-2.0/glib-2.0_2.12.9.bb deleted file mode 100644 index 41d483b36a..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.12.9.bb +++ /dev/null @@ -1,10 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - - -SRC_URI[md5sum] = "b3f6a2a318610af6398b3445f1a2d6c6" -SRC_URI[sha256sum] = "10113e7b91f858557c7edb4b611cc009855c5ff8663af54977a65acb69445058" diff --git a/recipes/glib-2.0/glib-2.0_2.14.0.bb b/recipes/glib-2.0/glib-2.0_2.14.0.bb deleted file mode 100644 index 2f6ca089b4..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.14.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -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 \ - file://gcc-4.2-inline-fix.patch;patch=1" - -SRC_URI[md5sum] = "6fabf21f68631043bc6924e01398e3af" -SRC_URI[sha256sum] = "92e0aed2b5816bfcdfcd943215a7b59e9000f89ae7824218b7959c90161560a8" diff --git a/recipes/glib-2.0/glib-2.0_2.14.1.bb b/recipes/glib-2.0/glib-2.0_2.14.1.bb deleted file mode 100644 index 96f4e981ab..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.14.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -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 \ - file://gcc-4.2-inline-fix.patch;patch=1" - -SRC_URI[md5sum] = "196d7944a8ddc1f7c3d1e9c7146dd560" -SRC_URI[sha256sum] = "6f36ca624a12dce03cdea59c9eb900eda49ea2f463b329737eb9f2a8f3ac144d" diff --git a/recipes/glib-2.0/glib-2.0_2.14.4.bb b/recipes/glib-2.0/glib-2.0_2.14.4.bb deleted file mode 100644 index 0fb58261a2..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.14.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -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 \ - file://gcc-4.2-inline-fix.patch;patch=1" - -SRC_URI[md5sum] = "7ee7874108cbe9ea7fff1f4ab3389ce8" -SRC_URI[sha256sum] = "10e6ebecc2cbd07f193a5d26b88c3bf2107e32b2a4d024f10f77f59a98d579ff" diff --git a/recipes/glib-2.0/glib-2.0_2.15.6.bb b/recipes/glib-2.0/glib-2.0_2.15.6.bb deleted file mode 100644 index fe73e78a68..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.15.6.bb +++ /dev/null @@ -1,10 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ - " - -SRC_URI[md5sum] = "62b1a3c1fa52b8d91b4535e4a4ab3057" -SRC_URI[sha256sum] = "90e5e5d555479456f13f0ef8bb3518816994785fccb18fc2e65d432f8dd34272" diff --git a/recipes/glib-2.0/glib-2.0_2.16.1.bb b/recipes/glib-2.0/glib-2.0_2.16.1.bb deleted file mode 100644 index d940165477..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.16.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -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 \ - file://gcc-4.2-inline-fix.patch;patch=1 \ - file://hurd-arg-max.patch;patch=1 \ -" -S = "${WORKDIR}/glib-${PV}" - - -SRC_URI[md5sum] = "9852daf0605f827bfd7199ffe4f5b22d" -SRC_URI[sha256sum] = "f305a828b53194a99c35dfb88efa4d83d3998a95b9d8843ca3f84c2959e56695" diff --git a/recipes/glib-2.0/glib-2.0_2.16.3.bb b/recipes/glib-2.0/glib-2.0_2.16.3.bb deleted file mode 100644 index 215fe0e7b5..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.16.3.bb +++ /dev/null @@ -1,13 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -# This version requires a newer libtool that isn't default yet -DEFAULT_PREFERENCE = "-1" - -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 \ - " - -SRC_URI[md5sum] = "195f9a803cc5279dbb39afdf985f44cb" -SRC_URI[sha256sum] = "562742a234c7b842d891ec8ed4c9bead093c33863cca01e31912f59f6c8e887d" diff --git a/recipes/glib-2.0/glib-2.0_2.16.4.bb b/recipes/glib-2.0/glib-2.0_2.16.4.bb deleted file mode 100644 index de858e2cc3..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.16.4.bb +++ /dev/null @@ -1,15 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -# This version requires a newer libtool that isn't default yet -DEFAULT_PREFERENCE = "-1" - -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 \ - " - -SRC_URI_append_arm = "file://atomic-thumb.patch;patch=1" - -SRC_URI[md5sum] = "2ab79b3c93258827cc6ea8ee50128e49" -SRC_URI[sha256sum] = "16ac93dc0da95cb20e4f14507fab688c4be1d23bcd2f28bc069c8ca7dc9d7e9d" diff --git a/recipes/glib-2.0/glib-2.0_2.16.5.bb b/recipes/glib-2.0/glib-2.0_2.16.5.bb deleted file mode 100644 index 11aa92d337..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.16.5.bb +++ /dev/null @@ -1,13 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -# This version requires a newer libtool that isn't default yet -DEFAULT_PREFERENCE = "-1" - -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 \ - " - -SRC_URI[md5sum] = "039f02d47d4071322a3f00abf031e5d9" -SRC_URI[sha256sum] = "cf14ee03a06c6adaa672ab18f6e5472a06c5d655379f9d8a5a6360b459c2eb20" diff --git a/recipes/glib-2.0/glib-2.0_2.18.0.bb b/recipes/glib-2.0/glib-2.0_2.18.0.bb deleted file mode 100644 index 018013230e..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.18.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "\ - http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ -" - -SRC_URI[md5sum] = "06e5afe4ce055085dc5fd9fdab527bf7" -SRC_URI[sha256sum] = "624b9cfccc14781e699c9a3b2e332a51d63bba392c82d57b510d07a3f702362e" diff --git a/recipes/glib-2.0/glib-2.0_2.18.1.bb b/recipes/glib-2.0/glib-2.0_2.18.1.bb deleted file mode 100644 index 02e5f1dbc7..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.18.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "\ - http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ -" -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" - -SRC_URI[md5sum] = "51a9a33f49a4896d4d95d8e980666b9e" -SRC_URI[sha256sum] = "57a47d4cd19757de0a7764488e6d4d8b0afa4849356a332b721a5219a991a0d0" diff --git a/recipes/glib-2.0/glib-2.0_2.18.3.bb b/recipes/glib-2.0/glib-2.0_2.18.3.bb deleted file mode 100644 index 18eee7d610..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.18.3.bb +++ /dev/null @@ -1,12 +0,0 @@ -require glib.inc -PR = "${INC_PR}.0" - -SRC_URI = "\ - http://ftp.gnome.org/pub/GNOME/sources/glib/2.18/glib-${PV}.tar.bz2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ -" -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" - -SRC_URI[md5sum] = "f13996a7bd57525d796a6593f26a7771" -SRC_URI[sha256sum] = "9f769e8449c8cc1d8789ba987e446bdac3ed22671d71f946c973c7aadccc0b36" diff --git a/recipes/glib-2.0/glib-2.0_2.2.3.bb b/recipes/glib-2.0/glib-2.0_2.2.3.bb deleted file mode 100644 index b06153da00..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.2.3.bb +++ /dev/null @@ -1,106 +0,0 @@ -LICENSE = "LGPL" -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." -SECTION = "libs" -PRIORITY = "optional" -DEPENDS = "glib-2.0-native" -DEPENDS += "virtual/libiconv virtual/libintl" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/glib/2.2/glib-${PV}.tar.bz2 \ - file://automake-lossage.patch;patch=1 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - -S = "${WORKDIR}/glib-${PV}" -PR = "r1" - -inherit autotools pkgconfig gettext - -require glib-2.0.inc - -acpaths = "" -do_configure_prepend () { - install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . -} - -do_stage () { - 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} - install -d ${STAGING_INCDIR}/glib-2.0/glib - install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h - install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h - install -m 0644 ${S}/glib/glib.h ${STAGING_INCDIR}/glib-2.0/glib.h - install -m 0644 ${S}/gmodule/gmodule.h ${STAGING_INCDIR}/glib-2.0/gmodule.h - install -m 0644 ${S}/glib/galloca.h ${STAGING_INCDIR}/glib-2.0/glib/galloca.h - install -m 0644 ${S}/glib/garray.h ${STAGING_INCDIR}/glib-2.0/glib/garray.h - install -m 0644 ${S}/glib/gasyncqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gasyncqueue.h - install -m 0644 ${S}/glib/gbacktrace.h ${STAGING_INCDIR}/glib-2.0/glib/gbacktrace.h - install -m 0644 ${S}/glib/gcache.h ${STAGING_INCDIR}/glib-2.0/glib/gcache.h - install -m 0644 ${S}/glib/gcompletion.h ${STAGING_INCDIR}/glib-2.0/glib/gcompletion.h - install -m 0644 ${S}/glib/gconvert.h ${STAGING_INCDIR}/glib-2.0/glib/gconvert.h - install -m 0644 ${S}/glib/gdataset.h ${STAGING_INCDIR}/glib-2.0/glib/gdataset.h - install -m 0644 ${S}/glib/gdate.h ${STAGING_INCDIR}/glib-2.0/glib/gdate.h - install -m 0644 ${S}/glib/gdir.h ${STAGING_INCDIR}/glib-2.0/glib/gdir.h - install -m 0644 ${S}/glib/gerror.h ${STAGING_INCDIR}/glib-2.0/glib/gerror.h - install -m 0644 ${S}/glib/gfileutils.h ${STAGING_INCDIR}/glib-2.0/glib/gfileutils.h - install -m 0644 ${S}/glib/ghash.h ${STAGING_INCDIR}/glib-2.0/glib/ghash.h - install -m 0644 ${S}/glib/ghook.h ${STAGING_INCDIR}/glib-2.0/glib/ghook.h - install -m 0644 ${S}/glib/giochannel.h ${STAGING_INCDIR}/glib-2.0/glib/giochannel.h - install -m 0644 ${S}/glib/glist.h ${STAGING_INCDIR}/glib-2.0/glib/glist.h - install -m 0644 ${S}/glib/gmacros.h ${STAGING_INCDIR}/glib-2.0/glib/gmacros.h - install -m 0644 ${S}/glib/gmain.h ${STAGING_INCDIR}/glib-2.0/glib/gmain.h - install -m 0644 ${S}/glib/gmarkup.h ${STAGING_INCDIR}/glib-2.0/glib/gmarkup.h - install -m 0644 ${S}/glib/gmem.h ${STAGING_INCDIR}/glib-2.0/glib/gmem.h - install -m 0644 ${S}/glib/gmessages.h ${STAGING_INCDIR}/glib-2.0/glib/gmessages.h - install -m 0644 ${S}/glib/gnode.h ${STAGING_INCDIR}/glib-2.0/glib/gnode.h - install -m 0644 ${S}/glib/gpattern.h ${STAGING_INCDIR}/glib-2.0/glib/gpattern.h - install -m 0644 ${S}/glib/gprimes.h ${STAGING_INCDIR}/glib-2.0/glib/gprimes.h - install -m 0644 ${S}/glib/gqsort.h ${STAGING_INCDIR}/glib-2.0/glib/gqsort.h - install -m 0644 ${S}/glib/gquark.h ${STAGING_INCDIR}/glib-2.0/glib/gquark.h - install -m 0644 ${S}/glib/gqueue.h ${STAGING_INCDIR}/glib-2.0/glib/gqueue.h - install -m 0644 ${S}/glib/grand.h ${STAGING_INCDIR}/glib-2.0/glib/grand.h - install -m 0644 ${S}/glib/grel.h ${STAGING_INCDIR}/glib-2.0/glib/grel.h - install -m 0644 ${S}/glib/gscanner.h ${STAGING_INCDIR}/glib-2.0/glib/gscanner.h - install -m 0644 ${S}/glib/gshell.h ${STAGING_INCDIR}/glib-2.0/glib/gshell.h - install -m 0644 ${S}/glib/gslist.h ${STAGING_INCDIR}/glib-2.0/glib/gslist.h - install -m 0644 ${S}/glib/gspawn.h ${STAGING_INCDIR}/glib-2.0/glib/gspawn.h - install -m 0644 ${S}/glib/gstrfuncs.h ${STAGING_INCDIR}/glib-2.0/glib/gstrfuncs.h - install -m 0644 ${S}/glib/gstring.h ${STAGING_INCDIR}/glib-2.0/glib/gstring.h - install -m 0644 ${S}/glib/gthread.h ${STAGING_INCDIR}/glib-2.0/glib/gthread.h - install -m 0644 ${S}/glib/gthreadpool.h ${STAGING_INCDIR}/glib-2.0/glib/gthreadpool.h - install -m 0644 ${S}/glib/gtimer.h ${STAGING_INCDIR}/glib-2.0/glib/gtimer.h - install -m 0644 ${S}/glib/gtree.h ${STAGING_INCDIR}/glib-2.0/glib/gtree.h - install -m 0644 ${S}/glib/gtypes.h ${STAGING_INCDIR}/glib-2.0/glib/gtypes.h - install -m 0644 ${S}/glib/gunicode.h ${STAGING_INCDIR}/glib-2.0/glib/gunicode.h - install -m 0644 ${S}/glib/gutils.h ${STAGING_INCDIR}/glib-2.0/glib/gutils.h - install -m 0644 ${S}/glib/gwin32.h ${STAGING_INCDIR}/glib-2.0/glib/gwin32.h - install -m 0644 ${S}/glib/gprintf.h ${STAGING_INCDIR}/glib-2.0/glib/gprintf.h - install -d ${STAGING_INCDIR}/glib-2.0/gobject - install -m 0644 ${S}/gobject/gboxed.h ${STAGING_INCDIR}/glib-2.0/gobject/gboxed.h - install -m 0644 ${S}/gobject/gclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gclosure.h - install -m 0644 ${S}/gobject/genums.h ${STAGING_INCDIR}/glib-2.0/gobject/genums.h - install -m 0644 ${S}/gobject/gobject.h ${STAGING_INCDIR}/glib-2.0/gobject/gobject.h - install -m 0644 ${S}/gobject/gparam.h ${STAGING_INCDIR}/glib-2.0/gobject/gparam.h - install -m 0644 ${S}/gobject/gparamspecs.h ${STAGING_INCDIR}/glib-2.0/gobject/gparamspecs.h - install -m 0644 ${S}/gobject/gsignal.h ${STAGING_INCDIR}/glib-2.0/gobject/gsignal.h - install -m 0644 ${S}/gobject/gsourceclosure.h ${STAGING_INCDIR}/glib-2.0/gobject/gsourceclosure.h - install -m 0644 ${S}/gobject/gtype.h ${STAGING_INCDIR}/glib-2.0/gobject/gtype.h - install -m 0644 ${S}/gobject/gtypemodule.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypemodule.h - install -m 0644 ${S}/gobject/gtypeplugin.h ${STAGING_INCDIR}/glib-2.0/gobject/gtypeplugin.h - install -m 0644 ${S}/gobject/gvalue.h ${STAGING_INCDIR}/glib-2.0/gobject/gvalue.h - install -m 0644 ${S}/gobject/gvaluearray.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluearray.h - install -m 0644 ${S}/gobject/gvaluecollector.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluecollector.h - install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h - install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c - install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/ - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/ -} - -SRC_URI[md5sum] = "aa214a10d873b68ddd67cd9de2ccae55" -SRC_URI[sha256sum] = "af1456e075954c122bda008736437b048d5336d0b426847c627e607eb35e59e5" diff --git a/recipes/glib-2.0/glib-2.0_2.20.3.bb b/recipes/glib-2.0/glib-2.0_2.20.3.bb index f41560b7fd..157ef8077f 100644 --- a/recipes/glib-2.0/glib-2.0_2.20.3.bb +++ b/recipes/glib-2.0/glib-2.0_2.20.3.bb @@ -4,9 +4,9 @@ PR = "${INC_PR}.0" SRC_URI = "\ http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2;name=tarball \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ + file://configure-libtool.patch \ " -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" +SRC_URI_append_arm = " file://atomic-thumb.patch" SRC_URI[tarball.md5sum] = "1173688c58b4b62809c83bb07a2cf71a" SRC_URI[tarball.sha256sum] = "37f098617c2fac11eee4c6289d576300abd0a01825d4c809462f5b698d1127b0" diff --git a/recipes/glib-2.0/glib-2.0_2.20.4.bb b/recipes/glib-2.0/glib-2.0_2.20.4.bb index 76a95852ba..3d8bb77cd7 100644 --- a/recipes/glib-2.0/glib-2.0_2.20.4.bb +++ b/recipes/glib-2.0/glib-2.0_2.20.4.bb @@ -4,9 +4,9 @@ PR = "${INC_PR}.0" SRC_URI = "\ http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ + file://configure-libtool.patch \ " -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" +SRC_URI_append_arm = " file://atomic-thumb.patch" SRC_URI[md5sum] = "346916673c0eab72191cf44b4afe535f" SRC_URI[sha256sum] = "af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9" diff --git a/recipes/glib-2.0/glib-2.0_2.22.1.bb b/recipes/glib-2.0/glib-2.0_2.22.1.bb index 706e7212a6..ac2cdef6a0 100644 --- a/recipes/glib-2.0/glib-2.0_2.22.1.bb +++ b/recipes/glib-2.0/glib-2.0_2.22.1.bb @@ -4,17 +4,17 @@ PR = "${INC_PR}.2" SRC_URI = "\ http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ - file://bug-556515.patch;patch=1 \ - file://g_once_init_enter.patch;patch=1 \ - file://uclibc-res_query.patch;patch=1 \ + file://configure-libtool.patch \ + file://bug-556515.patch \ + file://g_once_init_enter.patch \ + file://uclibc-res_query.patch \ " -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1 \ +SRC_URI_append_arm = " file://atomic-thumb.patch \ " -SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1" -SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" +SRC_URI_append_armv6 = " file://gatomic_armv6.patch" +SRC_URI_append_armv7a = " file://gatomic_armv6.patch" SRC_URI[md5sum] = "12297a7da577321647b38ade0593cb3c" SRC_URI[sha256sum] = "4898d340c830a5903115412ec5b95eb03b410efdfb1c5316d36f12f8be85577d" diff --git a/recipes/glib-2.0/glib-2.0_2.22.4.bb b/recipes/glib-2.0/glib-2.0_2.22.4.bb index c86905e2fa..05a1342f26 100644 --- a/recipes/glib-2.0/glib-2.0_2.22.4.bb +++ b/recipes/glib-2.0/glib-2.0_2.22.4.bb @@ -11,16 +11,16 @@ DEPENDS = "glib-2.0-native gtk-doc virtual/libiconv virtual/libintl" SRC_URI = "\ http://ftp.gnome.org/pub/GNOME/sources/glib/2.22/glib-${PV}.tar.bz2;name=archive \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ - file://g_once_init_enter.patch;patch=1 \ - file://uclibc-res_query.patch;patch=1 \ + file://configure-libtool.patch \ + file://g_once_init_enter.patch \ + file://uclibc-res_query.patch \ " SRC_URI[archive.md5sum] = "d91bcbe27556430ddecce65086355708" SRC_URI[archive.sha256sum] = "0d1f6bf8aaeab772f2370229eefda45bef434e3f29a7d1d8e5dfafeaa1d8ad14" -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" -SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1" -SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" +SRC_URI_append_arm = " file://atomic-thumb.patch" +SRC_URI_append_armv6 = " file://gatomic_armv6.patch" +SRC_URI_append_armv7a = " file://gatomic_armv6.patch" PR = "r1" diff --git a/recipes/glib-2.0/glib-2.0_2.23.6.bb b/recipes/glib-2.0/glib-2.0_2.23.6.bb index dfbda5cd30..51a2153b27 100644 --- a/recipes/glib-2.0/glib-2.0_2.23.6.bb +++ b/recipes/glib-2.0/glib-2.0_2.23.6.bb @@ -12,16 +12,16 @@ PR = "r2" SRC_URI = "\ http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-${PV}.tar.bz2;name=archive \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ - file://g_once_init_enter.patch;patch=1 \ - file://gatomic-proper-pointer-get-cast.patch;patch=1 \ + file://configure-libtool.patch \ + file://g_once_init_enter.patch \ + file://gatomic-proper-pointer-get-cast.patch \ " SRC_URI[archive.md5sum] = "72e6eadc16d7022376ecef12c6fe905e" SRC_URI[archive.sha256sum] = "f91840e27ad4cd48e655a6babed7e2024f86814f94961da88ca2adba447c6e77" -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" -SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1" -SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" +SRC_URI_append_arm = " file://atomic-thumb.patch" +SRC_URI_append_armv6 = " file://gatomic_armv6.patch" +SRC_URI_append_armv7a = " file://gatomic_armv6.patch" inherit autotools gettext diff --git a/recipes/glib-2.0/glib-2.0_2.24.0.bb b/recipes/glib-2.0/glib-2.0_2.24.0.bb index ad94111863..3a90dc65d3 100644 --- a/recipes/glib-2.0/glib-2.0_2.24.0.bb +++ b/recipes/glib-2.0/glib-2.0_2.24.0.bb @@ -6,28 +6,28 @@ UNIX-like platforms, Windows, OS/2 and BeOS." LICENSE = "LGPL" SECTION = "libs" PRIORITY = "optional" -DEPENDS = "glib-2.0-native gtk-doc virtual/libiconv virtual/libintl zlib" +DEPENDS = "glib-2.0-native gtk-doc zlib" -PR = "r4" +PR = "r5" SRC_URI = "\ http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2;name=archive \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ - file://g_once_init_enter.patch;patch=1 \ - file://gatomic-proper-pointer-get-cast.patch;patch=1 \ - file://gio.patch;patch=1 \ - file://gvariant.patch;patch=1 \ - file://gasync.patch;patch=1 \ - file://60_wait-longer-for-threads-to-die.patch;patch=1 \ + file://configure-libtool.patch \ + file://g_once_init_enter.patch \ + file://gatomic-proper-pointer-get-cast.patch \ + file://gio.patch \ + file://gvariant.patch \ + file://gasync.patch \ + file://60_wait-longer-for-threads-to-die.patch \ " SRC_URI[archive.md5sum] = "45a8bc697d07f859566c0b64c40382a8" SRC_URI[archive.sha256sum] = "7b6aa2cf21e734a6092a711bf196b8d2ddc589b971f93337610c10fa4f23400d" -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" -SRC_URI_append_armv6 = " file://gatomic_armv6.patch;patch=1" -SRC_URI_append_armv7a = " file://gatomic_armv6.patch;patch=1" +SRC_URI_append_arm = " file://atomic-thumb.patch" +SRC_URI_append_armv6 = " file://gatomic_armv6.patch" +SRC_URI_append_armv7a = " file://gatomic_armv6.patch" inherit autotools gettext diff --git a/recipes/glib-2.0/glib-2.0_2.24.1.bb b/recipes/glib-2.0/glib-2.0_2.24.1.bb new file mode 100644 index 0000000000..3bc11de4be --- /dev/null +++ b/recipes/glib-2.0/glib-2.0_2.24.1.bb @@ -0,0 +1,78 @@ +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 zlib" +DEPENDS_virtclass-native = "gettext-native gtk-doc-native \ + pkgconfig-native" + +PR = "r0" + +SRC_URI = "\ + http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2;name=archive \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch \ + file://g_once_init_enter.patch \ + file://gatomic-proper-pointer-get-cast.patch \ + file://gio.patch \ + file://60_wait-longer-for-threads-to-die.patch \ +" + +SRC_URI[archive.md5sum] = "6a7db81c9a2cffe6a34dadb57d7ba2d2" +SRC_URI[archive.sha256sum] = "014c3da960bf17117371075c16495f05f36501db990851ceea658f15d2ea6d04" + +SRC_URI_append_arm = " file://atomic-thumb.patch" +SRC_URI_append_armv6 = " file://gatomic_armv6.patch" +SRC_URI_append_armv7a = " file://gatomic_armv6.patch" + +inherit autotools gettext + +S = "${WORKDIR}/glib-${PV}" + +EXTRA_OECONF = "--disable-debug " + +# Add and entry for your favourite arch if your (g)libc has a sane printf +EXTRA_OECONF_append_glibc_arm = " --enable-included-printf=no " + +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_install_append() { + sed -i -e s:${STAGING_BINDIR_NATIVE}:${bindir}:g ${D}${bindir}/glib-mkenums || true +} + +EXTRA_OECONF_virtclass-native = "" + +do_configure_prepend_virtclass-native() { + if [ -e ${S}/${TARGET_SYS}-libtool ] ; then + echo "${TARGET_SYS}-libtool already present" + else + cp ${STAGING_BINDIR}/${TARGET_SYS}-libtool ${S} + fi + +} + +BBCLASSEXTEND = "native" + +PACKAGES =+ "gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0 glib-2.0-utils " +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" +FILES_${PN} = "${libdir}/lib*so.* ${libdir}/gio/modules/*.so" +FILES_${PN}-dev += "${libdir}/glib-2.0 ${datadir}/glib-2.0 ${libdir}/gio/modules/*.la" +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug" +FILES_gmodule-2.0 = "${libdir}/libgmodule-2.0.so.*" +FILES_gobject-2.0 = "${libdir}/libgobject-2.0.so.*" +FILES_gio-2.0 = "${libdir}/libgio-2.0.so.*" +FILES_gthread-2.0 = "${libdir}/libgthread-2.0.so.*" + +# Let various glib components end up in glib package +# for compatibility (with binary packages from Maemo). +FILES_gthread-2.0_chinook-compat = "" +FILES_gmodule-2.0_chinook-compat = "" +FILES_gobject-2.0_chinook-compat = "" +FILES_gio-2.0_chinook-compat = "" diff --git a/recipes/glib-2.0/glib-2.0_2.4.6.bb b/recipes/glib-2.0/glib-2.0_2.4.6.bb deleted file mode 100644 index ab2b08ad07..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.4.6.bb +++ /dev/null @@ -1,55 +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 += "glib-2.0-native gtk-doc" -DEPENDS += "virtual/libiconv virtual/libintl" -PACKAGES =+ "glib-2.0-utils " -PR = "r4" - -LEAD_SONAME = "libglib-2.0.*" -FILES_glib-2.0-utils = "${bindir}/*" - -# Add some files to glib-2.0 dev that normally don't get pulled in - -FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ - ${datadir}/glib-2.0/gettext/po/Makefile.in.in" - -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/glib-${PV}.tar.bz2 \ - file://glibinclude.patch;patch=1;pnum=2 \ - file://visibility.patch;patch=1 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig gettext - -require glib-2.0.inc - -acpaths = "" -do_configure_prepend () { - install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . -} - -do_stage () { - 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 -} - -SRC_URI[md5sum] = "a45db7d82480da431f6cd00ea041a534" -SRC_URI[sha256sum] = "d2ca79bac06a625d9276b48492c2c1caccf7f8962f9b331b39796391013e72f2" diff --git a/recipes/glib-2.0/glib-2.0_2.6.4.bb b/recipes/glib-2.0/glib-2.0_2.6.4.bb index 026354caf7..1a483f4281 100644 --- a/recipes/glib-2.0/glib-2.0_2.6.4.bb +++ b/recipes/glib-2.0/glib-2.0_2.6.4.bb @@ -22,9 +22,9 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ - file://glibinclude.patch;patch=1;pnum=2 \ + file://glibinclude.patch;striplevel=2 \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" + file://configure-libtool.patch" S = "${WORKDIR}/glib-${PV}" diff --git a/recipes/glib-2.0/glib-2.0_2.6.6.bb b/recipes/glib-2.0/glib-2.0_2.6.6.bb deleted file mode 100644 index f0a5646101..0000000000 --- a/recipes/glib-2.0/glib-2.0_2.6.6.bb +++ /dev/null @@ -1,54 +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 += "glib-2.0-native gtk-doc" -DEPENDS += "virtual/libiconv virtual/libintl" -PACKAGES =+ "glib-2.0-utils " -PR = "r1" - -LEAD_SONAME = "libglib-2.0.*" -FILES_glib-2.0-utils = "${bindir}/*" - -# Add some files to glib-2.0 dev that normally don't get pulled in - -FILES_${PN}-dev += "${libdir}/glib-2.0/include/glibconfig.h \ - ${datadir}/glib-2.0/gettext/po/Makefile.in.in" - -EXTRA_OECONF = "--disable-debug" - -SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/glib-${PV}.tar.bz2 \ - file://glibinclude.patch;patch=1;pnum=2 \ - file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" - -S = "${WORKDIR}/glib-${PV}" - -inherit autotools pkgconfig gettext - -require glib-2.0.inc - -acpaths = "" -do_configure_prepend () { - install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . -} - -do_stage () { - 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 -} - -SRC_URI[md5sum] = "6e22b0639d314536f23ee118f29b43de" -SRC_URI[sha256sum] = "de4f25424840b8e3b1fb03e6bac0c095affc3ca9c228f8b780817489914bdebf" diff --git a/recipes/glib-2.0/glib-2.0_2.8.6.bb b/recipes/glib-2.0/glib-2.0_2.8.6.bb index 4af8287240..f0250461e3 100644 --- a/recipes/glib-2.0/glib-2.0_2.8.6.bb +++ b/recipes/glib-2.0/glib-2.0_2.8.6.bb @@ -20,7 +20,7 @@ EXTRA_OECONF = "--disable-debug" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1" + file://configure-libtool.patch" S = "${WORKDIR}/glib-${PV}" |