summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch37
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.27.3/60_wait-longer-for-threads-to-die.patch (renamed from meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch)12
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.27.3/configure-libtool.patch (renamed from meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch)16
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.27.3/glib-gettextize-dir.patch (renamed from meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch)13
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.27.3.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb)3
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc2
6 files changed, 26 insertions, 57 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch
deleted file mode 100644
index 1f3920f03a..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/gatomic-proper-pointer-get-cast.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1# handle cast warning. borrow from OE, but updated with a better fix from glib
2# developing tree.
3#
4# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
5commit bf2719c815d719d1899b4bdb1b81ff6798471094
6Author: Lars Ellenberg <lars.ellenberg@linbit.com>
7Date: Thu Apr 15 19:03:05 2010 +0200
8
9 Cast to volatile to avoid warnings from -Wcast-qual
10
11 https://bugzilla.gnome.org/show_bug.cgi?id=457641
12
13diff --git a/glib/gatomic.h b/glib/gatomic.h
14index 7d9c318..22b28d9 100644
15--- a/glib/gatomic.h
16+++ b/glib/gatomic.h
17@@ -64,16 +64,16 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI
18 #else
19 # define g_atomic_int_get(atomic) \
20 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
21- (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic)))
22+ (g_atomic_int_get) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
23 # define g_atomic_int_set(atomic, newval) \
24 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gint) ? 1 : -1]), \
25- (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
26+ (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
27 # define g_atomic_pointer_get(atomic) \
28 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
29- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic)))
30+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
31 # define g_atomic_pointer_set(atomic, newval) \
32 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
33- (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (void *) (atomic), (newval)))
34+ (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
35 #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
36
37 #define g_atomic_int_inc(atomic) (g_atomic_int_add ((atomic), 1))
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/60_wait-longer-for-threads-to-die.patch
index 1676b3e257..8195bd4922 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/60_wait-longer-for-threads-to-die.patch
@@ -1,8 +1,10 @@
1# copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity. 1copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity.
2# 2Added to poky by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
3# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 3Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
4--- glib/tests/threadpool-test.c.old 2008-02-12 06:11:21.000000000 +0100 4
5+++ glib/tests/threadpool-test.c 2008-02-12 06:11:52.000000000 +0100 5diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c
6--- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800
7+++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800
6@@ -5,8 +5,8 @@ 8@@ -5,8 +5,8 @@
7 9
8 #include <glib.h> 10 #include <glib.h>
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/configure-libtool.patch
index 3ba79b8986..a5dd4f249e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/configure-libtool.patch
@@ -1,11 +1,13 @@
1# Poky renames libtool to $host_alias-libtool. 1# Poky renames libtool to $host_alias-libtool.
2# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 2# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2
3# so we can't call # it at this point. We can safely assume a version is available 3# so we can't call # it at this point. We can safely assume a version is available
4# from PATH though 4# from PATH though
5# Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>
5 6
6--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 7diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac
7+++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 8--- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800
8@@ -1174,7 +1174,7 @@ 9+++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800
10@@ -1385,7 +1385,7 @@
9 G_MODULE_LDFLAGS= 11 G_MODULE_LDFLAGS=
10 else 12 else
11 export SED 13 export SED
@@ -14,7 +16,7 @@
14 fi 16 fi
15 dnl G_MODULE_IMPL= don't reset, so cmd-line can override 17 dnl G_MODULE_IMPL= don't reset, so cmd-line can override
16 G_MODULE_NEED_USCORE=0 18 G_MODULE_NEED_USCORE=0
17@@ -1265,7 +1265,7 @@ 19@@ -1450,7 +1450,7 @@
18 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" 20 LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS"
19 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness 21 dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness
20 echo "void glib_plugin_test(void) { }" > plugin.c 22 echo "void glib_plugin_test(void) { }" > plugin.c
@@ -23,9 +25,9 @@
23 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null 25 -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null
24 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], 26 AC_CACHE_CHECK([for RTLD_GLOBAL brokenness],
25 glib_cv_rtldglobal_broken,[ 27 glib_cv_rtldglobal_broken,[
26@@ -1339,7 +1339,7 @@ 28@@ -1524,7 +1524,7 @@
27 29
28 AC_MSG_CHECKING(for the suffix of shared libraries) 30 AC_MSG_CHECKING(for the suffix of module shared libraries)
29 export SED 31 export SED
30-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` 32-shrext_cmds=`./libtool --config | grep '^shrext_cmds='`
31+shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` 33+shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='`
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/glib-gettextize-dir.patch
index c44e491556..e54a8e5106 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0-2.24.1/glib-gettextize-dir.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/glib-gettextize-dir.patch
@@ -6,11 +6,14 @@
6# portable here. mark for upstream 6# portable here. mark for upstream
7# 7#
8# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 8# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010
9--- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100 9# Rebased by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010
10+++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100 10
11@@ -49,7 +49,7 @@ 11diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in
12 ;; 12--- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800
13 esac 13+++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800
14@@ -52,7 +52,7 @@
15 datadir=@datadir@
16 datarootdir=@datarootdir@
14 17
15-gettext_dir=$prefix/share/glib-2.0/gettext 18-gettext_dir=$prefix/share/glib-2.0/gettext
16+gettext_dir=@datadir@/glib-2.0/gettext 19+gettext_dir=@datadir@/glib-2.0/gettext
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.3.bb
index d8d1cc52d2..229012b16c 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.24.1.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.3.bb
@@ -2,9 +2,8 @@ require glib.inc
2 2
3PR = "r0" 3PR = "r0"
4 4
5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.24/glib-${PV}.tar.bz2 \ 5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \
6 file://configure-libtool.patch \ 6 file://configure-libtool.patch \
7 file://gatomic-proper-pointer-get-cast.patch \
8 file://60_wait-longer-for-threads-to-die.patch" 7 file://60_wait-longer-for-threads-to-die.patch"
9 8
10SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" 9SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0150b7fb9b..b0df84eca0 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
8 file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 8 file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
9 file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \ 9 file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \
10 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ 10 file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \
11 file://glib/pcre/pcre.h;startline=11;endline=35;md5=000109ccf7c4c470b74046e2cc59f7e3 \ 11 file://glib/pcre/pcre.h;startline=11;endline=35;md5=cc0858840d3c312ec3e45b28077eb0d8 \
12 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" 12 file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc"
13BUGTRACKER = "http://bugzilla.gnome.org" 13BUGTRACKER = "http://bugzilla.gnome.org"
14SECTION = "libs" 14SECTION = "libs"