Gentoo Archives: gentoo-commits

From: "Pacho Ramos (pacho)" <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-2.22.1-print-settings.patch gtk+-2.22.1-old-icons.patch
Date: Sat, 01 Jan 2011 17:58:33
Message-Id: 20110101175824.8509920057@flycatcher.gentoo.org
1 pacho 11/01/01 17:58:24
2
3 Added: gtk+-2.22.1-print-settings.patch
4 gtk+-2.22.1-old-icons.patch
5 Log:
6 Revision bump to create symlinks to old icons until apps are ported (bug #339319), set new print operation settings before emitting custom-widget-apply signal (upstream bug #637069 that will end up evince remembering printer settings), stop trying to build unmaintained docs (bug #349754).
7
8 (Portage version: 2.1.9.27/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 x11-libs/gtk+/files/gtk+-2.22.1-print-settings.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.22.1-print-settings.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.22.1-print-settings.patch?rev=1.1&content-type=text/plain
15
16 Index: gtk+-2.22.1-print-settings.patch
17 ===================================================================
18 From 55cf284749f3e3c56440b2f535956161657cd150 Mon Sep 17 00:00:00 2001
19 From: Carlos Garcia Campos <carlosgc@×××××.org>
20 Date: Sun, 12 Dec 2010 11:54:47 +0000
21 Subject: printing: Set new print operation settings before emitting custom-widget-apply signal
22
23 So that custom settings can be added from the custom-widget-apply
24 callback.
25
26 https://bugzilla.gnome.org/show_bug.cgi?id=637069
27 ---
28 diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
29 index dbf6228..4528036 100644
30 --- a/gtk/gtkprintoperation-unix.c
31 +++ b/gtk/gtkprintoperation-unix.c
32 @@ -659,7 +659,11 @@ handle_print_response (GtkWidget *dialog,
33 settings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG (pd));
34 page_setup = gtk_print_unix_dialog_get_page_setup (GTK_PRINT_UNIX_DIALOG (pd));
35 page_setup_set = gtk_print_unix_dialog_get_page_setup_set (GTK_PRINT_UNIX_DIALOG (pd));
36 -
37 +
38 + /* Set new print settings now so that custom-widget options
39 + * can be added to the settings in the callback
40 + */
41 + gtk_print_operation_set_print_settings (rdata->op, settings);
42 g_signal_emit_by_name (rdata->op, "custom-widget-apply", rdata->op->priv->custom_widget);
43 }
44
45 --
46 cgit v0.8.3.1
47
48
49
50 1.1 x11-libs/gtk+/files/gtk+-2.22.1-old-icons.patch
51
52 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.22.1-old-icons.patch?rev=1.1&view=markup
53 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-2.22.1-old-icons.patch?rev=1.1&content-type=text/plain
54
55 Index: gtk+-2.22.1-old-icons.patch
56 ===================================================================
57 diff -aur gtk+-2.22.0.orig//gtk/Makefile.in gtk+-2.22.0/gtk/Makefile.in
58 --- gtk+-2.22.0.orig//gtk/Makefile.am 2010-10-15 04:57:50.810006145 +0800
59 +++ gtk+-2.22.0/gtk/Makefile.am 2010-10-15 05:13:49.083339478 +0800
60 @@ -1598,7 +1598,172 @@
61 stock-icons/24/folder-remote.png \
62 stock-icons/24/user-home.png \
63 stock-icons/24/user-desktop.png \
64 - stock-icons/24/text-x-generic.png
65 + stock-icons/24/text-x-generic.png \
66 + stock-icons/16/gtk-quit.png \
67 + stock-icons/16/gtk-info.png \
68 + stock-icons/16/gtk-file.png \
69 + stock-icons/16/gtk-open.png \
70 + stock-icons/16/gtk-print-preview.png \
71 + stock-icons/16/gtk-print.png \
72 + stock-icons/16/gtk-properties.png \
73 + stock-icons/16/gtk-revert-to-saved-ltr.png \
74 + stock-icons/16/gtk-revert-to-saved-rtl.png \
75 + stock-icons/16/gtk-save-as.png \
76 + stock-icons/16/gtk-new.png \
77 + stock-icons/16/gtk-harddisk.png \
78 + stock-icons/16/gtk-clear.png \
79 + stock-icons/16/gtk-copy.png \
80 + stock-icons/16/gtk-cut.png \
81 + stock-icons/16/gtk-delete.png \
82 + stock-icons/16/gtk-find-and-replace.png \
83 + stock-icons/16/gtk-find.png \
84 + stock-icons/16/gtk-paste.png \
85 + stock-icons/16/gtk-redo-ltr.png \
86 + stock-icons/16/gtk-redo-rtl.png \
87 + stock-icons/16/gtk-select-all.png \
88 + stock-icons/16/gtk-undo-ltr.png \
89 + stock-icons/16/gtk-undo-rtl.png \
90 + stock-icons/16/gtk-directory.png \
91 + stock-icons/16/gtk-unindent-ltr.png \
92 + stock-icons/16/gtk-unindent-rtl.png \
93 + stock-icons/16/gtk-indent-ltr.png \
94 + stock-icons/16/gtk-indent-rtl.png \
95 + stock-icons/16/gtk-justify-center.png \
96 + stock-icons/16/gtk-justify-fill.png \
97 + stock-icons/16/gtk-justify-left.png \
98 + stock-icons/16/gtk-justify-right.png \
99 + stock-icons/16/gtk-bold.png \
100 + stock-icons/16/gtk-italic.png \
101 + stock-icons/16/gtk-strikethrough.png \
102 + stock-icons/16/gtk-underline.png \
103 + stock-icons/16/gtk-goto-bottom.png \
104 + stock-icons/16/gtk-go-down.png \
105 + stock-icons/16/gtk-goto-first-ltr.png \
106 + stock-icons/16/gtk-home.png \
107 + stock-icons/16/gtk-jump-to-ltr.png \
108 + stock-icons/16/gtk-jump-to-rtl.png \
109 + stock-icons/16/gtk-goto-last-ltr.png \
110 + stock-icons/16/gtk-go-forward-ltr.png \
111 + stock-icons/16/gtk-go-back-ltr.png \
112 + stock-icons/16/gtk-goto-top.png \
113 + stock-icons/16/gtk-go-up.png \
114 + stock-icons/16/gtk-about.png \
115 + stock-icons/16/gtk-help.png \
116 + stock-icons/16/gtk-missing-image.png \
117 + stock-icons/16/gtk-add.png \
118 + stock-icons/16/gtk-remove.png \
119 + stock-icons/16/gtk-floppy.png \
120 + stock-icons/16/gtk-cdrom.png \
121 + stock-icons/16/gtk-media-pause.png \
122 + stock-icons/16/gtk-media-play-ltr.png \
123 + stock-icons/16/gtk-media-play-rtl.png \
124 + stock-icons/16/gtk-media-stop.png \
125 + stock-icons/16/gtk-media-record.png \
126 + stock-icons/16/gtk-media-rewind-ltr.png \
127 + stock-icons/16/gtk-media-forward-ltr.png \
128 + stock-icons/16/gtk-media-previous-ltr.png \
129 + stock-icons/16/gtk-media-next-ltr.png \
130 + stock-icons/16/gtk-network.png \
131 + stock-icons/16/gtk-print-error.png \
132 + stock-icons/16/gtk-print-report.png \
133 + stock-icons/16/gtk-print-paused.png \
134 + stock-icons/16/gtk-print-warning.png \
135 + stock-icons/16/gtk-stop.png \
136 + stock-icons/16/gtk-execute.png \
137 + stock-icons/16/gtk-spell-check.png \
138 + stock-icons/16/gtk-fullscreen.png \
139 + stock-icons/16/gtk-refresh.png \
140 + stock-icons/16/gtk-leave-fullscreen.png \
141 + stock-icons/16/gtk-sort-ascending.png \
142 + stock-icons/16/gtk-sort-descending.png \
143 + stock-icons/16/gtk-close.png \
144 + stock-icons/16/gtk-zoom-fit.png \
145 + stock-icons/16/gtk-zoom-in.png \
146 + stock-icons/16/gtk-zoom-100.png \
147 + stock-icons/16/gtk-zoom-out.png \
148 + stock-icons/24/gtk-quit.png \
149 + stock-icons/24/gtk-info.png \
150 + stock-icons/24/gtk-file.png \
151 + stock-icons/24/gtk-open.png \
152 + stock-icons/24/gtk-print-preview.png \
153 + stock-icons/24/gtk-print.png \
154 + stock-icons/24/gtk-properties.png \
155 + stock-icons/24/gtk-revert-to-saved-ltr.png \
156 + stock-icons/24/gtk-revert-to-saved-rtl.png \
157 + stock-icons/24/gtk-save-as.png \
158 + stock-icons/24/gtk-new.png \
159 + stock-icons/24/gtk-harddisk.png \
160 + stock-icons/24/gtk-clear.png \
161 + stock-icons/24/gtk-copy.png \
162 + stock-icons/24/gtk-cut.png \
163 + stock-icons/24/gtk-delete.png \
164 + stock-icons/24/gtk-find-and-replace.png \
165 + stock-icons/24/gtk-find.png \
166 + stock-icons/24/gtk-paste.png \
167 + stock-icons/24/gtk-redo-ltr.png \
168 + stock-icons/24/gtk-redo-rtl.png \
169 + stock-icons/24/gtk-select-all.png \
170 + stock-icons/24/gtk-undo-ltr.png \
171 + stock-icons/24/gtk-undo-rtl.png \
172 + stock-icons/24/gtk-directory.png \
173 + stock-icons/24/gtk-unindent-ltr.png \
174 + stock-icons/24/gtk-unindent-rtl.png \
175 + stock-icons/24/gtk-indent-ltr.png \
176 + stock-icons/24/gtk-indent-rtl.png \
177 + stock-icons/24/gtk-justify-center.png \
178 + stock-icons/24/gtk-justify-fill.png \
179 + stock-icons/24/gtk-justify-left.png \
180 + stock-icons/24/gtk-justify-right.png \
181 + stock-icons/24/gtk-bold.png \
182 + stock-icons/24/gtk-italic.png \
183 + stock-icons/24/gtk-strikethrough.png \
184 + stock-icons/24/gtk-underline.png \
185 + stock-icons/24/gtk-goto-bottom.png \
186 + stock-icons/24/gtk-go-down.png \
187 + stock-icons/24/gtk-goto-first-ltr.png \
188 + stock-icons/24/gtk-home.png \
189 + stock-icons/24/gtk-jump-to-ltr.png \
190 + stock-icons/24/gtk-jump-to-rtl.png \
191 + stock-icons/24/gtk-goto-last-ltr.png \
192 + stock-icons/24/gtk-go-forward-ltr.png \
193 + stock-icons/24/gtk-go-back-ltr.png \
194 + stock-icons/24/gtk-goto-top.png \
195 + stock-icons/24/gtk-go-up.png \
196 + stock-icons/24/gtk-about.png \
197 + stock-icons/24/gtk-help.png \
198 + stock-icons/24/gtk-missing-image.png \
199 + stock-icons/24/gtk-add.png \
200 + stock-icons/24/gtk-remove.png \
201 + stock-icons/24/gtk-floppy.png \
202 + stock-icons/24/gtk-cdrom.png \
203 + stock-icons/24/gtk-media-pause.png \
204 + stock-icons/24/gtk-media-play-ltr.png \
205 + stock-icons/24/gtk-media-play-rtl.png \
206 + stock-icons/24/gtk-media-stop.png \
207 + stock-icons/24/gtk-media-record.png \
208 + stock-icons/24/gtk-media-rewind-ltr.png \
209 + stock-icons/24/gtk-media-forward-ltr.png \
210 + stock-icons/24/gtk-media-previous-ltr.png \
211 + stock-icons/24/gtk-media-next-ltr.png \
212 + stock-icons/24/gtk-network.png \
213 + stock-icons/24/gtk-print-error.png \
214 + stock-icons/24/gtk-print-report.png \
215 + stock-icons/24/gtk-print-paused.png \
216 + stock-icons/24/gtk-print-warning.png \
217 + stock-icons/24/gtk-stop.png \
218 + stock-icons/24/gtk-execute.png \
219 + stock-icons/24/gtk-spell-check.png \
220 + stock-icons/24/gtk-fullscreen.png \
221 + stock-icons/24/gtk-refresh.png \
222 + stock-icons/24/gtk-leave-fullscreen.png \
223 + stock-icons/24/gtk-sort-ascending.png \
224 + stock-icons/24/gtk-sort-descending.png \
225 + stock-icons/24/gtk-close.png \
226 + stock-icons/24/gtk-zoom-fit.png \
227 + stock-icons/24/gtk-zoom-in.png \
228 + stock-icons/24/gtk-zoom-100.png \
229 + stock-icons/24/gtk-zoom-out.png \
230 + stock-icons/48/gtk-dialog-error.png
231
232 @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
233 @CROSS_COMPILING_FALSE@ ./gtk-update-icon-cache
234 @@ -2869,7 +3034,91 @@
235 && $(LN_S) folder.png user-desktop.png \
236 && $(RM) text-x-generic.png \
237 && $(LN_S) document-x-generic.png text-x-generic.png \
238 + && $(LN_S) application-exit.png gtk-quit.png \
239 + && $(LN_S) dialog-information.png gtk-info.png \
240 + && $(LN_S) document-new.png gtk-file.png \
241 + && $(LN_S) document-open.png gtk-open.png \
242 + && $(LN_S) document-print-preview.png gtk-print-preview.png \
243 + && $(LN_S) document-print.png gtk-print.png \
244 + && $(LN_S) document-properties.png gtk-properties.png \
245 + && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png \
246 + && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png \
247 + && $(LN_S) document-save-as.png gtk-save-as.png \
248 + && $(LN_S) document-x-generic.png gtk-new.png \
249 + && $(LN_S) drive-harddisk.png gtk-harddisk.png \
250 + && $(LN_S) edit-clear.png gtk-clear.png \
251 + && $(LN_S) edit-copy.png gtk-copy.png \
252 + && $(LN_S) edit-cut.png gtk-cut.png \
253 + && $(LN_S) edit-delete.png gtk-delete.png \
254 + && $(LN_S) edit-find-replace.png gtk-find-and-replace.png \
255 + && $(LN_S) edit-find.png gtk-find.png \
256 + && $(LN_S) edit-paste.png gtk-paste.png \
257 + && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png \
258 + && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png \
259 + && $(LN_S) edit-select-all.png gtk-select-all.png \
260 + && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png \
261 + && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png \
262 + && $(LN_S) folder.png gtk-directory.png \
263 + && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png \
264 + && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png \
265 + && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png \
266 + && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png \
267 + && $(LN_S) format-justify-center.png gtk-justify-center.png \
268 + && $(LN_S) format-justify-fill.png gtk-justify-fill.png \
269 + && $(LN_S) format-justify-left.png gtk-justify-left.png \
270 + && $(LN_S) format-justify-right.png gtk-justify-right.png \
271 + && $(LN_S) format-text-bold.png gtk-bold.png \
272 + && $(LN_S) format-text-italic.png gtk-italic.png \
273 + && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png \
274 + && $(LN_S) format-text-underline.png gtk-underline.png \
275 + && $(LN_S) go-bottom.png gtk-goto-bottom.png \
276 + && $(LN_S) go-down.png gtk-go-down.png \
277 + && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png \
278 + && $(LN_S) go-home.png gtk-home.png \
279 + && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png \
280 + && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png \
281 + && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png \
282 + && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png \
283 + && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png \
284 + && $(LN_S) go-top.png gtk-goto-top.png \
285 + && $(LN_S) go-up.png gtk-go-up.png \
286 + && $(LN_S) help-about.png gtk-about.png \
287 + && $(LN_S) help-contents.png gtk-help.png \
288 + && $(LN_S) image-missing.png gtk-missing-image.png \
289 + && $(LN_S) list-add.png gtk-add.png \
290 + && $(LN_S) list-remove.png gtk-remove.png \
291 + && $(LN_S) media-floppy.png gtk-floppy.png \
292 + && $(LN_S) media-optical.png gtk-cdrom.png \
293 + && $(LN_S) media-playback-pause.png gtk-media-pause.png \
294 + && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png \
295 + && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png \
296 + && $(LN_S) media-playback-stop.png gtk-media-stop.png \
297 + && $(LN_S) media-record.png gtk-media-record.png \
298 + && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png \
299 + && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png \
300 + && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png \
301 + && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png \
302 + && $(LN_S) network-idle.png gtk-network.png \
303 + && $(LN_S) printer-error.png gtk-print-error.png \
304 + && $(LN_S) printer-info.png gtk-print-report.png \
305 + && $(LN_S) printer-paused.png gtk-print-paused.png \
306 + && $(LN_S) printer-warning.png gtk-print-warning.png \
307 + && $(LN_S) process-stop.png gtk-stop.png \
308 + && $(LN_S) system-run.png gtk-execute.png \
309 + && $(LN_S) tools-check-spelling.png gtk-spell-check.png \
310 + && $(LN_S) view-fullscreen.png gtk-fullscreen.png \
311 + && $(LN_S) view-refresh.png gtk-refresh.png \
312 + && $(LN_S) view-restore.png gtk-leave-fullscreen.png \
313 + && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png \
314 + && $(LN_S) view-sort-descending.png gtk-sort-descending.png \
315 + && $(LN_S) window-close.png gtk-close.png \
316 + && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png \
317 + && $(LN_S) zoom-in.png gtk-zoom-in.png \
318 + && $(LN_S) zoom-original.png gtk-zoom-100.png \
319 + && $(LN_S) zoom-out.png gtk-zoom-out.png \
320 ) done \
321 + && (cd stock-icons/48 \
322 + && $(LN_S) dialog-error.png gtk-dialog-error.png) \
323 && touch stamp-icons
324
325 gtkbuiltincache.h: @REBUILD@ stamp-icons