aboutsummaryrefslogtreecommitdiffstats
path: root/packages/gtk+
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2007-01-27 14:38:06 +0000
committerMichael Lauer <mickey@vanille-media.de>2007-01-27 14:38:06 +0000
commitccdf1a772e36476ac991c1e9b48e6083e0d12759 (patch)
tree6978150a211899749658831c87e648367a38fde4 /packages/gtk+
parentbccc702aacd2f82030baae66b3d80358820574f7 (diff)
downloadopenembedded-ccdf1a772e36476ac991c1e9b48e6083e0d12759.tar.gz
gtk+ 2.6.10 compile-against-newer-glib.patch rediff and make it -p1
Diffstat (limited to 'packages/gtk+')
-rw-r--r--packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch18
1 files changed, 4 insertions, 14 deletions
diff --git a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
index c92070c7aa..3d8f3f614b 100644
--- a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
+++ b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch
@@ -1,10 +1,5 @@
-===================================================================
-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
+--- gtk+-2.6.10/gtk/gtkstatusbar.h 2005/03/20 07:01:22 1.17
++++ gtk+-2.6.10/gtk/gtkstatusbar.h 2005/12/06 14:25:30 1.17.2.1
@@ -65,7 +65,7 @@
{
GtkHBoxClass parent_class;
@@ -14,13 +9,8 @@ diff -u -r1.17 -r1.17.2.1
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
+--- gtk+-2.6.10/gtk/gtkstatusbar.c 2005/07/21 19:10:48 1.56
++++ gtk+-2.6.10/gtk/gtkstatusbar.c 2005/12/06 14:25:30 1.56.2.1
@@ -302,7 +302,7 @@
g_return_val_if_fail (text != NULL, 0);