diff options
author | Tom Rini <tom_rini@mentor.com> | 2011-03-16 12:03:53 -0700 |
---|---|---|
committer | Tom Rini <tom_rini@mentor.com> | 2011-03-16 12:13:57 -0700 |
commit | e41ded5f413fdc54a526795c2a202484c2796b84 (patch) | |
tree | 4abc64b17ef1844c61f66fd7310a25a4e0745040 /recipes/gtk+ | |
parent | 467575f6e24c425987b14f5b5f32bd0714926bb2 (diff) | |
download | openembedded-e41ded5f413fdc54a526795c2a202484c2796b84.tar.gz |
In a large number of patches, remove unneeded '..' in paths.
In most cases we had both ../foopkg/foopkg as the first path and
this simply became foopkg (the second path was already correct for
the default strip level which is why the patch applies normally).
In a few cases the second path was '.' which is valid but not as
clear as 'b' (which is what git shows for example) so update
that while we're at it.
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'recipes/gtk+')
-rw-r--r-- | recipes/gtk+/gtk+-2.10.14/no-xwc.patch | 12 | ||||
-rw-r--r-- | recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch | 4 | ||||
-rw-r--r-- | recipes/gtk+/gtk+-2.6.10/no-xwc.patch | 12 | ||||
-rw-r--r-- | recipes/gtk+/gtk+-2.6.10/single-click.patch | 8 | ||||
-rw-r--r-- | recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch | 4 |
5 files changed, 20 insertions, 20 deletions
diff --git a/recipes/gtk+/gtk+-2.10.14/no-xwc.patch b/recipes/gtk+/gtk+-2.10.14/no-xwc.patch index affb4a303e..8de54de9d8 100644 --- a/recipes/gtk+/gtk+-2.10.14/no-xwc.patch +++ b/recipes/gtk+/gtk+-2.10.14/no-xwc.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c +--- gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 +++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 @@ -576,12 +576,14 @@ GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); @@ -32,8 +32,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/ else g_error("undefined font type\n"); } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c +--- gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 +++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 @@ -525,10 +525,12 @@ width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); @@ -96,8 +96,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/ } } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c +--- gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 +++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 @@ -48,6 +48,7 @@ void diff --git a/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch b/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch index 20bf4cf366..d6efa1e612 100644 --- a/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch +++ b/recipes/gtk+/gtk+-2.10.14/small-gtkfilesel.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 +diff -urNd gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c +--- gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 +++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 @@ -68,6 +68,7 @@ #include "gtkprivate.h" diff --git a/recipes/gtk+/gtk+-2.6.10/no-xwc.patch b/recipes/gtk+/gtk+-2.6.10/no-xwc.patch index affb4a303e..8de54de9d8 100644 --- a/recipes/gtk+/gtk+-2.6.10/no-xwc.patch +++ b/recipes/gtk+/gtk+-2.6.10/no-xwc.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c +--- gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00 +++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00 @@ -576,12 +576,14 @@ GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2); @@ -32,8 +32,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/ else g_error("undefined font type\n"); } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c +--- gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00 +++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00 @@ -525,10 +525,12 @@ width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); @@ -96,8 +96,8 @@ diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/ } } -diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c ---- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 +diff -urNd gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c +--- gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00 +++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00 @@ -48,6 +48,7 @@ void diff --git a/recipes/gtk+/gtk+-2.6.10/single-click.patch b/recipes/gtk+/gtk+-2.6.10/single-click.patch index 3bb208d4d6..41e70c8487 100644 --- a/recipes/gtk+/gtk+-2.6.10/single-click.patch +++ b/recipes/gtk+/gtk+-2.6.10/single-click.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c ---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00 +diff -urNd gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c +--- gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00 +++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00 @@ -1023,9 +1023,11 @@ } @@ -15,8 +15,8 @@ diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkc private_data->in_drag = 0; if (day_month == MONTH_CURRENT) g_signal_emit (calendar, -diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c ---- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00 +diff -urNd gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c +--- gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00 +++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00 @@ -2468,6 +2468,33 @@ if (fs->last_selected != NULL) diff --git a/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch b/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch index 20bf4cf366..d6efa1e612 100644 --- a/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch +++ b/recipes/gtk+/gtk+-2.6.10/small-gtkfilesel.patch @@ -1,5 +1,5 @@ -diff -urNd ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c ---- ../gtk+-2.4.4-r5/gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 +diff -urNd gtk+-2.4.4/gtk/gtkfilesel.c gtk+-2.4.4/gtk/gtkfilesel.c +--- gtk+-2.4.4/gtk/gtkfilesel.c 2004-07-10 05:02:10.000000000 +0100 +++ gtk+-2.4.4/gtk/gtkfilesel.c 2004-09-13 13:40:09.000000000 +0100 @@ -68,6 +68,7 @@ #include "gtkprivate.h" |