diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-18 20:01:08 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-19 20:41:26 +0200 |
commit | 556fd149eccb83a1a19785932e8f98cc0ede2510 (patch) | |
tree | a2aa9c0e17febaae3fb0ebe1f6a12fb460a37913 /meta-oe/recipes-core/glib-2.0 | |
parent | 709e92e30b51bb6c2a023c3193169d2330c876bf (diff) | |
download | meta-openembedded-contrib-556fd149eccb83a1a19785932e8f98cc0ede2510.tar.gz |
glib-2.0: import 2.28.8 untill it gets into OE-core
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core/glib-2.0')
3 files changed, 78 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch new file mode 100644 index 00000000000..ad1ca12b804 --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch @@ -0,0 +1,28 @@ +From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Sat, 18 Jun 2011 23:51:35 +0200 +Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch + +Upstream-Status: Unknown + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + glib/gatomic.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/glib/gatomic.h b/glib/gatomic.h +index ddd39b8..b758142 100644 +--- a/glib/gatomic.h ++++ b/glib/gatomic.h +@@ -70,7 +70,7 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI + (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile 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 *) (volatile 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 *) (volatile void *) (atomic), (newval))) +-- +1.6.6.1 + diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch new file mode 100644 index 00000000000..678033039f4 --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch @@ -0,0 +1,25 @@ +From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Sat, 18 Jun 2011 23:52:17 +0200 +Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang + +Upstream-Status: Unknown + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + gobject/glib-mkenums.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in +index 6372245..b486fe9 100755 +--- a/gobject/glib-mkenums.in ++++ b/gobject/glib-mkenums.in +@@ -1,4 +1,4 @@ +-#! @PERL_PATH@ ++#! /usr/bin/env perl + + use warnings; + use File::Basename; +-- +1.6.6.1 + diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0_2.28.8.bb b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.28.8.bb new file mode 100644 index 00000000000..7f7f59ebc80 --- /dev/null +++ b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.28.8.bb @@ -0,0 +1,25 @@ +require glib.inc + +PR = "r1" +PE = "1" + +SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \ + file://configure-libtool.patch \ + file://60_wait-longer-for-threads-to-die.patch \ + file://g_once_init_enter.patch \ + file://0003-gatomic-proper-pointer-get-cast.patch.patch \ + file://0005-glib-mkenums-interpreter.patch.patch \ + " +# Only apply this patch for target recipe on uclibc +SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}" + +SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" + +SRC_URI[md5sum] = "789e7520f71c6a4bf08bc683ec764d24" +SRC_URI[sha256sum] = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1f9466f" + +BBCLASSEXTEND = "native" + +FILES_${PN} += "${sysconfdir}/bash_completion.d ${datadir}/glib-2.0/schemas" +FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" + |