[oe-commits] org.oe.dev gtk+-2.6.10: patch GtkStatusBar .c|.h to work w/ glib >= 2.9.x

[mickeyl commit]

gtk+-2.6.10: patch GtkStatusBar .c|.h to work w/ glib >= 2.9.x

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9d96af3e7f4cb98e1a80bb91b5660474efbb8f69
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9d96af3e7f4cb98e1a80bb91b5660474efbb8f69
Files:
1
packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
packages/gtk+/gtk+_2.6.10.bb
Diffs:

#
# mt diff -rf00466f8bdfd620de927136b79861e8d59cd2855 -r9d96af3e7f4cb98e1a80bb91b5660474efbb8f69
#
# 
# 
# add_file "packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch"
#  content [bfa6ff95f1cf9c4eee90ec3209cd56c19c2fcb94]
# 
# patch "packages/gtk+/gtk+_2.6.10.bb"
#  from [34b443893940473e86b7327aea945f7c0f85f9b5]
#    to [c56348e559aa936cd66c924ebf4f64e2bbb99db0]
# 
============================================================
--- packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch	bfa6ff95f1cf9c4eee90ec3209cd56c19c2fcb94
+++ packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch	bfa6ff95f1cf9c4eee90ec3209cd56c19c2fcb94
@@ -0,0 +1,59 @@
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.h,v
+retrieving revision 1.17
+retrieving revision 1.17.2.1
+diff -u -r1.17 -r1.17.2.1
+--- gtkstatusbar.h	2005/03/20 07:01:22	1.17
++++ gtkstatusbar.h	2005/12/06 14:25:30	1.17.2.1
+@@ -65,7 +65,7 @@
+ {
+   GtkHBoxClass parent_class;
+ 
+-  GMemChunk *messages_mem_chunk;
++  gpointer messages_mem_chunk;
+ 
+   void	(*text_pushed)	(GtkStatusbar	*statusbar,
+ 			 guint		 context_id,
+===================================================================
+RCS file: /cvs/gnome/gtk+/gtk/gtkstatusbar.c,v
+retrieving revision 1.56
+retrieving revision 1.56.2.1
+diff -u -r1.56 -r1.56.2.1
+--- gtkstatusbar.c	2005/07/21 19:10:48	1.56
++++ gtkstatusbar.c	2005/12/06 14:25:30	1.56.2.1
+@@ -302,7 +302,7 @@
+   g_return_val_if_fail (text != NULL, 0);
+ 
+   class = GTK_STATUSBAR_GET_CLASS (statusbar);
+-  msg = g_chunk_new (GtkStatusbarMsg, class->messages_mem_chunk);
++  msg = g_chunk_new (GtkStatusbarMsg, (GMemChunk *)class->messages_mem_chunk);
+   msg->text = g_strdup (text);
+   msg->context_id = context_id;
+   msg->message_id = statusbar->seq_message_id++;
+@@ -343,7 +343,7 @@
+ 	      statusbar->messages = g_slist_remove_link (statusbar->messages,
+ 							 list);
+ 	      g_free (msg->text);
+-	      g_mem_chunk_free (class->messages_mem_chunk, msg);
++	      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
+ 	      g_slist_free_1 (list);
+ 	      break;
+ 	    }
+@@ -394,7 +394,7 @@
+ 	      class = GTK_STATUSBAR_GET_CLASS (statusbar);
+ 	      statusbar->messages = g_slist_remove_link (statusbar->messages, list);
+ 	      g_free (msg->text);
+-	      g_mem_chunk_free (class->messages_mem_chunk, msg);
++	      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
+ 	      g_slist_free_1 (list);
+ 	      
+ 	      break;
+@@ -459,7 +459,7 @@
+ 
+       msg = list->data;
+       g_free (msg->text);
+-      g_mem_chunk_free (class->messages_mem_chunk, msg);
++      g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg);
+     }
+   g_slist_free (statusbar->messages);
+   statusbar->messages = NULL;
============================================================
--- packages/gtk+/gtk+_2.6.10.bb	34b443893940473e86b7327aea945f7c0f85f9b5
+++ packages/gtk+/gtk+_2.6.10.bb	c56348e559aa936cd66c924ebf4f64e2bbb99db0
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 pango atk jpeg libpn
 LICENSE = "LGPL"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
            file://help.patch;patch=1 \
@@ -23,7 +23,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
 	   file://small-gtkfilesel.patch;patch=1 \
 	   file://migration.patch;patch=1;pnum=0 \
 	   file://single-click.patch;patch=1 \
-	   file://menu-styling.patch;patch=1"
+	   file://menu-styling.patch;patch=1 \
+	   file://compile-against-newer-glib.patch;patch=1"
 
 inherit autotools pkgconfig