pacho 14/07/20 19:42:37
Added: libgnomecups-0.2.3-lpoptions.patch
libgnomecups-0.2.3-format-string.patch
Log:
Fix building with -Werror=format-security (#517612 by ago) and look for
lpoptions in proper place (from Fedora)
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A188FBD4)
Revision Changes Path
1.1
net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-lpoptions.patch?rev=1.1&content-type=text/plain
Index: libgnomecups-0.2.3-lpoptions.patch
===================================================================
--- 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;
}
1.1
net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-format-string.patch?rev=1.1&content-type=text/plain
Index: libgnomecups-0.2.3-format-string.patch
===================================================================
>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
