Add patch from svn to fix c++ builds

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2299 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 44 insertions, 2 deletions

diff --git a/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch b/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch
new file mode 100644
index 0000000000..d48072e202
--- /dev/null
+++ b/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch
@@ -0,0 +1,40 @@
+Index: glib/gthread.c
+===================================================================
+--- glib/gthread.c      (revision 5636)
++++ glib/gthread.c      (revision 5639)
+@@ -223,11 +223,11 @@
+ g_once_init_leave (volatile gsize *value_location,
+                    gsize           initialization_value)
+ {
+-  g_return_if_fail (g_atomic_pointer_get (value_location) == 0);
++  g_return_if_fail (g_atomic_pointer_get ((void**) value_location) == 0);
+   g_return_if_fail (initialization_value != 0);
+   g_return_if_fail (g_once_init_list != NULL);
+ 
+-  g_atomic_pointer_set (value_location, initialization_value);
++  g_atomic_pointer_set ((void**) value_location, (void*) initialization_value);
+   g_mutex_lock (g_once_mutex);
+   g_once_init_list = g_slist_remove (g_once_init_list, (void*) value_location);
+   g_cond_broadcast (g_once_cond);
+@@ -255,7 +255,7 @@
+   g_mutex_lock (g_once_mutex);
+ 
+   if (!(*mutex))
+-    g_atomic_pointer_set (mutex, g_mutex_new());
++    g_atomic_pointer_set ((void**) mutex, g_mutex_new());
+ 
+   g_mutex_unlock (g_once_mutex);
+ 
+Index: glib/gthread.h
+===================================================================
+--- glib/gthread.h      (revision 5636)
++++ glib/gthread.h      (revision 5639)
+@@ -332,7 +332,7 @@
+ G_INLINE_FUNC gboolean
+ g_once_init_enter (volatile gsize *value_location)
+ {
+-  if G_LIKELY (g_atomic_pointer_get (value_location) !=0)
++  if G_LIKELY (g_atomic_pointer_get ((void**) value_location) !=0)
+     return FALSE;
+   else
+     return g_once_init_enter_impl (value_location);
diff --git a/meta/packages/glib-2.0/glib-2.0_2.13.7.bb b/meta/packages/glib-2.0/glib-2.0_2.13.7.bb
index be296be20c..7542ed2e14 100644
--- a/meta/packages/glib-2.0/glib-2.0_2.13.7.bb
+++ b/meta/packages/glib-2.0/glib-2.0_2.13.7.bb
@@ -1,6 +1,8 @@
 require glib.inc
 
+PR = "r1"
+
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.13/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
-
+           file://configure-libtool.patch;patch=1 \
+           file://casts.patch;patch=1;pnum=0"