gtk+: consolidate 2 patches which are identical across all versions into files/ and...

* xsettings.patch and gtklabel-resize-patch
* there are probably other patches where this would be possible

diff --git a/packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch b/packages/gtk+/files/gtklabel-resize-patch
similarity index 100%
rename from packages/gtk+/gtk+-2.10.14/gtklabel-resize-patch
rename to packages/gtk+/files/gtklabel-resize-patch

diff --git a/packages/gtk+/gtk+-2.10.14/xsettings.patch b/packages/gtk+/files/xsettings.patch
similarity index 100%
rename from packages/gtk+/gtk+-2.10.14/xsettings.patch
rename to packages/gtk+/files/xsettings.patch

diff --git a/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch b/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
deleted file mode 100644 (file)
index df29656..0000000
--- a/packages/gtk+/gtk+-2.12.0/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c  2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.12.0/xsettings.patch b/packages/gtk+/gtk+-2.12.0/xsettings.patch
deleted file mode 100644 (file)
index b63e262..0000000
--- a/packages/gtk+/gtk+-2.12.0/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old     Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch b/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch
deleted file mode 100644 (file)
index df29656..0000000
--- a/packages/gtk+/gtk+-2.12.3/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c  2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.12.3/xsettings.patch b/packages/gtk+/gtk+-2.12.3/xsettings.patch
deleted file mode 100644 (file)
index b63e262..0000000
--- a/packages/gtk+/gtk+-2.12.3/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old     Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch b/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch
deleted file mode 100644 (file)
index df29656..0000000
--- a/packages/gtk+/gtk+-2.6.10/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c  2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.6.10/xsettings.patch b/packages/gtk+/gtk+-2.6.10/xsettings.patch
deleted file mode 100644 (file)
index b63e262..0000000
--- a/packages/gtk+/gtk+-2.6.10/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old     Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch
deleted file mode 100644 (file)
index df29656..0000000
--- a/packages/gtk+/gtk+-2.8.16/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c  2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.8.16/xsettings.patch b/packages/gtk+/gtk+-2.8.16/xsettings.patch
deleted file mode 100644 (file)
index b63e262..0000000
--- a/packages/gtk+/gtk+-2.8.16/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old     Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch b/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch
deleted file mode 100644 (file)
index df29656..0000000
--- a/packages/gtk+/gtk+-2.8.9/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
-+++ gtk+-2.4.3/gtk/gtklabel.c  2004-07-05 13:33:57.000000000 +0100
-@@ -1623,6 +1623,7 @@
- 
-   /* We have to clear the layout, fonts etc. may have changed */
-   gtk_label_clear_layout (label);
-+  gtk_widget_queue_resize (GTK_WIDGET (label));
- }
- 
- static void 

diff --git a/packages/gtk+/gtk+-2.8.9/xsettings.patch b/packages/gtk+/gtk+-2.8.9/xsettings.patch
deleted file mode 100644 (file)
index b63e262..0000000
--- a/packages/gtk+/gtk+-2.8.9/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old     Sun Aug 22 17:14:00 2004
-+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
-@@ -2827,10 +2827,9 @@
- {
-   GdkScreenX11 *screen = data;
-   
--  if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
--    return GDK_FILTER_REMOVE;
--  else
--    return GDK_FILTER_CONTINUE;
-+  xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
-+
-+  return GDK_FILTER_CONTINUE;
- }
- 
- static void