1 |
commit: 32ff15f9d24355f92950624c2a0b9d5b3f80c0e4 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Sep 30 02:44:10 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Fri Sep 30 02:44:10 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32ff15f9 |
7 |
|
8 |
net-misc/vinagre: fix implicit function declarations (#385005) |
9 |
|
10 |
Fix numerous implicit function declarations in vinagre-3.2.0 by |
11 |
generating a missing header from vala source, using non-deprecated gtk |
12 |
functions, and adding necessary #include statements in various files. |
13 |
Thanks to Jason Lamb <jason <AT> lambhome.org> for reporting (bug #385005). |
14 |
|
15 |
Patch submitted upstream at https://bugzilla.gnome.org/show_bug.cgi?id=660531 |
16 |
|
17 |
--- |
18 |
...agre-3.2.0-implicit-function-declarations.patch | 339 ++++++++++++++++++++ |
19 |
...inagre-3.2.0.ebuild => vinagre-3.2.0-r1.ebuild} | 9 +- |
20 |
2 files changed, 347 insertions(+), 1 deletions(-) |
21 |
|
22 |
diff --git a/net-misc/vinagre/files/vinagre-3.2.0-implicit-function-declarations.patch b/net-misc/vinagre/files/vinagre-3.2.0-implicit-function-declarations.patch |
23 |
new file mode 100644 |
24 |
index 0000000..3bc2d18 |
25 |
--- /dev/null |
26 |
+++ b/net-misc/vinagre/files/vinagre-3.2.0-implicit-function-declarations.patch |
27 |
@@ -0,0 +1,339 @@ |
28 |
+From 8715972bb64526ac3fb301b66d42a463a633e2b0 Mon Sep 17 00:00:00 2001 |
29 |
+From: Alexandre Rostovtsev <tetromino@×××××.com> |
30 |
+Date: Thu, 29 Sep 2011 22:16:47 -0400 |
31 |
+Subject: [PATCH] Fix implicit function declaration warnings |
32 |
+ |
33 |
+Fix implicit declaration of vinagre_vnc_connection_set_depth_profile by |
34 |
+including the plugins/vnc/vinagre-vnc-connection.h header. |
35 |
+ |
36 |
+Fix gtk_widget_modify_bg implicit declaration warning by switching to |
37 |
+the non-deprecated gtk_widget_override_background_color(). |
38 |
+ |
39 |
+Fix *many* vinagre_utils_* and vinagre_dirs_* implicit declarations by |
40 |
+generating a header (vinagre/vinagre-utils.h) from the vala source, and |
41 |
+including it in half the .c files in the source tree. |
42 |
+Since automake won't do it automatically, we have to write an explicit |
43 |
+rule to generate the header from vala. Add the generated header to |
44 |
+BUILT_SOURCES to ensure that it gets built before anything that might |
45 |
+include it. And add it to noinst_vinagreh_headers to make sure that it's |
46 |
+distributed with the tarball, so end users won't need valac to build |
47 |
+vinagre. |
48 |
+ |
49 |
+https://bugzilla.gnome.org/show_bug.cgi?id=660531 |
50 |
+--- |
51 |
+ Makefile.am | 11 +++++++++++ |
52 |
+ plugins/rdp/vinagre-rdp-tab.c | 1 + |
53 |
+ plugins/spice/vinagre-spice-connection.c | 1 + |
54 |
+ plugins/spice/vinagre-spice-tab.c | 1 + |
55 |
+ plugins/vnc/vinagre-vnc-connection.c | 1 + |
56 |
+ plugins/vnc/vinagre-vnc-tab.c | 1 + |
57 |
+ vinagre/vinagre-bookmarks-migration.c | 1 + |
58 |
+ vinagre/vinagre-bookmarks-ui.c | 1 + |
59 |
+ vinagre/vinagre-bookmarks.c | 1 + |
60 |
+ vinagre/vinagre-cache-prefs.c | 1 + |
61 |
+ vinagre/vinagre-commands.c | 1 + |
62 |
+ vinagre/vinagre-connect.c | 1 + |
63 |
+ vinagre/vinagre-connection.c | 1 + |
64 |
+ vinagre/vinagre-notebook.c | 1 + |
65 |
+ vinagre/vinagre-options.c | 2 ++ |
66 |
+ vinagre/vinagre-reverse-vnc-listener-dialog.c | 1 + |
67 |
+ vinagre/vinagre-reverse-vnc-listener.c | 1 + |
68 |
+ vinagre/vinagre-ssh.c | 1 + |
69 |
+ vinagre/vinagre-tab.c | 5 +++-- |
70 |
+ vinagre/vinagre-tube-handler.c | 2 ++ |
71 |
+ vinagre/vinagre-window.c | 1 + |
72 |
+ 21 files changed, 35 insertions(+), 2 deletions(-) |
73 |
+ |
74 |
+diff --git a/Makefile.am b/Makefile.am |
75 |
+index 6c6b90a..dee9394 100644 |
76 |
+--- a/Makefile.am |
77 |
++++ b/Makefile.am |
78 |
+@@ -51,7 +51,11 @@ vinagre_vinagre_LDADD = \ |
79 |
+ $(ssh_plugin) \ |
80 |
+ libvnc.la |
81 |
+ |
82 |
++built_headers = \ |
83 |
++ vinagre/vinagre-utils.h |
84 |
++ |
85 |
+ noinst_vinagreh_headers = \ |
86 |
++ $(built_headers) |
87 |
+ vinagre/if/ifaddrs.h \ |
88 |
+ vinagre/view/autoDrawer.h \ |
89 |
+ vinagre/view/drawer.h \ |
90 |
+@@ -223,6 +227,13 @@ libvnc_la_SOURCES = \ |
91 |
+ libvnc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) |
92 |
+ libvnc_la_LIBADD = $(VNC_LIBS) |
93 |
+ |
94 |
++BUILT_SOURCES = \ |
95 |
++ $(built_headers) |
96 |
++ |
97 |
++# manual rule to generate vinagre-utils.h, since automake won't automatically do it |
98 |
++vinagre/vinagre-utils.h: vinagre/vinagre-dirs.vala vinagre/vinagre-utils.vala |
99 |
++ $(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) --header=$@ -C $^ |
100 |
++ |
101 |
+ iconthemedir = $(datadir)/icons/hicolor |
102 |
+ mimeicon16dir = $(iconthemedir)/16x16/mimetypes |
103 |
+ mimeicon22dir = $(iconthemedir)/22x22/mimetypes |
104 |
+diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c |
105 |
+index d7647dd..b0074af 100644 |
106 |
+--- a/plugins/rdp/vinagre-rdp-tab.c |
107 |
++++ b/plugins/rdp/vinagre-rdp-tab.c |
108 |
+@@ -30,6 +30,7 @@ |
109 |
+ |
110 |
+ #include "vinagre-rdp-tab.h" |
111 |
+ #include "vinagre-rdp-connection.h" |
112 |
++#include "vinagre-utils.h" |
113 |
+ |
114 |
+ #define VINAGRE_RDP_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_RDP_TAB, VinagreRdpTabPrivate)) |
115 |
+ |
116 |
+diff --git a/plugins/spice/vinagre-spice-connection.c b/plugins/spice/vinagre-spice-connection.c |
117 |
+index 869096c..be7e8d2 100644 |
118 |
+--- a/plugins/spice/vinagre-spice-connection.c |
119 |
++++ b/plugins/spice/vinagre-spice-connection.c |
120 |
+@@ -25,6 +25,7 @@ |
121 |
+ #include <vinagre/vinagre-cache-prefs.h> |
122 |
+ |
123 |
+ #include "vinagre-spice-connection.h" |
124 |
++#include "vinagre-utils.h" |
125 |
+ |
126 |
+ struct _VinagreSpiceConnectionPrivate |
127 |
+ { |
128 |
+diff --git a/plugins/spice/vinagre-spice-tab.c b/plugins/spice/vinagre-spice-tab.c |
129 |
+index 7781c98..11e3587 100644 |
130 |
+--- a/plugins/spice/vinagre-spice-tab.c |
131 |
++++ b/plugins/spice/vinagre-spice-tab.c |
132 |
+@@ -32,6 +32,7 @@ |
133 |
+ #include "vinagre-spice-tab.h" |
134 |
+ #include "vinagre-spice-connection.h" |
135 |
+ #include "vinagre-spice-tunnel.h" |
136 |
++#include "vinagre-utils.h" |
137 |
+ |
138 |
+ #define VINAGRE_SPICE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_SPICE_TAB, VinagreSpiceTabPrivate)) |
139 |
+ |
140 |
+diff --git a/plugins/vnc/vinagre-vnc-connection.c b/plugins/vnc/vinagre-vnc-connection.c |
141 |
+index 2182743..355ef54 100644 |
142 |
+--- a/plugins/vnc/vinagre-vnc-connection.c |
143 |
++++ b/plugins/vnc/vinagre-vnc-connection.c |
144 |
+@@ -25,6 +25,7 @@ |
145 |
+ #include <vinagre/vinagre-cache-prefs.h> |
146 |
+ |
147 |
+ #include "vinagre-vnc-connection.h" |
148 |
++#include "vinagre-utils.h" |
149 |
+ |
150 |
+ struct _VinagreVncConnectionPrivate |
151 |
+ { |
152 |
+diff --git a/plugins/vnc/vinagre-vnc-tab.c b/plugins/vnc/vinagre-vnc-tab.c |
153 |
+index 914cdea..5329d73 100644 |
154 |
+--- a/plugins/vnc/vinagre-vnc-tab.c |
155 |
++++ b/plugins/vnc/vinagre-vnc-tab.c |
156 |
+@@ -29,6 +29,7 @@ |
157 |
+ #include "vinagre-vnc-tab.h" |
158 |
+ #include "vinagre-vnc-connection.h" |
159 |
+ #include "vinagre-vnc-tunnel.h" |
160 |
++#include "vinagre-utils.h" |
161 |
+ |
162 |
+ #define VINAGRE_VNC_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_VNC_TAB, VinagreVncTabPrivate)) |
163 |
+ |
164 |
+diff --git a/vinagre/vinagre-bookmarks-migration.c b/vinagre/vinagre-bookmarks-migration.c |
165 |
+index 3fae66b..2afe5cd 100644 |
166 |
+--- a/vinagre/vinagre-bookmarks-migration.c |
167 |
++++ b/vinagre/vinagre-bookmarks-migration.c |
168 |
+@@ -36,6 +36,7 @@ |
169 |
+ #include "vinagre-bookmarks-migration.h" |
170 |
+ #include "vinagre-bookmarks.h" |
171 |
+ #include "vinagre-plugins-engine.h" |
172 |
++#include "vinagre-utils.h" |
173 |
+ |
174 |
+ static void |
175 |
+ fill_xml (GSList *list, xmlTextWriter *writer) |
176 |
+diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c |
177 |
+index 5f37aa2..0837eae 100644 |
178 |
+--- a/vinagre/vinagre-bookmarks-ui.c |
179 |
++++ b/vinagre/vinagre-bookmarks-ui.c |
180 |
+@@ -25,6 +25,7 @@ |
181 |
+ #include "vinagre-bookmarks-ui.h" |
182 |
+ #include "vinagre-bookmarks-tree.h" |
183 |
+ #include "vinagre-plugins-engine.h" |
184 |
++#include "vinagre-utils.h" |
185 |
+ |
186 |
+ static void |
187 |
+ control_save_button_visibility (GtkEntry *ed, GtkWidget *bt) |
188 |
+diff --git a/vinagre/vinagre-bookmarks.c b/vinagre/vinagre-bookmarks.c |
189 |
+index 968be99..b051c50 100644 |
190 |
+--- a/vinagre/vinagre-bookmarks.c |
191 |
++++ b/vinagre/vinagre-bookmarks.c |
192 |
+@@ -30,6 +30,7 @@ |
193 |
+ #include "vinagre-bookmarks-migration.h" |
194 |
+ #include "vinagre-connection.h" |
195 |
+ #include "vinagre-plugins-engine.h" |
196 |
++#include "vinagre-utils.h" |
197 |
+ |
198 |
+ struct _VinagreBookmarksPrivate |
199 |
+ { |
200 |
+diff --git a/vinagre/vinagre-cache-prefs.c b/vinagre/vinagre-cache-prefs.c |
201 |
+index 4330d74..407ffd8 100644 |
202 |
+--- a/vinagre/vinagre-cache-prefs.c |
203 |
++++ b/vinagre/vinagre-cache-prefs.c |
204 |
+@@ -21,6 +21,7 @@ |
205 |
+ #include <config.h> |
206 |
+ #include <glib/gi18n.h> |
207 |
+ #include "vinagre-cache-prefs.h" |
208 |
++#include "vinagre-utils.h" |
209 |
+ |
210 |
+ static GKeyFile *keyfile = NULL; |
211 |
+ static char* filename = NULL; |
212 |
+diff --git a/vinagre/vinagre-commands.c b/vinagre/vinagre-commands.c |
213 |
+index fefd40b..db91dd6 100644 |
214 |
+--- a/vinagre/vinagre-commands.c |
215 |
++++ b/vinagre/vinagre-commands.c |
216 |
+@@ -39,6 +39,7 @@ |
217 |
+ #include "vinagre-cache-prefs.h" |
218 |
+ #include "vinagre-plugins-engine.h" |
219 |
+ #include "vinagre-reverse-vnc-listener-dialog.h" |
220 |
++#include "vinagre-utils.h" |
221 |
+ |
222 |
+ void |
223 |
+ vinagre_cmd_direct_connect (VinagreConnection *conn, |
224 |
+diff --git a/vinagre/vinagre-connect.c b/vinagre/vinagre-connect.c |
225 |
+index 9b78de9..87db4b3 100644 |
226 |
+--- a/vinagre/vinagre-connect.c |
227 |
++++ b/vinagre/vinagre-connect.c |
228 |
+@@ -36,6 +36,7 @@ |
229 |
+ #include "vinagre-prefs.h" |
230 |
+ #include "vinagre-cache-prefs.h" |
231 |
+ #include "vinagre-plugins-engine.h" |
232 |
++#include "vinagre-utils.h" |
233 |
+ |
234 |
+ typedef struct { |
235 |
+ GtkBuilder *xml; |
236 |
+diff --git a/vinagre/vinagre-connection.c b/vinagre/vinagre-connection.c |
237 |
+index 2bb6245..e1db7bf 100644 |
238 |
+--- a/vinagre/vinagre-connection.c |
239 |
++++ b/vinagre/vinagre-connection.c |
240 |
+@@ -27,6 +27,7 @@ |
241 |
+ #include "vinagre-connection.h" |
242 |
+ #include "vinagre-bookmarks.h" |
243 |
+ #include "vinagre-plugins-engine.h" |
244 |
++#include "vinagre-utils.h" |
245 |
+ |
246 |
+ struct _VinagreConnectionPrivate |
247 |
+ { |
248 |
+diff --git a/vinagre/vinagre-notebook.c b/vinagre/vinagre-notebook.c |
249 |
+index e7bd82f..1af30f2 100644 |
250 |
+--- a/vinagre/vinagre-notebook.c |
251 |
++++ b/vinagre/vinagre-notebook.c |
252 |
+@@ -26,6 +26,7 @@ |
253 |
+ |
254 |
+ #include "vinagre-dnd.h" |
255 |
+ #include "vinagre-prefs.h" |
256 |
++#include "vinagre-utils.h" |
257 |
+ |
258 |
+ #define VINAGRE_NOTEBOOK_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_NOTEBOOK, VinagreNotebookPrivate)) |
259 |
+ |
260 |
+diff --git a/vinagre/vinagre-options.c b/vinagre/vinagre-options.c |
261 |
+index 25a68d5..4d83ea5 100644 |
262 |
+--- a/vinagre/vinagre-options.c |
263 |
++++ b/vinagre/vinagre-options.c |
264 |
+@@ -23,6 +23,8 @@ |
265 |
+ #include "vinagre-connection.h" |
266 |
+ #include "vinagre-window.h" |
267 |
+ #include "vinagre-commands.h" |
268 |
++#include "vinagre-options.h" |
269 |
++#include "vinagre-utils.h" |
270 |
+ |
271 |
+ const GOptionEntry all_options [] = |
272 |
+ { |
273 |
+diff --git a/vinagre/vinagre-reverse-vnc-listener-dialog.c b/vinagre/vinagre-reverse-vnc-listener-dialog.c |
274 |
+index 9f649b9..cd53b86 100644 |
275 |
+--- a/vinagre/vinagre-reverse-vnc-listener-dialog.c |
276 |
++++ b/vinagre/vinagre-reverse-vnc-listener-dialog.c |
277 |
+@@ -44,6 +44,7 @@ |
278 |
+ #include "vinagre-prefs.h" |
279 |
+ #include "vinagre-reverse-vnc-listener-dialog.h" |
280 |
+ #include "vinagre-reverse-vnc-listener.h" |
281 |
++#include "vinagre-utils.h" |
282 |
+ |
283 |
+ typedef struct |
284 |
+ { |
285 |
+diff --git a/vinagre/vinagre-reverse-vnc-listener.c b/vinagre/vinagre-reverse-vnc-listener.c |
286 |
+index ab314f5..54bca9c 100644 |
287 |
+--- a/vinagre/vinagre-reverse-vnc-listener.c |
288 |
++++ b/vinagre/vinagre-reverse-vnc-listener.c |
289 |
+@@ -37,6 +37,7 @@ |
290 |
+ #include "vinagre-commands.h" |
291 |
+ #include "vinagre-reverse-vnc-listener.h" |
292 |
+ #include "plugins/vnc/vinagre-vnc-connection.h" |
293 |
++#include "vinagre-utils.h" |
294 |
+ |
295 |
+ struct _VinagreReverseVncListenerPrivate |
296 |
+ { |
297 |
+diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c |
298 |
+index c5b3427..d18b854 100644 |
299 |
+--- a/vinagre/vinagre-ssh.c |
300 |
++++ b/vinagre/vinagre-ssh.c |
301 |
+@@ -22,6 +22,7 @@ |
302 |
+ #include <config.h> |
303 |
+ |
304 |
+ #include "vinagre-ssh.h" |
305 |
++#include "vinagre-utils.h" |
306 |
+ #include "pty_open.h" |
307 |
+ |
308 |
+ #ifdef G_OS_WIN32 |
309 |
+diff --git a/vinagre/vinagre-tab.c b/vinagre/vinagre-tab.c |
310 |
+index a53543f..0113b86 100644 |
311 |
+--- a/vinagre/vinagre-tab.c |
312 |
++++ b/vinagre/vinagre-tab.c |
313 |
+@@ -31,6 +31,7 @@ |
314 |
+ #include "vinagre-prefs.h" |
315 |
+ #include "view/autoDrawer.h" |
316 |
+ #include "vinagre-plugins-engine.h" |
317 |
++#include "vinagre-utils.h" |
318 |
+ |
319 |
+ #define VINAGRE_TAB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), VINAGRE_TYPE_TAB, VinagreTabPrivate)) |
320 |
+ |
321 |
+@@ -634,7 +635,7 @@ void |
322 |
+ vinagre_tab_add_view (VinagreTab *tab, GtkWidget *view) |
323 |
+ { |
324 |
+ GtkWidget *viewport; |
325 |
+- GdkColor color = {0,}; |
326 |
++ GdkRGBA color = {0,}; |
327 |
+ |
328 |
+ g_return_if_fail (VINAGRE_IS_TAB (tab)); |
329 |
+ |
330 |
+@@ -643,7 +644,7 @@ vinagre_tab_add_view (VinagreTab *tab, GtkWidget *view) |
331 |
+ view); |
332 |
+ viewport = gtk_bin_get_child (GTK_BIN (tab->priv->scroll)); |
333 |
+ gtk_viewport_set_shadow_type(GTK_VIEWPORT (viewport), GTK_SHADOW_NONE); |
334 |
+- gtk_widget_modify_bg (viewport, GTK_STATE_NORMAL, &color); |
335 |
++ gtk_widget_override_background_color (viewport, GTK_STATE_NORMAL, &color); |
336 |
+ } |
337 |
+ |
338 |
+ /** |
339 |
+diff --git a/vinagre/vinagre-tube-handler.c b/vinagre/vinagre-tube-handler.c |
340 |
+index 6b4d767..f40702a 100644 |
341 |
+--- a/vinagre/vinagre-tube-handler.c |
342 |
++++ b/vinagre/vinagre-tube-handler.c |
343 |
+@@ -39,6 +39,8 @@ |
344 |
+ #include "vinagre-debug.h" |
345 |
+ #include "vinagre-protocol.h" |
346 |
+ #include "vinagre-plugins-engine.h" |
347 |
++#include "plugins/vnc/vinagre-vnc-connection.h" |
348 |
++#include "vinagre-utils.h" |
349 |
+ |
350 |
+ G_DEFINE_TYPE (VinagreTubeHandler, vinagre_tube_handler, G_TYPE_OBJECT); |
351 |
+ |
352 |
+diff --git a/vinagre/vinagre-window.c b/vinagre/vinagre-window.c |
353 |
+index 92c20b3..017aa58 100644 |
354 |
+--- a/vinagre/vinagre-window.c |
355 |
++++ b/vinagre/vinagre-window.c |
356 |
+@@ -41,6 +41,7 @@ |
357 |
+ #include "vinagre-window-private.h" |
358 |
+ #include "vinagre-bookmarks-entry.h" |
359 |
+ #include "vinagre-plugins-engine.h" |
360 |
++#include "vinagre-utils.h" |
361 |
+ |
362 |
+ #ifdef VINAGRE_HAVE_AVAHI |
363 |
+ #include "vinagre-mdns.h" |
364 |
+-- |
365 |
+1.7.6.1 |
366 |
+ |
367 |
|
368 |
diff --git a/net-misc/vinagre/vinagre-3.2.0.ebuild b/net-misc/vinagre/vinagre-3.2.0-r1.ebuild |
369 |
similarity index 89% |
370 |
rename from net-misc/vinagre/vinagre-3.2.0.ebuild |
371 |
rename to net-misc/vinagre/vinagre-3.2.0-r1.ebuild |
372 |
index d02fda4..a11bcb1 100644 |
373 |
--- a/net-misc/vinagre/vinagre-3.2.0.ebuild |
374 |
+++ b/net-misc/vinagre/vinagre-3.2.0-r1.ebuild |
375 |
@@ -6,7 +6,7 @@ EAPI="4" |
376 |
GCONF_DEBUG="no" |
377 |
GNOME2_LA_PUNT="yes" |
378 |
|
379 |
-inherit gnome2 |
380 |
+inherit autotools eutils gnome2 |
381 |
if [[ ${PV} = 9999 ]]; then |
382 |
inherit gnome2-live |
383 |
fi |
384 |
@@ -66,6 +66,13 @@ pkg_setup() { |
385 |
$(use_with telepathy)" |
386 |
} |
387 |
|
388 |
+src_prepare() { |
389 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=660531 |
390 |
+ epatch "${FILESDIR}/${PN}-3.2.0-implicit-function-declarations.patch" |
391 |
+ eautoreconf |
392 |
+ gnome2_src_prepare |
393 |
+} |
394 |
+ |
395 |
src_install() { |
396 |
gnome2_src_install |