summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-20 10:24:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-22 16:27:32 +0100
commit3c1a9608564df94aa33611021e5587e7d6b6741b (patch)
tree375cfc001dc97708a082ae30b29676ad273960a4
parent899dcfe4aded276b43cb6d75584c6fd6c00fe9fb (diff)
downloadpoky-3c1a9608564df94aa33611021e5587e7d6b6741b.tar.gz
glib-2.0 2.28.x: update to 2.28.8
(From OE-Core rev: c075634135249d3d5d84bbb6dd98e98d3fbf938c) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch28
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch25
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb (renamed from meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb)12
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc3
4 files changed, 63 insertions, 5 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
new file mode 100644
index 0000000000..ad1ca12b80
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
@@ -0,0 +1,28 @@
1From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 18 Jun 2011 23:51:35 +0200
4Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch
5
6Upstream-Status: Unknown
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9---
10 glib/gatomic.h | 2 +-
11 1 files changed, 1 insertions(+), 1 deletions(-)
12
13diff --git a/glib/gatomic.h b/glib/gatomic.h
14index ddd39b8..b758142 100644
15--- a/glib/gatomic.h
16+++ b/glib/gatomic.h
17@@ -70,7 +70,7 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI
18 (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
19 # define g_atomic_pointer_get(atomic) \
20 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
21- (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
22+ (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic)))
23 # define g_atomic_pointer_set(atomic, newval) \
24 ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
25 (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
26--
271.6.6.1
28
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
new file mode 100644
index 0000000000..678033039f
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
@@ -0,0 +1,25 @@
1From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 18 Jun 2011 23:52:17 +0200
4Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang
5
6Upstream-Status: Unknown
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9---
10 gobject/glib-mkenums.in | 2 +-
11 1 files changed, 1 insertions(+), 1 deletions(-)
12
13diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
14index 6372245..b486fe9 100755
15--- a/gobject/glib-mkenums.in
16+++ b/gobject/glib-mkenums.in
17@@ -1,4 +1,4 @@
18-#! @PERL_PATH@
19+#! /usr/bin/env perl
20
21 use warnings;
22 use File::Basename;
23--
241.6.6.1
25
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
index ca5f4c8b1c..e84aea5344 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
@@ -1,18 +1,22 @@
1require glib.inc 1require glib.inc
2 2
3PE = "1"
4PR = "r1" 3PR = "r1"
4PE = "1"
5 5
6SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \ 6SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \
7 file://configure-libtool.patch \ 7 file://configure-libtool.patch \
8 file://60_wait-longer-for-threads-to-die.patch \ 8 file://60_wait-longer-for-threads-to-die.patch \
9 file://g_once_init_enter.patch \ 9 file://g_once_init_enter.patch \
10 file://0003-gatomic-proper-pointer-get-cast.patch.patch \
11 file://0005-glib-mkenums-interpreter.patch.patch \
10 " 12 "
11# Only apply this patch for target recipe on uclibc 13# Only apply this patch for target recipe on uclibc
12SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" 14SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
13 15
14SRC_URI[md5sum] = "7d8fc15ae70d5111c0cf2a79d50ef717"
15SRC_URI[sha256sum] = "557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578"
16
17SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" 16SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
17
18SRC_URI[md5sum] = "789e7520f71c6a4bf08bc683ec764d24"
19SRC_URI[sha256sum] = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f"
20
18BBCLASSEXTEND = "native" 21BBCLASSEXTEND = "native"
22
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 0488490b86..0800c85c4a 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -31,7 +31,8 @@ EXTRA_OECONF = "--disable-debug --enable-included-printf=no"
31EXTRA_OECONF_virtclass-native = "" 31EXTRA_OECONF_virtclass-native = ""
32EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no" 32EXTRA_OECONF_linuxstdbase = "--enable-included-printf=no"
33 33
34FILES_${PN} = "${libdir}/lib*${SOLIBS}" 34FILES_${PN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas"
35FILES_${PN}-dev += "${libdir}/glib-2.0/include" 35FILES_${PN}-dev += "${libdir}/glib-2.0/include"
36FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb"
36 37
37ARM_INSTRUCTION_SET = "arm" 38ARM_INSTRUCTION_SET = "arm"