1 |
commit: 7bb5a7034262d62de3d5122f43b03d7ea574d415 |
2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 10 08:46:58 2021 +0000 |
4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 10 08:46:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb5a703 |
7 |
|
8 |
net-print/libgnomecups: Remove last-rited package |
9 |
|
10 |
Bug: https://bugs.gentoo.org/352952 |
11 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
12 |
|
13 |
net-print/libgnomecups/Manifest | 1 - |
14 |
net-print/libgnomecups/files/enablenet.patch | 11 - |
15 |
.../files/libgnomecups-0.2.3-cups-1.6.patch | 285 --------------------- |
16 |
.../files/libgnomecups-0.2.3-cups-config.patch | 34 --- |
17 |
.../files/libgnomecups-0.2.3-format-string.patch | 34 --- |
18 |
.../libgnomecups-0.2.3-g_list_find_custom.patch | 94 ------- |
19 |
.../files/libgnomecups-0.2.3-glib.h.patch | 38 --- |
20 |
.../files/libgnomecups-0.2.3-lpoptions.patch | 13 - |
21 |
.../files/libgnomecups-0.2.3-pkgconfig.patch | 10 - |
22 |
.../libgnomecups/libgnomecups-0.2.3-r5.ebuild | 64 ----- |
23 |
net-print/libgnomecups/metadata.xml | 12 - |
24 |
profiles/package.mask | 5 - |
25 |
12 files changed, 601 deletions(-) |
26 |
|
27 |
diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest |
28 |
deleted file mode 100644 |
29 |
index f3db6f28413..00000000000 |
30 |
--- a/net-print/libgnomecups/Manifest |
31 |
+++ /dev/null |
32 |
@@ -1 +0,0 @@ |
33 |
-DIST libgnomecups-0.2.3.tar.bz2 357129 BLAKE2B 8a8babf0af7a83232590c5e756c4e1c2ce329dae59b88ee5be84c0286a6ed6d6c39f891b7ab0bb68bfc29539769cdd82032422c44a6131c4da9c9355669b1a57 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75 |
34 |
|
35 |
diff --git a/net-print/libgnomecups/files/enablenet.patch b/net-print/libgnomecups/files/enablenet.patch |
36 |
deleted file mode 100644 |
37 |
index f2e113d1440..00000000000 |
38 |
--- a/net-print/libgnomecups/files/enablenet.patch |
39 |
+++ /dev/null |
40 |
@@ -1,11 +0,0 @@ |
41 |
---- libgnomecups/gnome-cups-printer.c.orig 2005-08-04 18:21:32.221038336 +0000 |
42 |
-+++ libgnomecups/gnome-cups-printer.c 2005-08-04 18:22:00.369759080 +0000 |
43 |
-@@ -282,7 +282,7 @@ |
44 |
- * that will produce an infinite loop when presented with an invalid |
45 |
- * hostname. This will also produce a hang if the remote printer is |
46 |
- * unavailable and we do a syncronous lookup. */ |
47 |
--static gboolean go_directly_to_printer_when_possible = FALSE; |
48 |
-+static gboolean go_directly_to_printer_when_possible = TRUE; |
49 |
- |
50 |
- static void |
51 |
- update_attributes (GnomeCupsPrinter *printer) |
52 |
|
53 |
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch |
54 |
deleted file mode 100644 |
55 |
index 68f379c2510..00000000000 |
56 |
--- a/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch |
57 |
+++ /dev/null |
58 |
@@ -1,285 +0,0 @@ |
59 |
-From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001 |
60 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
61 |
-Date: Tue, 7 Aug 2012 06:53:09 -0400 |
62 |
-Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions |
63 |
- |
64 |
-CUPS 1.6 makes various structures private and introduces these ippGet |
65 |
-and ippSet functions for all of the fields in these structures. |
66 |
-http://www.cups.org/str.php?L3928 |
67 |
- |
68 |
-We define our own accessors when building against CUPS < 1.6. |
69 |
- |
70 |
-Based on work by Jiri Popelka <jpopelka@××××××.com> at |
71 |
-https://bugzilla.gnome.org/show_bug.cgi?id=679759 |
72 |
---- |
73 |
- libgnomecups/gnome-cups-printer.c | 48 +++++++++++++++++++++++++++++------- |
74 |
- libgnomecups/gnome-cups-queue.c | 43 +++++++++++++++++++++++++++------ |
75 |
- libgnomecups/gnome-cups-request.c | 44 ++++++++++++++++++++++++++++----- |
76 |
- 3 files changed, 110 insertions(+), 25 deletions(-) |
77 |
- |
78 |
-diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c |
79 |
-index c924af0..f5e1ef7 100644 |
80 |
---- a/libgnomecups/gnome-cups-printer.c |
81 |
-+++ b/libgnomecups/gnome-cups-printer.c |
82 |
-@@ -37,6 +37,34 @@ |
83 |
- |
84 |
- #define UPDATE_TIMEOUT 5000 |
85 |
- |
86 |
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) |
87 |
-+#define HAVE_CUPS_1_6 1 |
88 |
-+#endif |
89 |
-+ |
90 |
-+#ifndef HAVE_CUPS_1_6 |
91 |
-+#define ippGetCount(attr) attr->num_values |
92 |
-+#define ippGetName(attr) attr->name |
93 |
-+#define ippGetInteger(attr, element) attr->values[element].integer |
94 |
-+#define ippGetString(attr, element, language) attr->values[element].string.text |
95 |
-+ |
96 |
-+static ipp_attribute_t * |
97 |
-+ippFirstAttribute(ipp_t *ipp) |
98 |
-+{ |
99 |
-+ if (!ipp) |
100 |
-+ return (NULL); |
101 |
-+ return (ipp->current = ipp->attrs); |
102 |
-+} |
103 |
-+ |
104 |
-+static ipp_attribute_t * |
105 |
-+ippNextAttribute(ipp_t *ipp) |
106 |
-+{ |
107 |
-+ if (!ipp || !ipp->current) |
108 |
-+ return (NULL); |
109 |
-+ return (ipp->current = ipp->current->next); |
110 |
-+} |
111 |
-+#endif |
112 |
-+ |
113 |
-+ |
114 |
- struct _GnomeCupsPPDFile { |
115 |
- char name[1]; |
116 |
- }; |
117 |
-@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer, |
118 |
- printer->details->state_reasons = NULL; |
119 |
- |
120 |
- /* cf. RFC2911 4.4.12 */ |
121 |
-- for (i = 0; i < attr->num_values; i++) { |
122 |
-+ for (i = 0; i < ippGetCount (attr); i++) { |
123 |
- const char *p; |
124 |
-- const char *keyword = attr->values [i].string.text; |
125 |
-+ const char *keyword = ippGetString (attr, i, NULL); |
126 |
- |
127 |
- reason = g_new (GnomeCupsPrinterReason, 1); |
128 |
- |
129 |
-@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer) |
130 |
- return printer->details->info; |
131 |
- } |
132 |
- |
133 |
--#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }} |
134 |
--#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}} |
135 |
-+#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }} |
136 |
-+#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}} |
137 |
- |
138 |
- static void |
139 |
- attributes_update_cb (guint id, |
140 |
-@@ -243,14 +271,14 @@ attributes_update_cb (guint id, |
141 |
- changed = FALSE; |
142 |
- |
143 |
- if (!error && response) { |
144 |
-- for (attr = response->attrs; attr != NULL; attr = attr->next) { |
145 |
-- if (!attr->name) { |
146 |
-+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { |
147 |
-+ if (!ippGetName (attr)) { |
148 |
- continue; |
149 |
- } |
150 |
-- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) { |
151 |
-+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) { |
152 |
- continue; |
153 |
- } |
154 |
-- if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) { |
155 |
-+ if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) { |
156 |
- map_reasons (printer, attr); |
157 |
- } |
158 |
- MAP_INT (printer->details->state, "printer-state"); |
159 |
-@@ -570,7 +598,7 @@ get_default (void) |
160 |
- |
161 |
- attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); |
162 |
- if (attr) { |
163 |
-- name = g_strdup (attr->values[0].string.text); |
164 |
-+ name = g_strdup (ippGetString (attr, 0, NULL)); |
165 |
- } else { |
166 |
- name = NULL; |
167 |
- } |
168 |
-@@ -698,7 +726,7 @@ get_printer_names (void) |
169 |
- attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); |
170 |
- while (attr) { |
171 |
- ret = g_list_prepend (ret, |
172 |
-- g_strdup (attr->values[0].string.text)); |
173 |
-+ g_strdup (ippGetString (attr, 0, NULL))); |
174 |
- |
175 |
- attr = ippFindNextAttribute (response, |
176 |
- "printer-name", |
177 |
-diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c |
178 |
-index 9f98ed9..298db42 100644 |
179 |
---- a/libgnomecups/gnome-cups-queue.c |
180 |
-+++ b/libgnomecups/gnome-cups-queue.c |
181 |
-@@ -15,6 +15,33 @@ |
182 |
- |
183 |
- #define UPDATE_TIMEOUT 3000 |
184 |
- |
185 |
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) |
186 |
-+#define HAVE_CUPS_1_6 1 |
187 |
-+#endif |
188 |
-+ |
189 |
-+#ifndef HAVE_CUPS_1_6 |
190 |
-+#define ippGetName(attr) attr->name |
191 |
-+#define ippGetInteger(attr, element) attr->values[element].integer |
192 |
-+#define ippGetString(attr, element, language) attr->values[element].string.text |
193 |
-+ |
194 |
-+static ipp_attribute_t * |
195 |
-+ippFirstAttribute(ipp_t *ipp) |
196 |
-+{ |
197 |
-+ if (!ipp) |
198 |
-+ return (NULL); |
199 |
-+ return (ipp->current = ipp->attrs); |
200 |
-+} |
201 |
-+ |
202 |
-+static ipp_attribute_t * |
203 |
-+ippNextAttribute(ipp_t *ipp) |
204 |
-+{ |
205 |
-+ if (!ipp || !ipp->current) |
206 |
-+ return (NULL); |
207 |
-+ return (ipp->current = ipp->current->next); |
208 |
-+} |
209 |
-+#endif |
210 |
-+ |
211 |
-+ |
212 |
- struct _GnomeCupsQueueDetails { |
213 |
- char *queue_name; |
214 |
- GList *jobs; |
215 |
-@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job) |
216 |
- job->size = job->size * 1024; |
217 |
- } |
218 |
- |
219 |
--#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}} |
220 |
--#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } } |
221 |
-+#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}} |
222 |
-+#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } } |
223 |
- |
224 |
- static void |
225 |
- get_jobs_cb (guint id, |
226 |
-@@ -231,8 +258,8 @@ get_jobs_cb (guint id, |
227 |
- |
228 |
- if (response) { |
229 |
- job = g_new0 (GnomeCupsJob, 1); |
230 |
-- for (attr = response->attrs; attr != NULL; attr = attr->next) { |
231 |
-- if (attr->name == NULL) { |
232 |
-+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { |
233 |
-+ if (ippGetName (attr) == NULL) { |
234 |
- if (job->name) { |
235 |
- finish_job (job); |
236 |
- jobs = g_list_prepend (jobs, job); |
237 |
-@@ -244,7 +271,7 @@ get_jobs_cb (guint id, |
238 |
- continue; |
239 |
- } |
240 |
- |
241 |
-- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { |
242 |
-+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { |
243 |
- continue; |
244 |
- |
245 |
- } |
246 |
-@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, |
247 |
- |
248 |
- if (response) { |
249 |
- job = g_new0 (GnomeCupsJob, 1); |
250 |
-- for (attr = response->attrs; attr != NULL; attr = attr->next) { |
251 |
-- if (attr->name == NULL) { |
252 |
-+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { |
253 |
-+ if (ippGetName (attr) == NULL) { |
254 |
- if (job->name) { |
255 |
- finish_job (job); |
256 |
- } else { |
257 |
-@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, |
258 |
- break; |
259 |
- } |
260 |
- |
261 |
-- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { |
262 |
-+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { |
263 |
- continue; |
264 |
- } |
265 |
- |
266 |
-diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c |
267 |
-index c94f623..13f0948 100644 |
268 |
---- a/libgnomecups/gnome-cups-request.c |
269 |
-+++ b/libgnomecups/gnome-cups-request.c |
270 |
-@@ -19,6 +19,36 @@ |
271 |
- #define STOP_UNUSED_THREADS_TIMEOUT 60 |
272 |
- #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30 |
273 |
- |
274 |
-+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) |
275 |
-+#define HAVE_CUPS_1_6 1 |
276 |
-+#endif |
277 |
-+ |
278 |
-+#ifndef HAVE_CUPS_1_6 |
279 |
-+#define ippGetCount(attr) attr->num_values |
280 |
-+#define ippGetValueTag(attr) attr->value_tag |
281 |
-+#define ippGetName(attr) attr->name |
282 |
-+#define ippGetBoolean(attr, element) attr->values[element].boolean |
283 |
-+#define ippGetInteger(attr, element) attr->values[element].integer |
284 |
-+#define ippGetString(attr, element, language) attr->values[element].string.text |
285 |
-+ |
286 |
-+static ipp_attribute_t * |
287 |
-+ippFirstAttribute(ipp_t *ipp) |
288 |
-+{ |
289 |
-+ if (!ipp) |
290 |
-+ return (NULL); |
291 |
-+ return (ipp->current = ipp->attrs); |
292 |
-+} |
293 |
-+ |
294 |
-+static ipp_attribute_t * |
295 |
-+ippNextAttribute(ipp_t *ipp) |
296 |
-+{ |
297 |
-+ if (!ipp || !ipp->current) |
298 |
-+ return (NULL); |
299 |
-+ return (ipp->current = ipp->current->next); |
300 |
-+} |
301 |
-+#endif |
302 |
-+ |
303 |
-+ |
304 |
- typedef struct |
305 |
- { |
306 |
- GMutex *mutex; |
307 |
-@@ -276,14 +306,14 @@ dump_request (ipp_t const *req) |
308 |
- unsigned i; |
309 |
- ipp_attribute_t *attr; |
310 |
- |
311 |
-- for (attr = req->attrs; attr != NULL; attr = attr->next) { |
312 |
-- g_print ("%s", attr->name); |
313 |
-- for (i = 0 ; i < attr->num_values ; i++) { |
314 |
-+ for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) { |
315 |
-+ g_print ("%s", ippGetName (attr)); |
316 |
-+ for (i = 0 ; i < ippGetCount (attr) ; i++) { |
317 |
- g_print ("\t[%d] = ", i); |
318 |
-- switch (attr->value_tag & ~IPP_TAG_COPY) { |
319 |
-+ switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) { |
320 |
- case IPP_TAG_INTEGER: |
321 |
- case IPP_TAG_ENUM: |
322 |
-- g_print ("%d\n", attr->values[i].integer); |
323 |
-+ g_print ("%d\n", ippGetInteger (attr, i)); |
324 |
- break; |
325 |
- |
326 |
- case IPP_TAG_STRING: |
327 |
-@@ -294,11 +324,11 @@ dump_request (ipp_t const *req) |
328 |
- case IPP_TAG_CHARSET: |
329 |
- case IPP_TAG_LANGUAGE: |
330 |
- case IPP_TAG_MIMETYPE: |
331 |
-- g_print ("'%s'\n", attr->values[i].string.text); |
332 |
-+ g_print ("'%s'\n", ippGetString (attr, i, NULL)); |
333 |
- break; |
334 |
- |
335 |
- case IPP_TAG_BOOLEAN: |
336 |
-- g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false"); |
337 |
-+ g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false"); |
338 |
- break; |
339 |
- |
340 |
- default: |
341 |
--- |
342 |
-1.7.8.6 |
343 |
- |
344 |
|
345 |
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch |
346 |
deleted file mode 100644 |
347 |
index 10eb75d1bc4..00000000000 |
348 |
--- a/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch |
349 |
+++ /dev/null |
350 |
@@ -1,34 +0,0 @@ |
351 |
-From 8f5e326dd89d98b2d34cf6f97583be4eb819b02b Mon Sep 17 00:00:00 2001 |
352 |
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
353 |
-Date: Sun, 29 Jun 2014 10:36:14 +0200 |
354 |
-Subject: [PATCH] Use AC_PATH_TOOL to find cups-config. And actually use the |
355 |
- result. |
356 |
- |
357 |
---- |
358 |
- configure.in | 6 +++--- |
359 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
360 |
- |
361 |
-diff --git a/configure.in b/configure.in |
362 |
-index 3f0ccc5..0bd367e 100644 |
363 |
---- a/configure.in |
364 |
-+++ b/configure.in |
365 |
-@@ -22,13 +22,13 @@ AC_SUBST(GLIB_REQUIRED) |
366 |
- |
367 |
- PKG_CHECK_MODULES(LIBGNOMECUPS, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED) |
368 |
- |
369 |
--AC_PATH_PROG(CUPS_CONFIG, cups-config, no) |
370 |
-+AC_PATH_TOOL(CUPS_CONFIG, cups-config, no) |
371 |
- if test "$CUPS_CONFIG" = "no"; then |
372 |
- AC_MSG_ERROR([Please install cups development packages]) |
373 |
- fi |
374 |
- |
375 |
--CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` |
376 |
--CUPS_LIBS=`cups-config --libs` |
377 |
-+CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` |
378 |
-+CUPS_LIBS=`$CUPS_CONFIG --libs` |
379 |
- |
380 |
- AC_SUBST(CUPS_CFLAGS) |
381 |
- AC_SUBST(CUPS_LIBS) |
382 |
--- |
383 |
-2.0.0 |
384 |
- |
385 |
|
386 |
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch |
387 |
deleted file mode 100644 |
388 |
index 797231416b6..00000000000 |
389 |
--- a/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch |
390 |
+++ /dev/null |
391 |
@@ -1,34 +0,0 @@ |
392 |
-From afe4d5299e6f48ace0fbedbfba8159812afcdd1c Mon Sep 17 00:00:00 2001 |
393 |
-From: Lubomir Rintel <lkundrak@××.sk> |
394 |
-Date: Tue, 14 Jan 2014 15:23:59 +0100 |
395 |
-Subject: [PATCH] Fix build with -Werror=format-security |
396 |
- |
397 |
---- |
398 |
- libgnomecups/gnome-cups-request.c | 4 ++-- |
399 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
400 |
- |
401 |
-diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c |
402 |
-index c94f623..fa1bd97 100644 |
403 |
---- a/libgnomecups/gnome-cups-request.c |
404 |
-+++ b/libgnomecups/gnome-cups-request.c |
405 |
-@@ -353,7 +353,7 @@ request_thread_main (GnomeCupsRequest *request, |
406 |
- g_warning ("IPP request failed with status %d", status); |
407 |
- if (request->error != NULL) |
408 |
- *(request->error) = g_error_new (GNOME_CUPS_ERROR, |
409 |
-- status, ippErrorString (status)); |
410 |
-+ status, "%s", ippErrorString (status)); |
411 |
- } else if (request->response && _gnome_cups_debug) { |
412 |
- g_print ("response = \n"); |
413 |
- dump_request (request->response); |
414 |
-@@ -364,7 +364,7 @@ request_thread_main (GnomeCupsRequest *request, |
415 |
- request->response = NULL; |
416 |
- if (HTTP_OK != status && request->error != NULL) |
417 |
- *(request->error) = g_error_new (GNOME_CUPS_ERROR, |
418 |
-- status, httpStatus (status)); |
419 |
-+ status, "%s", httpStatus (status)); |
420 |
- } else { |
421 |
- g_warning ("Neither request nor output_fd set"); |
422 |
- if (request->error != NULL) |
423 |
--- |
424 |
-1.8.3.1 |
425 |
- |
426 |
|
427 |
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch |
428 |
deleted file mode 100644 |
429 |
index 3383cde1678..00000000000 |
430 |
--- a/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch |
431 |
+++ /dev/null |
432 |
@@ -1,94 +0,0 @@ |
433 |
-From 14979a2356fd751d82d037db65ce92072097bbf3 Mon Sep 17 00:00:00 2001 |
434 |
-From: Kjartan Maraas <kmaraas@×××××.org> |
435 |
-Date: Wed, 30 Jan 2008 17:30:43 +0000 |
436 |
-Subject: [PATCH] Fix some warnings. Fix wrong order of arguments to |
437 |
- g_list_find_custom. |
438 |
- |
439 |
-2008-01-30 Kjartan Maraas <kmaraas@×××××.org> |
440 |
- |
441 |
- * libgnomecups/gnome-cups-printer.c: (set_timeout), |
442 |
- (gnome_cups_printer_get_state_name), |
443 |
- (_gnome_cups_printer_get_host): Fix some warnings. |
444 |
- * libgnomecups/gnome-cups-queue.c: (gnome_cups_queue_get_job): |
445 |
- Fix wrong order of arguments to g_list_find_custom. |
446 |
- |
447 |
-svn path=/trunk/; revision=237 |
448 |
---- |
449 |
- ChangeLog | 8 ++++++++ |
450 |
- libgnomecups/gnome-cups-printer.c | 7 +++---- |
451 |
- libgnomecups/gnome-cups-queue.c | 4 ++-- |
452 |
- 3 files changed, 13 insertions(+), 6 deletions(-) |
453 |
- |
454 |
-diff --git a/ChangeLog b/ChangeLog |
455 |
-index b41ac9e..166c87a 100644 |
456 |
---- a/ChangeLog |
457 |
-+++ b/ChangeLog |
458 |
-@@ -1,3 +1,11 @@ |
459 |
-+2008-01-30 Kjartan Maraas <kmaraas@×××××.org> |
460 |
-+ |
461 |
-+ * libgnomecups/gnome-cups-printer.c: (set_timeout), |
462 |
-+ (gnome_cups_printer_get_state_name), |
463 |
-+ (_gnome_cups_printer_get_host): Fix some warnings. |
464 |
-+ * libgnomecups/gnome-cups-queue.c: (gnome_cups_queue_get_job): |
465 |
-+ Fix wrong order of arguments to g_list_find_custom. |
466 |
-+ |
467 |
- 2008-01-18 Gil Forcada <gforcada@×××××.org> |
468 |
- |
469 |
- * configure.in: Added mk, tr and zh_HK to ALL_LINGUAS. |
470 |
-diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c |
471 |
-index 9c5c7d3..704f205 100644 |
472 |
---- a/libgnomecups/gnome-cups-printer.c |
473 |
-+++ b/libgnomecups/gnome-cups-printer.c |
474 |
-@@ -791,7 +791,7 @@ set_timeout (void) |
475 |
- |
476 |
- if (should_timeout && !update_timeout_id) { |
477 |
- update_timeout_id = g_timeout_add (UPDATE_TIMEOUT, |
478 |
-- update_printers_timeout, |
479 |
-+ (GSourceFunc)update_printers_timeout, |
480 |
- NULL); |
481 |
- } else if (!should_timeout && update_timeout_id) { |
482 |
- g_source_remove (update_timeout_id); |
483 |
-@@ -1069,7 +1069,6 @@ gnome_cups_printer_get_state (GnomeCupsPrinter *printer) |
484 |
- const char * |
485 |
- gnome_cups_printer_get_state_name (GnomeCupsPrinter *printer) |
486 |
- { |
487 |
-- const char *state_str; |
488 |
- ipp_pstate_t state; |
489 |
- |
490 |
- g_return_val_if_fail (GNOME_CUPS_IS_PRINTER (printer), NULL); |
491 |
-@@ -1079,7 +1078,7 @@ gnome_cups_printer_get_state_name (GnomeCupsPrinter *printer) |
492 |
- |
493 |
- state = printer->details->state; |
494 |
- |
495 |
-- return state_str = _(printer_state_strings[state - IPP_PRINTER_IDLE]); |
496 |
-+ return _(printer_state_strings[state - IPP_PRINTER_IDLE]); |
497 |
- } |
498 |
- |
499 |
- const char * |
500 |
-@@ -2001,7 +2000,7 @@ _gnome_cups_printer_get_host (GnomeCupsPrinter *printer) |
501 |
- { |
502 |
- gchar *host = NULL; |
503 |
- |
504 |
--#warning this is broken for smb://user:pass@host/printer urls |
505 |
-+ /* warning this is broken for smb://user:pass@host/printer urls */ |
506 |
- if (go_directly_to_printer_when_possible && |
507 |
- printer->details->printer_uri) { |
508 |
- gchar *x, *y; |
509 |
-diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c |
510 |
-index d9b9a92..9f98ed9 100644 |
511 |
---- a/libgnomecups/gnome-cups-queue.c |
512 |
-+++ b/libgnomecups/gnome-cups-queue.c |
513 |
-@@ -413,8 +413,8 @@ gnome_cups_queue_get_job (GnomeCupsQueue *queue, |
514 |
- { |
515 |
- if (cache_ok) { |
516 |
- GList *link = g_list_find_custom (queue->details->jobs, |
517 |
-- (GCompareFunc) find_job_by_id, |
518 |
-- GINT_TO_POINTER (job_id)); |
519 |
-+ GINT_TO_POINTER (job_id), |
520 |
-+ (GCompareFunc) find_job_by_id); |
521 |
- if (link) |
522 |
- return gnome_cups_job_dup (link->data); |
523 |
- } |
524 |
--- |
525 |
-1.7.8.4 |
526 |
- |
527 |
|
528 |
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch |
529 |
deleted file mode 100644 |
530 |
index 3f73af861c0..00000000000 |
531 |
--- a/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch |
532 |
+++ /dev/null |
533 |
@@ -1,38 +0,0 @@ |
534 |
-From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001 |
535 |
-From: Dominique Leuenberger <dimstar@××××××××.org> |
536 |
-Date: Sun, 27 Nov 2011 21:36:41 +0100 |
537 |
-Subject: [PATCH] Fix: Only glib.h can be included |
538 |
- |
539 |
---- |
540 |
- libgnomecups/gnome-cups-i18n.c | 2 +- |
541 |
- libgnomecups/gnome-cups-init.h | 3 +-- |
542 |
- 2 files changed, 2 insertions(+), 3 deletions(-) |
543 |
- |
544 |
-diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c |
545 |
-index 8987c5c..127756d 100644 |
546 |
---- a/libgnomecups/gnome-cups-i18n.c |
547 |
-+++ b/libgnomecups/gnome-cups-i18n.c |
548 |
-@@ -1,5 +1,5 @@ |
549 |
- #include <config.h> |
550 |
--#include <glib/gmacros.h> |
551 |
-+#include <glib.h> |
552 |
- #include "gnome-cups-i18n.h" |
553 |
- |
554 |
- #ifdef ENABLE_NLS |
555 |
-diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h |
556 |
-index 22b682a..c4600fc 100644 |
557 |
---- a/libgnomecups/gnome-cups-init.h |
558 |
-+++ b/libgnomecups/gnome-cups-init.h |
559 |
-@@ -1,8 +1,7 @@ |
560 |
- #ifndef GNOME_CUPS_INIT |
561 |
- #define GNOME_CUPS_INIT |
562 |
- |
563 |
--#include <glib/gtypes.h> |
564 |
--#include <glib/gmacros.h> |
565 |
-+#include <glib.h> |
566 |
- |
567 |
- G_BEGIN_DECLS |
568 |
- |
569 |
--- |
570 |
-1.7.7 |
571 |
- |
572 |
|
573 |
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch |
574 |
deleted file mode 100644 |
575 |
index b682e450746..00000000000 |
576 |
--- a/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch |
577 |
+++ /dev/null |
578 |
@@ -1,13 +0,0 @@ |
579 |
---- libgnomecups-0.2.2.orig/libgnomecups/gnome-cups-printer.c |
580 |
-+++ libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c |
581 |
-@@ -510,6 +510,10 @@ |
582 |
- num_dests = cups_get_dests (filename, num_dests, dests); |
583 |
- g_free (filename); |
584 |
- |
585 |
-+ filename = g_build_filename (g_get_home_dir (), ".cups", "lpoptions", NULL); |
586 |
-+ num_dests = cups_get_dests (filename, num_dests, dests); |
587 |
-+ g_free (filename); |
588 |
-+ |
589 |
- return num_dests; |
590 |
- } |
591 |
- |
592 |
|
593 |
diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch |
594 |
deleted file mode 100644 |
595 |
index 8fe6502a6f3..00000000000 |
596 |
--- a/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch |
597 |
+++ /dev/null |
598 |
@@ -1,10 +0,0 @@ |
599 |
---- libgnomecups-1.0.pc.in~ 2007-01-02 01:18:51.000000000 +0100 |
600 |
-+++ libgnomecups-1.0.pc.in 2011-05-08 13:21:35.000000000 +0200 |
601 |
-@@ -7,5 +7,6 @@ |
602 |
- Description: GNOME CUPS Library |
603 |
- Version: @VERSION@ |
604 |
- Requires: glib-2.0 gobject-2.0 |
605 |
--Libs: -L${libdir} -lgnomecups-1.0 @CUPS_LIBS@ |
606 |
-+Libs: -L${libdir} -lgnomecups-1.0 |
607 |
-+Libs.private: -L${libdir} -lgnomecups-1.0 @CUPS_LIBS@ |
608 |
- Cflags: -I${includedir} @CUPS_CFLAGS@ |
609 |
|
610 |
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild |
611 |
deleted file mode 100644 |
612 |
index ee9b210015d..00000000000 |
613 |
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild |
614 |
+++ /dev/null |
615 |
@@ -1,64 +0,0 @@ |
616 |
-# Copyright 1999-2021 Gentoo Authors |
617 |
-# Distributed under the terms of the GNU General Public License v2 |
618 |
- |
619 |
-EAPI=5 |
620 |
-GCONF_DEBUG="yes" |
621 |
-GNOME_TARBALL_SUFFIX="bz2" |
622 |
- |
623 |
-inherit autotools epatch gnome2 multilib-minimal |
624 |
- |
625 |
-DESCRIPTION="GNOME cups library" |
626 |
-HOMEPAGE="https://www.gnome.org/" |
627 |
- |
628 |
-LICENSE="GPL-2 LGPL-2" |
629 |
-SLOT="0" |
630 |
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" |
631 |
-IUSE="" |
632 |
- |
633 |
-RDEPEND=" |
634 |
- >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] |
635 |
- >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] |
636 |
-" |
637 |
-DEPEND="${RDEPEND} |
638 |
- >=dev-util/intltool-0.28 |
639 |
- gnome-base/gnome-common |
640 |
- virtual/pkgconfig |
641 |
-" |
642 |
- |
643 |
-src_prepare() { |
644 |
- epatch "${FILESDIR}"/enablenet.patch |
645 |
- |
646 |
- # Fix .pc file per bug #235013 |
647 |
- epatch "${FILESDIR}"/${P}-pkgconfig.patch |
648 |
- |
649 |
- # Upstream fix for g_list_find_custom() argument order |
650 |
- epatch "${FILESDIR}/${P}-g_list_find_custom.patch" |
651 |
- |
652 |
- # >=glib-2.31 compat, bug #400789, https://bugzilla.gnome.org/show_bug.cgi?id=664930 |
653 |
- epatch "${FILESDIR}/${P}-glib.h.patch" |
654 |
- |
655 |
- # cups-1.6 compat, bug #428812 |
656 |
- epatch "${FILESDIR}/${P}-cups-1.6.patch" |
657 |
- |
658 |
- # so it looks for cups-config... how about using $CUPS_CONFIG then? |
659 |
- # and also use AC_PATH_TOOL to respect $CHOST |
660 |
- epatch "${FILESDIR}/${P}-cups-config.patch" |
661 |
- |
662 |
- # Fix building with -Werror=format-security, bug #517612 |
663 |
- epatch "${FILESDIR}/${P}-format-string.patch" |
664 |
- |
665 |
- # Look for lpoptions in the right spot, upstream bug #520449 |
666 |
- epatch "${FILESDIR}/${P}-lpoptions.patch" |
667 |
- |
668 |
- eautoreconf # To fix intltool files making LINGUAS to be honored |
669 |
- gnome2_src_prepare |
670 |
-} |
671 |
- |
672 |
-multilib_src_configure() { |
673 |
- ECONF_SOURCE=${S} \ |
674 |
- gnome2_src_configure --disable-static |
675 |
-} |
676 |
- |
677 |
-multilib_src_install() { |
678 |
- gnome2_src_install |
679 |
-} |
680 |
|
681 |
diff --git a/net-print/libgnomecups/metadata.xml b/net-print/libgnomecups/metadata.xml |
682 |
deleted file mode 100644 |
683 |
index 0d5df29788c..00000000000 |
684 |
--- a/net-print/libgnomecups/metadata.xml |
685 |
+++ /dev/null |
686 |
@@ -1,12 +0,0 @@ |
687 |
-<?xml version="1.0" encoding="UTF-8"?> |
688 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
689 |
-<pkgmetadata> |
690 |
-<maintainer type="project"> |
691 |
- <email>gnome@g.o</email> |
692 |
- <name>Gentoo GNOME Desktop</name> |
693 |
-</maintainer> |
694 |
-<maintainer type="project"> |
695 |
- <email>printing@g.o</email> |
696 |
- <name>Gentoo Printing Project</name> |
697 |
-</maintainer> |
698 |
-</pkgmetadata> |
699 |
|
700 |
diff --git a/profiles/package.mask b/profiles/package.mask |
701 |
index 49a6e3cedb6..e87b326b11a 100644 |
702 |
--- a/profiles/package.mask |
703 |
+++ b/profiles/package.mask |
704 |
@@ -194,11 +194,6 @@ app-benchmarks/acovea-gtk |
705 |
# Removal in ~30 days. |
706 |
app-crypt/WiRouterKeyRec |
707 |
|
708 |
-# Andreas Sturmlechner <asturm@g.o> (2021-08-10) |
709 |
-# EAPI-5, dead, unused; last consumer dropped in bug #352952 |
710 |
-# Removal on 2021-09-09. |
711 |
-net-print/libgnomecups |
712 |
- |
713 |
# David Seifert <soap@g.o> (2021-08-04) |
714 |
# Last release over 4 years ago, upstream pretty much dead, the |
715 |
# ecosystem has switched to dev-util/pkgconf, which is alive. Testing |