Fix building against CUPS 1.5.
This commit is contained in:
parent
a1bddb8a32
commit
d79d7b8683
11
hplip-cups15.patch
Normal file
11
hplip-cups15.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -up hplip-3.11.5/prnt/hpps/hppsfilter.c.cups15 hplip-3.11.5/prnt/hpps/hppsfilter.c
|
||||||
|
--- hplip-3.11.5/prnt/hpps/hppsfilter.c.cups15 2011-06-10 11:44:25.933781345 +0100
|
||||||
|
+++ hplip-3.11.5/prnt/hpps/hppsfilter.c 2011-06-10 11:46:24.474510996 +0100
|
||||||
|
@@ -38,6 +38,7 @@
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <cups/cups.h>
|
||||||
|
+#include <cups/ppd.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
|
@ -33,6 +33,7 @@ Patch17: hplip-deviceIDs-ppd.patch
|
|||||||
Patch18: hplip-skip-blank-lines.patch
|
Patch18: hplip-skip-blank-lines.patch
|
||||||
Patch19: hplip-dbglog-newline.patch
|
Patch19: hplip-dbglog-newline.patch
|
||||||
Patch20: hplip-no-system-tray.patch
|
Patch20: hplip-no-system-tray.patch
|
||||||
|
Patch21: hplip-cups15.patch
|
||||||
Patch22: hplip-ppd-ImageableArea.patch
|
Patch22: hplip-ppd-ImageableArea.patch
|
||||||
Patch25: hplip-raw_deviceID-traceback.patch
|
Patch25: hplip-raw_deviceID-traceback.patch
|
||||||
Patch26: hplip-UnicodeDecodeError.patch
|
Patch26: hplip-UnicodeDecodeError.patch
|
||||||
@ -242,6 +243,9 @@ done
|
|||||||
# Wait longer to see if a system tray becomes available (bug #569969).
|
# Wait longer to see if a system tray becomes available (bug #569969).
|
||||||
%patch20 -p1 -b .no-system-tray
|
%patch20 -p1 -b .no-system-tray
|
||||||
|
|
||||||
|
# Fix building against CUPS 1.5.
|
||||||
|
%patch21 -p1 -b .cups15
|
||||||
|
|
||||||
# Fix ImageableArea for Laserjet 8150/9000 (bug #596298).
|
# Fix ImageableArea for Laserjet 8150/9000 (bug #596298).
|
||||||
for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4);
|
for ppd_file in $(grep '^diff' %{PATCH22} | cut -d " " -f 4);
|
||||||
do
|
do
|
||||||
@ -522,6 +526,7 @@ fi
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Jun 10 2011 Tim Waugh <twaugh@redhat.com> 3.11.5-3
|
* Fri Jun 10 2011 Tim Waugh <twaugh@redhat.com> 3.11.5-3
|
||||||
|
- Fix building against CUPS 1.5.
|
||||||
- Re-create installed hpcups PPDs unconditionally (bug #712241).
|
- Re-create installed hpcups PPDs unconditionally (bug #712241).
|
||||||
|
|
||||||
* Thu May 19 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.5-2
|
* Thu May 19 2011 Jiri Popelka <jpopelka@redhat.com> 3.11.5-2
|
||||||
|
Loading…
Reference in New Issue
Block a user