summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-21 10:05:33 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-21 10:05:33 +0000
commite56649a95954bc74a2a7b75a8e8b6235727be444 (patch)
tree3690c709657c87882a215f9d536a06656b4cc193 /meta/packages
parent31fd33d296900581bad723814f38faf6fda16212 (diff)
downloadpoky-e56649a95954bc74a2a7b75a8e8b6235727be444.tar.gz
gtk+ 2.10.6: Sync with updated patches in OE.dev (pangoxft includes a calender fix)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@905 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch195
-rw-r--r--meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff13
-rw-r--r--meta/packages/gtk+/gtk+-2.10.6/single-click.patch26
-rw-r--r--meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch18
-rw-r--r--meta/packages/gtk+/gtk+_2.10.6.bb18
5 files changed, 100 insertions, 170 deletions
diff --git a/meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch b/meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch
index 20481f059b..1ea86ce6b2 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch
+++ b/meta/packages/gtk+/gtk+-2.10.6/gtk+-handhelds.patch
@@ -1,8 +1,10 @@
1--- gtk+-2.4.1/gtk/gtkarrow.c 2004-03-13 09:51:13.000000000 +1100 1Index: gtk+-2.10.6/gtk/gtkarrow.c
2+++ gtk+-2.4.1/gtk/gtkarrow.c 2004-05-26 14:52:17.000000000 +1000 2===================================================================
3@@ -29,7 +29,7 @@ 3--- gtk+-2.10.6.orig/gtk/gtkarrow.c 2006-05-14 05:25:28.000000000 +0100
4 #include "gtkarrow.h" 4+++ gtk+-2.10.6/gtk/gtkarrow.c 2006-11-14 12:03:45.000000000 +0000
5@@ -31,7 +31,7 @@
5 #include "gtkintl.h" 6 #include "gtkintl.h"
7 #include "gtkalias.h"
6 8
7-#define MIN_ARROW_SIZE 15 9-#define MIN_ARROW_SIZE 15
8+#define MIN_ARROW_SIZE 7 10+#define MIN_ARROW_SIZE 7
@@ -16,17 +18,17 @@
16+static void gtk_arrow_size_request (GtkWidget *arrow, 18+static void gtk_arrow_size_request (GtkWidget *arrow,
17+ GtkRequisition *requisition); 19+ GtkRequisition *requisition);
18 20
19 GType 21
20 gtk_arrow_get_type (void) 22 G_DEFINE_TYPE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
21@@ -111,6 +113,7 @@ 23@@ -88,6 +90,7 @@
22 G_PARAM_READABLE | G_PARAM_WRITABLE)); 24 GTK_PARAM_READWRITE));
23 25
24 widget_class->expose_event = gtk_arrow_expose; 26 widget_class->expose_event = gtk_arrow_expose;
25+ widget_class->size_request = gtk_arrow_size_request; 27+ widget_class->size_request = gtk_arrow_size_request;
26 } 28 }
27 29
28 static void 30 static void
29@@ -166,13 +169,18 @@ 31@@ -143,13 +146,18 @@
30 } 32 }
31 33
32 static void 34 static void
@@ -48,162 +50,73 @@
48 arrow->arrow_type = GTK_ARROW_RIGHT; 50 arrow->arrow_type = GTK_ARROW_RIGHT;
49 arrow->shadow_type = GTK_SHADOW_OUT; 51 arrow->shadow_type = GTK_SHADOW_OUT;
50 } 52 }
51--- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100 53Index: gtk+-2.10.6/gtk/gtkentry.c
52+++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000 54===================================================================
53@@ -340,6 +340,9 @@ 55--- gtk+-2.10.6.orig/gtk/gtkentry.c 2006-11-14 12:03:45.000000000 +0000
54 static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar, 56+++ gtk+-2.10.6/gtk/gtkentry.c 2006-11-14 12:07:02.000000000 +0000
55 guint day); 57@@ -577,6 +577,18 @@
56
57+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
58+ guint day);
59+
60 static void gtk_calendar_paint_arrow (GtkWidget *widget,
61 guint arrow);
62 static void gtk_calendar_paint_day_num (GtkWidget *widget,
63@@ -861,13 +864,13 @@
64 if (month_len < calendar->selected_day)
65 {
66 calendar->selected_day = 0;
67- gtk_calendar_select_day (calendar, month_len);
68+ gtk_calendar_do_select_day (calendar, month_len);
69 }
70 else
71 {
72 if (calendar->selected_day < 0)
73 calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
74- gtk_calendar_select_day (calendar, calendar->selected_day);
75+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
76 }
77
78 gtk_widget_queue_draw (GTK_WIDGET (calendar));
79@@ -908,10 +911,10 @@
80 if (month_len < calendar->selected_day)
81 {
82 calendar->selected_day = 0;
83- gtk_calendar_select_day (calendar, month_len);
84+ gtk_calendar_do_select_day (calendar, month_len);
85 }
86 else
87- gtk_calendar_select_day (calendar, calendar->selected_day);
88+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
89
90 gtk_widget_queue_draw (GTK_WIDGET (calendar));
91 gtk_calendar_thaw (calendar);
92@@ -939,10 +942,10 @@
93 if (month_len < calendar->selected_day)
94 {
95 calendar->selected_day = 0;
96- gtk_calendar_select_day (calendar, month_len);
97+ gtk_calendar_do_select_day (calendar, month_len);
98 }
99 else
100- gtk_calendar_select_day (calendar, calendar->selected_day);
101+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
102
103 gtk_widget_queue_draw (GTK_WIDGET (calendar));
104 gtk_calendar_thaw (calendar);
105@@ -974,10 +977,10 @@
106 if (month_len < calendar->selected_day)
107 {
108 calendar->selected_day = 0;
109- gtk_calendar_select_day (calendar, month_len);
110+ gtk_calendar_do_select_day (calendar, month_len);
111 }
112 else
113- gtk_calendar_select_day (calendar, calendar->selected_day);
114+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
115
116 gtk_widget_queue_draw (GTK_WIDGET (calendar));
117 gtk_calendar_thaw (calendar);
118@@ -2480,9 +2483,9 @@
119 return TRUE;
120 }
121
122-void
123-gtk_calendar_select_day (GtkCalendar *calendar,
124- guint day)
125+static void
126+gtk_calendar_do_select_day (GtkCalendar *calendar,
127+ guint day)
128 {
129 g_return_if_fail (GTK_IS_CALENDAR (calendar));
130 g_return_if_fail (day <= 31);
131@@ -2499,6 +2502,13 @@
132 if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
133 gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
134 }
135+}
136+
137+void
138+gtk_calendar_select_day (GtkCalendar *calendar,
139+ guint day)
140+{
141+ gtk_calendar_do_select_day (calendar, day);
142
143 calendar->selected_day = day;
144
145--- gtk+-2.4.1/gtk/gtkentry.c 2004-04-22 08:08:08.000000000 +1000
146+++ gtk+-2.4.1/gtk/gtkentry.c 2004-05-26 14:52:17.000000000 +1000
147@@ -557,6 +557,15 @@
148 0.0, 58 0.0,
149 G_PARAM_READABLE | G_PARAM_WRITABLE)); 59 GTK_PARAM_READWRITE));
150 60
61+ // Added by gtk+-handhelds.patch
151+ gtk_widget_class_install_style_property (widget_class, 62+ gtk_widget_class_install_style_property (widget_class,
152+ g_param_spec_int ("min_width", 63+ g_param_spec_int ("min_width",
153+ _("Minimum width"), 64+ P_("Minimum width"),
154+ _("Minimum width of the entry field"), 65+ P_("Minimum width of the entry field"),
155+ 0, 66+ 0,
156+ G_MAXINT, 67+ G_MAXINT,
157+ MIN_ENTRY_WIDTH, 68+ MIN_ENTRY_WIDTH,
158+ G_PARAM_READABLE)); 69+ G_PARAM_READABLE));
70+
71+
159+ 72+
160 signals[POPULATE_POPUP] = 73 /**
161 g_signal_new ("populate_popup", 74 * GtkEntry:truncate-multiline:
162 G_OBJECT_CLASS_TYPE (gobject_class), 75 *
163@@ -1124,7 +1133,7 @@ 76@@ -1286,7 +1298,7 @@
164 { 77 {
165 GtkEntry *entry = GTK_ENTRY (widget); 78 GtkEntry *entry = GTK_ENTRY (widget);
166 PangoFontMetrics *metrics; 79 PangoFontMetrics *metrics;
167- gint xborder, yborder; 80- gint xborder, yborder;
168+ gint xborder, yborder, min_width; 81+ gint xborder, yborder, min_width;
82 GtkBorder inner_border;
169 PangoContext *context; 83 PangoContext *context;
170 84
171 gtk_widget_ensure_style (widget); 85@@ -1302,8 +1314,10 @@
172@@ -1140,9 +1149,11 @@ 86 _gtk_entry_get_borders (entry, &xborder, &yborder);
173 87 _gtk_entry_effective_inner_border (entry, &inner_border);
174 xborder += INNER_BORDER; 88
175 yborder += INNER_BORDER;
176-
177+
178+ gtk_widget_style_get (widget, "min_width", &min_width, NULL); 89+ gtk_widget_style_get (widget, "min_width", &min_width, NULL);
179+ 90+
180 if (entry->width_chars < 0) 91 if (entry->width_chars < 0)
181- requisition->width = MIN_ENTRY_WIDTH + xborder * 2; 92- requisition->width = MIN_ENTRY_WIDTH + xborder * 2 + inner_border.left + inner_border.right;
182+ requisition->width = min_width + xborder * 2; 93+ requisition->width = min_width + xborder * 2 + inner_border.left + inner_border.right;
183 else 94 else
184 { 95 {
185 gint char_width = pango_font_metrics_get_approximate_char_width (metrics); 96 gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
186--- gtk+-2.4.1/gtk/gtkrange.c 2004-03-06 14:38:08.000000000 +1100 97Index: gtk+-2.10.6/gtk/gtkrange.c
187+++ gtk+-2.4.1/gtk/gtkrange.c 2004-05-26 14:52:17.000000000 +1000 98===================================================================
188@@ -180,6 +180,7 @@ 99--- gtk+-2.10.6.orig/gtk/gtkrange.c 2006-11-14 12:03:44.000000000 +0000
189 static GtkWidgetClass *parent_class = NULL; 100+++ gtk+-2.10.6/gtk/gtkrange.c 2006-11-14 12:07:40.000000000 +0000
190 static guint signals[LAST_SIGNAL]; 101@@ -197,6 +197,7 @@
102 static gboolean gtk_range_key_press (GtkWidget *range,
103 GdkEventKey *event);
191 104
192+static GdkAtom recognize_protocols_atom, atom_atom; 105+static GdkAtom recognize_protocols_atom, atom_atom;
193 106
194 GType 107 static guint signals[LAST_SIGNAL];
195 gtk_range_get_type (void) 108
196@@ -220,6 +221,9 @@ 109@@ -213,6 +214,9 @@
197 object_class = (GtkObjectClass*) class; 110 object_class = (GtkObjectClass*) class;
198 widget_class = (GtkWidgetClass*) class; 111 widget_class = (GtkWidgetClass*) class;
199 112
200+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE); 113+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
201+ atom_atom = gdk_atom_intern ("ATOM", FALSE); 114+ atom_atom = gdk_atom_intern ("ATOM", FALSE);
202+ 115+
203 parent_class = g_type_class_peek_parent (class);
204
205 gobject_class->set_property = gtk_range_set_property; 116 gobject_class->set_property = gtk_range_set_property;
206@@ -815,6 +819,12 @@ 117 gobject_class->get_property = gtk_range_get_property;
118 gobject_class->finalize = gtk_range_finalize;
119@@ -1020,6 +1024,12 @@
207 &attributes, attributes_mask); 120 &attributes, attributes_mask);
208 gdk_window_set_user_data (range->event_window, range); 121 gdk_window_set_user_data (range->event_window, range);
209 122
@@ -216,7 +129,7 @@
216 widget->style = gtk_style_attach (widget->style, widget->window); 129 widget->style = gtk_style_attach (widget->style, widget->window);
217 } 130 }
218 131
219@@ -1186,7 +1196,7 @@ 132@@ -1569,7 +1579,7 @@
220 133
221 /* ignore presses when we're already doing something else. */ 134 /* ignore presses when we're already doing something else. */
222 if (range->layout->grab_location != MOUSE_OUTSIDE) 135 if (range->layout->grab_location != MOUSE_OUTSIDE)
@@ -225,7 +138,7 @@
225 138
226 range->layout->mouse_x = event->x; 139 range->layout->mouse_x = event->x;
227 range->layout->mouse_y = event->y; 140 range->layout->mouse_y = event->y;
228@@ -1364,7 +1374,7 @@ 141@@ -1778,7 +1788,7 @@
229 return TRUE; 142 return TRUE;
230 } 143 }
231 144
diff --git a/meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff b/meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
index 142a9a8e88..63828cec63 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
+++ b/meta/packages/gtk+/gtk+-2.10.6/pangoxft2.10.6.diff
@@ -2441,3 +2441,16 @@ Index: gtk+-2.10.6/gdk/x11/gdkpixmap-x11.c
2441 _gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl)); 2441 _gdk_x11_drawable_finish (GDK_DRAWABLE (draw_impl));
2442 } 2442 }
2443 2443
2444--- gtk+-2.10.6.orig/gtk/gtkcalendar.c.orig 2006-11-14 14:39:34.000000000 -0800
2445+++ gtk+-2.10.6/gtk/gtkcalendar.c 2006-11-14 14:37:34.000000000 -0800
2446@@ -1495,6 +1495,10 @@ gtk_calendar_realize (GtkWidget *widget)
2447 BACKGROUND_COLOR ( GTK_WIDGET ( calendar)));
2448 gdk_window_show (priv->main_win);
2449 gdk_window_set_user_data (priv->main_win, widget);
2450+
2451+ /* Set widgets gc */
2452+ calendar->gc = gdk_gc_new (widget->window);
2453+
2454 gdk_window_set_background (widget->window, BACKGROUND_COLOR (widget));
2455 gdk_window_show (widget->window);
2456 gdk_window_set_user_data (widget->window, widget);
diff --git a/meta/packages/gtk+/gtk+-2.10.6/single-click.patch b/meta/packages/gtk+/gtk+-2.10.6/single-click.patch
index 3bb208d4d6..250f1629f5 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/single-click.patch
+++ b/meta/packages/gtk+/gtk+-2.10.6/single-click.patch
@@ -1,24 +1,26 @@
1diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c gtk+-2.6.3/gtk/gtkcalendar.c 1Index: gtk+-2.10.6/gtk/gtkcalendar.c
2--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 16:57:04 +01:00 2===================================================================
3+++ gtk+-2.6.3/gtk/gtkcalendar.c 2005-04-06 20:05:18 +01:00 3--- gtk+-2.10.6.orig/gtk/gtkcalendar.c
4@@ -1023,9 +1023,11 @@ 4+++ gtk+-2.10.6/gtk/gtkcalendar.c
5@@ -2482,9 +2482,11 @@ calendar_main_button_press (GtkCalendar
5 } 6 }
6 7
7 gtk_calendar_select_and_focus_day (calendar, day); 8 calendar_select_and_focus_day (calendar, day);
8- } 9- }
9+ 10+
10+ // This change causes the calendar to disappear after choosing a day 11+ // This change causes the calendar to disappear after choosing a day
11+/* } 12+/* }
12 else if (event->type == GDK_2BUTTON_PRESS) 13 else if (event->type == GDK_2BUTTON_PRESS)
13- { 14- {
14+ {*/ 15+ {*/
15 private_data->in_drag = 0; 16 priv->in_drag = 0;
16 if (day_month == MONTH_CURRENT) 17 if (day_month == MONTH_CURRENT)
17 g_signal_emit (calendar, 18 g_signal_emit (calendar,
18diff -urNd ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c gtk+-2.6.3/gtk/gtkfilesel.c 19Index: gtk+-2.10.6/gtk/gtkfilesel.c
19--- ../gtk+-2.6.3-r0.old/gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-06 16:57:07 +01:00 20===================================================================
20+++ gtk+-2.6.3/gtk/gtkfilesel.c 2005-04-07 13:40:32 +01:00 21--- gtk+-2.10.6.orig/gtk/gtkfilesel.c
21@@ -2468,6 +2468,33 @@ 22+++ gtk+-2.10.6/gtk/gtkfilesel.c
23@@ -2426,6 +2426,33 @@ gtk_file_selection_file_changed (GtkTree
22 if (fs->last_selected != NULL) 24 if (fs->last_selected != NULL)
23 g_free (fs->last_selected); 25 g_free (fs->last_selected);
24 26
diff --git a/meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch b/meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch
index 8ad7507af0..c26dc6d93c 100644
--- a/meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch
+++ b/meta/packages/gtk+/gtk+-2.10.6/spinbutton.patch
@@ -1,6 +1,8 @@
1--- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100 1Index: gtk+-2.10.6/gtk/gtkspinbutton.c
2+++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100 2===================================================================
3@@ -733,7 +733,7 @@ 3--- gtk+-2.10.6.orig/gtk/gtkspinbutton.c
4+++ gtk+-2.10.6/gtk/gtkspinbutton.c
5@@ -682,7 +682,7 @@ gtk_spin_button_size_allocate (GtkWidget
4 6
5 spin = GTK_SPIN_BUTTON (widget); 7 spin = GTK_SPIN_BUTTON (widget);
6 arrow_size = spin_button_get_arrow_size (spin); 8 arrow_size = spin_button_get_arrow_size (spin);
@@ -9,7 +11,7 @@
9 11
10 widget->allocation = *allocation; 12 widget->allocation = *allocation;
11 13
12@@ -866,19 +866,16 @@ 14@@ -815,19 +815,16 @@ gtk_spin_button_draw_arrow (GtkSpinButto
13 { 15 {
14 width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness; 16 width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
15 17
@@ -33,7 +35,7 @@
33 } 35 }
34 36
35 if (spin_button_at_limit (spin_button, arrow_type)) 37 if (spin_button_at_limit (spin_button, arrow_type))
36@@ -908,32 +905,17 @@ 38@@ -857,32 +854,17 @@ gtk_spin_button_draw_arrow (GtkSpinButto
37 shadow_type = GTK_SHADOW_OUT; 39 shadow_type = GTK_SHADOW_OUT;
38 } 40 }
39 } 41 }
@@ -69,7 +71,7 @@
69 71
70 w = width / 2; 72 w = width / 2;
71 w -= w % 2 - 1; /* force odd */ 73 w -= w % 2 - 1; /* force odd */
72@@ -1108,7 +1090,7 @@ 74@@ -1062,7 +1044,7 @@ gtk_spin_button_button_press (GtkWidget
73 if (GTK_ENTRY (widget)->editable) 75 if (GTK_ENTRY (widget)->editable)
74 gtk_spin_button_update (spin); 76 gtk_spin_button_update (spin);
75 77
@@ -78,7 +80,7 @@
78 { 80 {
79 if (event->button == 1) 81 if (event->button == 1)
80 start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment); 82 start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
81@@ -1143,44 +1125,11 @@ 83@@ -1097,44 +1079,11 @@ gtk_spin_button_button_release (GtkWidge
82 84
83 arrow_size = spin_button_get_arrow_size (spin); 85 arrow_size = spin_button_get_arrow_size (spin);
84 86
@@ -121,7 +123,7 @@
121- return TRUE; 123- return TRUE;
122- } 124- }
123- else 125- else
124- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event); 126- return GTK_WIDGET_CLASS (gtk_spin_button_parent_class)->button_release_event (widget, event);
125+ return TRUE; 127+ return TRUE;
126 } 128 }
127 129
diff --git a/meta/packages/gtk+/gtk+_2.10.6.bb b/meta/packages/gtk+/gtk+_2.10.6.bb
index c1fd971295..1511c9bacc 100644
--- a/meta/packages/gtk+/gtk+_2.10.6.bb
+++ b/meta/packages/gtk+/gtk+_2.10.6.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
5SECTION = "libs" 5SECTION = "libs"
6PRIORITY = "optional" 6PRIORITY = "optional"
7DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups" 7DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo cups"
8PR = "r2" 8PR = "r3"
9 9
10# disable per default - untested and not all patches included. 10# disable per default - untested and not all patches included.
11DEFAULT_PREFERENCE = "-1" 11DEFAULT_PREFERENCE = "-1"
@@ -13,13 +13,13 @@ DEFAULT_PREFERENCE = "-1"
13SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ 13SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
14 file://no-xwc.patch;patch=1 \ 14 file://no-xwc.patch;patch=1 \
15 file://automake-lossage.patch;patch=1 \ 15 file://automake-lossage.patch;patch=1 \
16 file://disable-tooltips.patch;patch=1 \ 16 file://disable-tooltips.patch;patch=1 \
17 file://gtklabel-resize-patch;patch=1 \ 17 file://gtklabel-resize-patch;patch=1 \
18 file://menu-deactivate.patch;patch=1 \ 18 file://menu-deactivate.patch;patch=1 \
19 file://xsettings.patch;patch=1 \ 19 file://xsettings.patch;patch=1 \
20 file://scroll-timings.patch;patch=1 \ 20 file://scroll-timings.patch;patch=1 \
21 file://small-gtkfilesel.patch;patch=1 \ 21 file://small-gtkfilesel.patch;patch=1 \
22 file://migration.patch;patch=1;pnum=0 \ 22 file://migration.patch;patch=1;pnum=0 \
23 file://run-iconcache.patch;patch=1 \ 23 file://run-iconcache.patch;patch=1 \
24 file://disable-print.patch;patch=1 \ 24 file://disable-print.patch;patch=1 \
25 file://hardcoded_libtool.patch;patch=1 \ 25 file://hardcoded_libtool.patch;patch=1 \
@@ -96,7 +96,7 @@ python populate_packages_prepend () {
96 printmodules_root = os.path.join(gtk_libdir, 'printbackends'); 96 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
97 97
98 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders') 98 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
99 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules') 99 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules')
100 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s') 100 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s')
101 101
102 if (bb.data.getVar('DEBIAN_NAMES', d, 1)): 102 if (bb.data.getVar('DEBIAN_NAMES', d, 1)):