commit: 7bb5a7034262d62de3d5122f43b03d7ea574d415 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Fri Sep 10 08:46:58 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Fri Sep 10 08:46:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb5a703
net-print/libgnomecups: Remove last-rited package Bug: https://bugs.gentoo.org/352952 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> net-print/libgnomecups/Manifest | 1 - net-print/libgnomecups/files/enablenet.patch | 11 - .../files/libgnomecups-0.2.3-cups-1.6.patch | 285 --------------------- .../files/libgnomecups-0.2.3-cups-config.patch | 34 --- .../files/libgnomecups-0.2.3-format-string.patch | 34 --- .../libgnomecups-0.2.3-g_list_find_custom.patch | 94 ------- .../files/libgnomecups-0.2.3-glib.h.patch | 38 --- .../files/libgnomecups-0.2.3-lpoptions.patch | 13 - .../files/libgnomecups-0.2.3-pkgconfig.patch | 10 - .../libgnomecups/libgnomecups-0.2.3-r5.ebuild | 64 ----- net-print/libgnomecups/metadata.xml | 12 - profiles/package.mask | 5 - 12 files changed, 601 deletions(-) diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest deleted file mode 100644 index f3db6f28413..00000000000 --- a/net-print/libgnomecups/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libgnomecups-0.2.3.tar.bz2 357129 BLAKE2B 8a8babf0af7a83232590c5e756c4e1c2ce329dae59b88ee5be84c0286a6ed6d6c39f891b7ab0bb68bfc29539769cdd82032422c44a6131c4da9c9355669b1a57 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75 diff --git a/net-print/libgnomecups/files/enablenet.patch b/net-print/libgnomecups/files/enablenet.patch deleted file mode 100644 index f2e113d1440..00000000000 --- a/net-print/libgnomecups/files/enablenet.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomecups/gnome-cups-printer.c.orig 2005-08-04 18:21:32.221038336 +0000 -+++ libgnomecups/gnome-cups-printer.c 2005-08-04 18:22:00.369759080 +0000 -@@ -282,7 +282,7 @@ - * that will produce an infinite loop when presented with an invalid - * hostname. This will also produce a hang if the remote printer is - * unavailable and we do a syncronous lookup. */ --static gboolean go_directly_to_printer_when_possible = FALSE; -+static gboolean go_directly_to_printer_when_possible = TRUE; - - static void - update_attributes (GnomeCupsPrinter *printer) 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 deleted file mode 100644 index 68f379c2510..00000000000 --- a/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch +++ /dev/null @@ -1,285 +0,0 @@ -From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <[email protected]> -Date: Tue, 7 Aug 2012 06:53:09 -0400 -Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions - -CUPS 1.6 makes various structures private and introduces these ippGet -and ippSet functions for all of the fields in these structures. -http://www.cups.org/str.php?L3928 - -We define our own accessors when building against CUPS < 1.6. - -Based on work by Jiri Popelka <[email protected]> at -https://bugzilla.gnome.org/show_bug.cgi?id=679759 ---- - libgnomecups/gnome-cups-printer.c | 48 +++++++++++++++++++++++++++++------- - libgnomecups/gnome-cups-queue.c | 43 +++++++++++++++++++++++++++------ - libgnomecups/gnome-cups-request.c | 44 ++++++++++++++++++++++++++++----- - 3 files changed, 110 insertions(+), 25 deletions(-) - -diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c -index c924af0..f5e1ef7 100644 ---- a/libgnomecups/gnome-cups-printer.c -+++ b/libgnomecups/gnome-cups-printer.c -@@ -37,6 +37,34 @@ - - #define UPDATE_TIMEOUT 5000 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetCount(attr) attr->num_values -+#define ippGetName(attr) attr->name -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - struct _GnomeCupsPPDFile { - char name[1]; - }; -@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer, - printer->details->state_reasons = NULL; - - /* cf. RFC2911 4.4.12 */ -- for (i = 0; i < attr->num_values; i++) { -+ for (i = 0; i < ippGetCount (attr); i++) { - const char *p; -- const char *keyword = attr->values [i].string.text; -+ const char *keyword = ippGetString (attr, i, NULL); - - reason = g_new (GnomeCupsPrinterReason, 1); - -@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer) - return printer->details->info; - } - --#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; }} --#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); }}} -+#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }} -+#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)); }}} - - static void - attributes_update_cb (guint id, -@@ -243,14 +271,14 @@ attributes_update_cb (guint id, - changed = FALSE; - - if (!error && response) { -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (!attr->name) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (!ippGetName (attr)) { - continue; - } -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) { - continue; - } -- if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) { - map_reasons (printer, attr); - } - MAP_INT (printer->details->state, "printer-state"); -@@ -570,7 +598,7 @@ get_default (void) - - attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); - if (attr) { -- name = g_strdup (attr->values[0].string.text); -+ name = g_strdup (ippGetString (attr, 0, NULL)); - } else { - name = NULL; - } -@@ -698,7 +726,7 @@ get_printer_names (void) - attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); - while (attr) { - ret = g_list_prepend (ret, -- g_strdup (attr->values[0].string.text)); -+ g_strdup (ippGetString (attr, 0, NULL))); - - attr = ippFindNextAttribute (response, - "printer-name", -diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c -index 9f98ed9..298db42 100644 ---- a/libgnomecups/gnome-cups-queue.c -+++ b/libgnomecups/gnome-cups-queue.c -@@ -15,6 +15,33 @@ - - #define UPDATE_TIMEOUT 3000 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetName(attr) attr->name -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - struct _GnomeCupsQueueDetails { - char *queue_name; - GList *jobs; -@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job) - job->size = job->size * 1024; - } - --#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);}} --#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } } -+#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));}} -+#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } } - - static void - get_jobs_cb (guint id, -@@ -231,8 +258,8 @@ get_jobs_cb (guint id, - - if (response) { - job = g_new0 (GnomeCupsJob, 1); -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (attr->name == NULL) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (ippGetName (attr) == NULL) { - if (job->name) { - finish_job (job); - jobs = g_list_prepend (jobs, job); -@@ -244,7 +271,7 @@ get_jobs_cb (guint id, - continue; - } - -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { - continue; - - } -@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, - - if (response) { - job = g_new0 (GnomeCupsJob, 1); -- for (attr = response->attrs; attr != NULL; attr = attr->next) { -- if (attr->name == NULL) { -+ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { -+ if (ippGetName (attr) == NULL) { - if (job->name) { - finish_job (job); - } else { -@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, - break; - } - -- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { -+ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { - continue; - } - -diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c -index c94f623..13f0948 100644 ---- a/libgnomecups/gnome-cups-request.c -+++ b/libgnomecups/gnome-cups-request.c -@@ -19,6 +19,36 @@ - #define STOP_UNUSED_THREADS_TIMEOUT 60 - #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30 - -+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) -+#define HAVE_CUPS_1_6 1 -+#endif -+ -+#ifndef HAVE_CUPS_1_6 -+#define ippGetCount(attr) attr->num_values -+#define ippGetValueTag(attr) attr->value_tag -+#define ippGetName(attr) attr->name -+#define ippGetBoolean(attr, element) attr->values[element].boolean -+#define ippGetInteger(attr, element) attr->values[element].integer -+#define ippGetString(attr, element, language) attr->values[element].string.text -+ -+static ipp_attribute_t * -+ippFirstAttribute(ipp_t *ipp) -+{ -+ if (!ipp) -+ return (NULL); -+ return (ipp->current = ipp->attrs); -+} -+ -+static ipp_attribute_t * -+ippNextAttribute(ipp_t *ipp) -+{ -+ if (!ipp || !ipp->current) -+ return (NULL); -+ return (ipp->current = ipp->current->next); -+} -+#endif -+ -+ - typedef struct - { - GMutex *mutex; -@@ -276,14 +306,14 @@ dump_request (ipp_t const *req) - unsigned i; - ipp_attribute_t *attr; - -- for (attr = req->attrs; attr != NULL; attr = attr->next) { -- g_print ("%s", attr->name); -- for (i = 0 ; i < attr->num_values ; i++) { -+ for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) { -+ g_print ("%s", ippGetName (attr)); -+ for (i = 0 ; i < ippGetCount (attr) ; i++) { - g_print ("\t[%d] = ", i); -- switch (attr->value_tag & ~IPP_TAG_COPY) { -+ switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) { - case IPP_TAG_INTEGER: - case IPP_TAG_ENUM: -- g_print ("%d\n", attr->values[i].integer); -+ g_print ("%d\n", ippGetInteger (attr, i)); - break; - - case IPP_TAG_STRING: -@@ -294,11 +324,11 @@ dump_request (ipp_t const *req) - case IPP_TAG_CHARSET: - case IPP_TAG_LANGUAGE: - case IPP_TAG_MIMETYPE: -- g_print ("'%s'\n", attr->values[i].string.text); -+ g_print ("'%s'\n", ippGetString (attr, i, NULL)); - break; - - case IPP_TAG_BOOLEAN: -- g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false"); -+ g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false"); - break; - - default: --- -1.7.8.6 - 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 deleted file mode 100644 index 10eb75d1bc4..00000000000 --- a/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-config.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8f5e326dd89d98b2d34cf6f97583be4eb819b02b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Sun, 29 Jun 2014 10:36:14 +0200 -Subject: [PATCH] Use AC_PATH_TOOL to find cups-config. And actually use the - result. - ---- - configure.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.in b/configure.in -index 3f0ccc5..0bd367e 100644 ---- a/configure.in -+++ b/configure.in -@@ -22,13 +22,13 @@ AC_SUBST(GLIB_REQUIRED) - - PKG_CHECK_MODULES(LIBGNOMECUPS, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED) - --AC_PATH_PROG(CUPS_CONFIG, cups-config, no) -+AC_PATH_TOOL(CUPS_CONFIG, cups-config, no) - if test "$CUPS_CONFIG" = "no"; then - AC_MSG_ERROR([Please install cups development packages]) - fi - --CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` --CUPS_LIBS=`cups-config --libs` -+CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'` -+CUPS_LIBS=`$CUPS_CONFIG --libs` - - AC_SUBST(CUPS_CFLAGS) - AC_SUBST(CUPS_LIBS) --- -2.0.0 - 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 deleted file mode 100644 index 797231416b6..00000000000 --- a/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch +++ /dev/null @@ -1,34 +0,0 @@ -From afe4d5299e6f48ace0fbedbfba8159812afcdd1c Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel <[email protected]> -Date: Tue, 14 Jan 2014 15:23:59 +0100 -Subject: [PATCH] Fix build with -Werror=format-security - ---- - libgnomecups/gnome-cups-request.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c -index c94f623..fa1bd97 100644 ---- a/libgnomecups/gnome-cups-request.c -+++ b/libgnomecups/gnome-cups-request.c -@@ -353,7 +353,7 @@ request_thread_main (GnomeCupsRequest *request, - g_warning ("IPP request failed with status %d", status); - if (request->error != NULL) - *(request->error) = g_error_new (GNOME_CUPS_ERROR, -- status, ippErrorString (status)); -+ status, "%s", ippErrorString (status)); - } else if (request->response && _gnome_cups_debug) { - g_print ("response = \n"); - dump_request (request->response); -@@ -364,7 +364,7 @@ request_thread_main (GnomeCupsRequest *request, - request->response = NULL; - if (HTTP_OK != status && request->error != NULL) - *(request->error) = g_error_new (GNOME_CUPS_ERROR, -- status, httpStatus (status)); -+ status, "%s", httpStatus (status)); - } else { - g_warning ("Neither request nor output_fd set"); - if (request->error != NULL) --- -1.8.3.1 - 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 deleted file mode 100644 index 3383cde1678..00000000000 --- a/net-print/libgnomecups/files/libgnomecups-0.2.3-g_list_find_custom.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 14979a2356fd751d82d037db65ce92072097bbf3 Mon Sep 17 00:00:00 2001 -From: Kjartan Maraas <[email protected]> -Date: Wed, 30 Jan 2008 17:30:43 +0000 -Subject: [PATCH] Fix some warnings. Fix wrong order of arguments to - g_list_find_custom. - -2008-01-30 Kjartan Maraas <[email protected]> - - * libgnomecups/gnome-cups-printer.c: (set_timeout), - (gnome_cups_printer_get_state_name), - (_gnome_cups_printer_get_host): Fix some warnings. - * libgnomecups/gnome-cups-queue.c: (gnome_cups_queue_get_job): - Fix wrong order of arguments to g_list_find_custom. - -svn path=/trunk/; revision=237 ---- - ChangeLog | 8 ++++++++ - libgnomecups/gnome-cups-printer.c | 7 +++---- - libgnomecups/gnome-cups-queue.c | 4 ++-- - 3 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index b41ac9e..166c87a 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,11 @@ -+2008-01-30 Kjartan Maraas <[email protected]> -+ -+ * libgnomecups/gnome-cups-printer.c: (set_timeout), -+ (gnome_cups_printer_get_state_name), -+ (_gnome_cups_printer_get_host): Fix some warnings. -+ * libgnomecups/gnome-cups-queue.c: (gnome_cups_queue_get_job): -+ Fix wrong order of arguments to g_list_find_custom. -+ - 2008-01-18 Gil Forcada <[email protected]> - - * configure.in: Added mk, tr and zh_HK to ALL_LINGUAS. -diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c -index 9c5c7d3..704f205 100644 ---- a/libgnomecups/gnome-cups-printer.c -+++ b/libgnomecups/gnome-cups-printer.c -@@ -791,7 +791,7 @@ set_timeout (void) - - if (should_timeout && !update_timeout_id) { - update_timeout_id = g_timeout_add (UPDATE_TIMEOUT, -- update_printers_timeout, -+ (GSourceFunc)update_printers_timeout, - NULL); - } else if (!should_timeout && update_timeout_id) { - g_source_remove (update_timeout_id); -@@ -1069,7 +1069,6 @@ gnome_cups_printer_get_state (GnomeCupsPrinter *printer) - const char * - gnome_cups_printer_get_state_name (GnomeCupsPrinter *printer) - { -- const char *state_str; - ipp_pstate_t state; - - g_return_val_if_fail (GNOME_CUPS_IS_PRINTER (printer), NULL); -@@ -1079,7 +1078,7 @@ gnome_cups_printer_get_state_name (GnomeCupsPrinter *printer) - - state = printer->details->state; - -- return state_str = _(printer_state_strings[state - IPP_PRINTER_IDLE]); -+ return _(printer_state_strings[state - IPP_PRINTER_IDLE]); - } - - const char * -@@ -2001,7 +2000,7 @@ _gnome_cups_printer_get_host (GnomeCupsPrinter *printer) - { - gchar *host = NULL; - --#warning this is broken for smb://user:pass@host/printer urls -+ /* warning this is broken for smb://user:pass@host/printer urls */ - if (go_directly_to_printer_when_possible && - printer->details->printer_uri) { - gchar *x, *y; -diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c -index d9b9a92..9f98ed9 100644 ---- a/libgnomecups/gnome-cups-queue.c -+++ b/libgnomecups/gnome-cups-queue.c -@@ -413,8 +413,8 @@ gnome_cups_queue_get_job (GnomeCupsQueue *queue, - { - if (cache_ok) { - GList *link = g_list_find_custom (queue->details->jobs, -- (GCompareFunc) find_job_by_id, -- GINT_TO_POINTER (job_id)); -+ GINT_TO_POINTER (job_id), -+ (GCompareFunc) find_job_by_id); - if (link) - return gnome_cups_job_dup (link->data); - } --- -1.7.8.4 - 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 deleted file mode 100644 index 3f73af861c0..00000000000 --- a/net-print/libgnomecups/files/libgnomecups-0.2.3-glib.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d84eee9450b3b6f6155074915efc61bedcc8d446 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger <[email protected]> -Date: Sun, 27 Nov 2011 21:36:41 +0100 -Subject: [PATCH] Fix: Only glib.h can be included - ---- - libgnomecups/gnome-cups-i18n.c | 2 +- - libgnomecups/gnome-cups-init.h | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/libgnomecups/gnome-cups-i18n.c b/libgnomecups/gnome-cups-i18n.c -index 8987c5c..127756d 100644 ---- a/libgnomecups/gnome-cups-i18n.c -+++ b/libgnomecups/gnome-cups-i18n.c -@@ -1,5 +1,5 @@ - #include <config.h> --#include <glib/gmacros.h> -+#include <glib.h> - #include "gnome-cups-i18n.h" - - #ifdef ENABLE_NLS -diff --git a/libgnomecups/gnome-cups-init.h b/libgnomecups/gnome-cups-init.h -index 22b682a..c4600fc 100644 ---- a/libgnomecups/gnome-cups-init.h -+++ b/libgnomecups/gnome-cups-init.h -@@ -1,8 +1,7 @@ - #ifndef GNOME_CUPS_INIT - #define GNOME_CUPS_INIT - --#include <glib/gtypes.h> --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - --- -1.7.7 - diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch deleted file mode 100644 index b682e450746..00000000000 --- a/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- libgnomecups-0.2.2.orig/libgnomecups/gnome-cups-printer.c -+++ libgnomecups-0.2.2/libgnomecups/gnome-cups-printer.c -@@ -510,6 +510,10 @@ - num_dests = cups_get_dests (filename, num_dests, dests); - g_free (filename); - -+ filename = g_build_filename (g_get_home_dir (), ".cups", "lpoptions", NULL); -+ num_dests = cups_get_dests (filename, num_dests, dests); -+ g_free (filename); -+ - return num_dests; - } - diff --git a/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch b/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch deleted file mode 100644 index 8fe6502a6f3..00000000000 --- a/net-print/libgnomecups/files/libgnomecups-0.2.3-pkgconfig.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomecups-1.0.pc.in~ 2007-01-02 01:18:51.000000000 +0100 -+++ libgnomecups-1.0.pc.in 2011-05-08 13:21:35.000000000 +0200 -@@ -7,5 +7,6 @@ - Description: GNOME CUPS Library - Version: @VERSION@ - Requires: glib-2.0 gobject-2.0 --Libs: -L${libdir} -lgnomecups-1.0 @CUPS_LIBS@ -+Libs: -L${libdir} -lgnomecups-1.0 -+Libs.private: -L${libdir} -lgnomecups-1.0 @CUPS_LIBS@ - Cflags: -I${includedir} @CUPS_CFLAGS@ diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild deleted file mode 100644 index ee9b210015d..00000000000 --- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools epatch gnome2 multilib-minimal - -DESCRIPTION="GNOME cups library" -HOMEPAGE="https://www.gnome.org/"; - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.28 - gnome-base/gnome-common - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/enablenet.patch - - # Fix .pc file per bug #235013 - epatch "${FILESDIR}"/${P}-pkgconfig.patch - - # Upstream fix for g_list_find_custom() argument order - epatch "${FILESDIR}/${P}-g_list_find_custom.patch" - - # >=glib-2.31 compat, bug #400789, https://bugzilla.gnome.org/show_bug.cgi?id=664930 - epatch "${FILESDIR}/${P}-glib.h.patch" - - # cups-1.6 compat, bug #428812 - epatch "${FILESDIR}/${P}-cups-1.6.patch" - - # so it looks for cups-config... how about using $CUPS_CONFIG then? - # and also use AC_PATH_TOOL to respect $CHOST - epatch "${FILESDIR}/${P}-cups-config.patch" - - # Fix building with -Werror=format-security, bug #517612 - epatch "${FILESDIR}/${P}-format-string.patch" - - # Look for lpoptions in the right spot, upstream bug #520449 - epatch "${FILESDIR}/${P}-lpoptions.patch" - - eautoreconf # To fix intltool files making LINGUAS to be honored - gnome2_src_prepare -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - gnome2_src_configure --disable-static -} - -multilib_src_install() { - gnome2_src_install -} diff --git a/net-print/libgnomecups/metadata.xml b/net-print/libgnomecups/metadata.xml deleted file mode 100644 index 0d5df29788c..00000000000 --- a/net-print/libgnomecups/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Printing Project</name> -</maintainer> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 49a6e3cedb6..e87b326b11a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -194,11 +194,6 @@ app-benchmarks/acovea-gtk # Removal in ~30 days. app-crypt/WiRouterKeyRec -# Andreas Sturmlechner <[email protected]> (2021-08-10) -# EAPI-5, dead, unused; last consumer dropped in bug #352952 -# Removal on 2021-09-09. -net-print/libgnomecups - # David Seifert <[email protected]> (2021-08-04) # Last release over 4 years ago, upstream pretty much dead, the # ecosystem has switched to dev-util/pkgconf, which is alive. Testing
