diff --git a/gutenprint-build.patch b/gutenprint-build.patch new file mode 100644 index 0000000..6b17a40 --- /dev/null +++ b/gutenprint-build.patch @@ -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 + #include ++#include + #include + + +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 + #include ++#include + #include + #include + diff --git a/gutenprint.spec b/gutenprint.spec index cac83d1..0990470 100644 --- a/gutenprint.spec +++ b/gutenprint.spec @@ -18,6 +18,7 @@ Patch2: gutenprint-selinux.patch Patch3: gutenprint-postscriptdriver.patch Patch4: gutenprint-device-ids.patch Patch5: gutenprint-null-pointer.patch +Patch6: gutenprint-build.patch License: GPLv2+ 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 @@ -169,6 +170,8 @@ Epson, HP and compatible printers. %patch4 -p1 -b .device-ids # Avoid null pointer access in escputil (bug #659120). %patch5 -p1 -b .null-pointer +# Fix build against new versions of gcc. +%patch6 -p1 -b .build cp %{SOURCE2} src/cups/cups-genppdupdate.in @@ -299,6 +302,7 @@ fi %changelog * Tue Jun 7 2011 Tim Waugh 5.2.7-2 +- Fix build against newer versions of gcc. - cups-genppdupdate: fixed multicat support (bug #711021). It was writing an extra newline character after the URI, which caused the gutenprint.5.2 multicat process to exit. This prevented some