Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
...003-gatomic-proper-pointer-get-cast.patch.patch | 28 --
.../0005-glib-mkenums-interpreter.patch.patch | 25 -
.../60_wait-longer-for-threads-to-die.patch| 24 +-
meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch |2 -
.../glib-2.0/remove.test.for.qsort_r.patch | 53
meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 -
meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 +++
7 files changed, 106 insertions(+), 90 deletions(-)
delete mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
delete mode 100644
meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
create mode 100644
meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
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
deleted file mode 100644
index 5c0afbc..000
---
a/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001
-From: Koen Kooi k...@dominion.thruhere.net
-Date: Sat, 18 Jun 2011 23:51:35 +0200
-Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch
-
-Upstream-Status: Pending
-
-Signed-off-by: Koen Kooi k...@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/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
deleted file mode 100644
index db9a799..000
---
a/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001
-From: Koen Kooi k...@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: Inappropriate [configuration]
-
-Signed-off-by: Koen Kooi k...@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/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
index b65a474..4ff7b80 100644
---
a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++
b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
@@ -4,9 +4,9 @@ Rebased for glib-2.27.3 by Dongxiao Xu dongxiao...@intel.com,
11/16/2010
Upstream-Status: Inappropriate [patches for test code]
-diff -ruN glib-2.27.3-orig/tests/threadpool-test.c
glib-2.27.3/tests/threadpool-test.c
glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.0
+0800
-+++ glib-2.27.3/tests/threadpool-test.c2010-11-16 12:28:09.002172678
+0800
+diff -ruN glib-2.30.0-orig/tests/threadpool-test.c
glib-2.30.0/tests/threadpool-test.c
+--- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.0
+0800
glib-2.30.0/tests/threadpool-test.c2010-11-16 12:28:09.002172678
+0800
@@ -5,8 +5,8 @@
#include glib.h
@@ -18,16 +18,16 @@ diff -ruN glib-2.27.3-orig/tests/threadpool-test.c
glib-2.27.3/tests/threadpool-
#define WAIT5/* seconds */
#define MAX_THREADS 10
-@@ -124,10 +124,10 @@
-DEBUG_MSG
