commit e4f7eb0f5b72288f2a79fa580ba8108e49ca744d
Author: Jakub Bogusz <[email protected]>
Date: Sun Jan 6 08:31:01 2013 +0100
- added glib patch (fixes build with glib 2.34)
- added format patch (fixes build with -Werror=format-security)
libgnomecups-format.patch | 20 ++++++++++++++++++++
libgnomecups-glib.patch | 21 +++++++++++++++++++++
libgnomecups.spec | 4 ++++
3 files changed, 45 insertions(+)
---
diff --git a/libgnomecups.spec b/libgnomecups.spec
index 47bb6e2..b362021 100644
--- a/libgnomecups.spec
+++ b/libgnomecups.spec
@@ -7,6 +7,8 @@ License: LGPL v2
Group: Libraries
Source0:
http://ftp.gnome.org/pub/gnome/sources/libgnomecups/0.2/%{name}-%{version}.tar.bz2
# Source0-md5: dc4920c15c9f886f73ea74fbff0ae48b
+Patch0: %{name}-glib.patch
+Patch1: %{name}-format.patch
URL: http://www.gnome.org/
BuildRequires: autoconf >= 2.52
BuildRequires: automake
@@ -56,6 +58,8 @@ Statyczna biblioteka libgnomecups.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
diff --git a/libgnomecups-format.patch b/libgnomecups-format.patch
new file mode 100644
index 0000000..c468783
--- /dev/null
+++ b/libgnomecups-format.patch
@@ -0,0 +1,20 @@
+--- libgnomecups-0.2.3/libgnomecups/gnome-cups-request.c.orig 2007-01-31
19:49:17.000000000 +0100
++++ libgnomecups-0.2.3/libgnomecups/gnome-cups-request.c 2013-01-06
08:22:56.207221127 +0100
+@@ -353,7 +353,7 @@ request_thread_main (GnomeCupsRequest *r
+ 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 *r
+ 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)
diff --git a/libgnomecups-glib.patch b/libgnomecups-glib.patch
new file mode 100644
index 0000000..6f88436
--- /dev/null
+++ b/libgnomecups-glib.patch
@@ -0,0 +1,21 @@
+--- libgnomecups-0.2.3/libgnomecups/gnome-cups-i18n.c.orig 2007-01-02
01:18:51.000000000 +0100
++++ libgnomecups-0.2.3/libgnomecups/gnome-cups-i18n.c 2013-01-06
08:19:49.888606151 +0100
+@@ -1,5 +1,5 @@
+ #include <config.h>
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include "gnome-cups-i18n.h"
+
+ #ifdef ENABLE_NLS
+--- libgnomecups-0.2.3/libgnomecups/gnome-cups-init.h.orig 2007-01-02
01:18:51.000000000 +0100
++++ libgnomecups-0.2.3/libgnomecups/gnome-cups-init.h 2013-01-06
08:20:30.967196805 +0100
+@@ -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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libgnomecups.git/commitdiff/e4f7eb0f5b72288f2a79fa580ba8108e49ca744d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
