Fix build against newer versions of gcc.

This commit is contained in:
Tim Waugh 2011-06-07 13:17:27 +01:00
parent 5adf93e8a4
commit a374dedd23
2 changed files with 26 additions and 0 deletions

22
gutenprint-build.patch Normal file
View File

@ -0,0 +1,22 @@
diff -up gutenprint-5.2.7/src/cups/commandtocanon.c.build gutenprint-5.2.7/src/cups/commandtocanon.c
--- gutenprint-5.2.7/src/cups/commandtocanon.c.build 2011-06-07 13:32:37.372042304 +0100
+++ gutenprint-5.2.7/src/cups/commandtocanon.c 2011-06-07 13:32:41.270970750 +0100
@@ -13,6 +13,7 @@
#include <cups/cups.h>
#include <ctype.h>
+#include <stdio.h>
#include <stdlib.h>
diff -up gutenprint-5.2.7/src/cups/commandtoepson.c.build gutenprint-5.2.7/src/cups/commandtoepson.c
--- gutenprint-5.2.7/src/cups/commandtoepson.c.build 2007-12-24 17:19:20.000000000 +0000
+++ gutenprint-5.2.7/src/cups/commandtoepson.c 2011-06-07 13:32:35.656073794 +0100
@@ -30,6 +30,7 @@
#include <cups/cups.h>
#include <ctype.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>

View File

@ -18,6 +18,7 @@ Patch2: gutenprint-selinux.patch
Patch3: gutenprint-postscriptdriver.patch Patch3: gutenprint-postscriptdriver.patch
Patch4: gutenprint-device-ids.patch Patch4: gutenprint-device-ids.patch
Patch5: gutenprint-null-pointer.patch Patch5: gutenprint-null-pointer.patch
Patch6: gutenprint-build.patch
License: GPLv2+ License: GPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 BuildRequires: cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10
@ -169,6 +170,8 @@ Epson, HP and compatible printers.
%patch4 -p1 -b .device-ids %patch4 -p1 -b .device-ids
# Avoid null pointer access in escputil (bug #659120). # Avoid null pointer access in escputil (bug #659120).
%patch5 -p1 -b .null-pointer %patch5 -p1 -b .null-pointer
# Fix build against new versions of gcc.
%patch6 -p1 -b .build
cp %{SOURCE2} src/cups/cups-genppdupdate.in cp %{SOURCE2} src/cups/cups-genppdupdate.in
@ -299,6 +302,7 @@ fi
%changelog %changelog
* Tue Jun 7 2011 Tim Waugh <twaugh@redhat.com> 5.2.7-2 * Tue Jun 7 2011 Tim Waugh <twaugh@redhat.com> 5.2.7-2
- Fix build against newer versions of gcc.
- cups-genppdupdate: fixed multicat support (bug #711021). It was - cups-genppdupdate: fixed multicat support (bug #711021). It was
writing an extra newline character after the URI, which caused the writing an extra newline character after the URI, which caused the
gutenprint.5.2 multicat process to exit. This prevented some gutenprint.5.2 multicat process to exit. This prevented some