rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

including cups/ppd.h into HPCupsFilter.h and hpcupsfax.h

Browse Source
This commit is contained in:
Zdenek Dohnal 2016-07-11 14:28:13 +02:00
parent 5c95f60129
commit 16ade9c89d
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hplip-include-ppdh.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up hplip-3.16.5/prnt/hpcups/HPCupsFilter.h.ppd hplip-3.16.5/prnt/hpcups/HPCupsFilter.h
--- hplip-3.16.5/prnt/hpcups/HPCupsFilter.h.ppd 2016-07-11 13:37:19.224836291 +0200
+++ hplip-3.16.5/prnt/hpcups/HPCupsFilter.h 2016-07-11 13:38:05.290523517 +0200
@@ -37,6 +37,7 @@
#include "Job.h"
#include "dbuscomm.h"
+#include <cups/ppd.h>
#define DBITMAPFILEHEADER 14
#define DBITMAPINFOHEADER 40
diff -up hplip-3.16.5/prnt/hpijs/hpcupsfax.h.ppd hplip-3.16.5/prnt/hpijs/hpcupsfax.h
--- hplip-3.16.5/prnt/hpijs/hpcupsfax.h.ppd 2016-07-11 13:43:25.837347080 +0200
+++ hplip-3.16.5/prnt/hpijs/hpcupsfax.h 2016-07-11 13:45:14.590608672 +0200
@@ -32,6 +32,8 @@
#ifndef HPCUPSFAX_H
#define HPCUPSFAX_H
+#include <cups/ppd.h>
+
/*
* Raster data encoding methods
*/

8
hplip.spec
View File

@ -7,7 +7,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 3.16.5 Version: 3.16.5
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and MIT and BSD License: GPLv2+ and MIT and BSD
Url: http://hplip.sourceforge.net/ Url: http://hplip.sourceforge.net/
@ -37,6 +37,7 @@ Patch21: hplip-strncpy.patch
Patch22: hplip-no-write-bytecode.patch Patch22: hplip-no-write-bytecode.patch
Patch23: hplip-silence-ioerror.patch Patch23: hplip-silence-ioerror.patch
Patch24: hplip-3165-sourceoption.patch Patch24: hplip-3165-sourceoption.patch
Patch25: hplip-include-ppdh.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: python3-pillow Requires: python3-pillow
@ -211,6 +212,8 @@ done
# [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304) # [abrt] hplip: hp-scan:663:<module>:NameError: name 'source_option' is not defined (bug #1341304)
%patch24 -p1 -b .sourceoption %patch24 -p1 -b .sourceoption
%patch25 -p1 -b .include-ppdh
sed -i.duplex-constraints \ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \ -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in prnt/drv/hpcups.drv.in
@ -462,6 +465,9 @@ rm -f %{buildroot}%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog
* Mon Jul 11 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.5-3
- including cups/ppd.h into HPCupsFilter.h and hpcupsfax.h
* Wed Jun 22 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.5-2 * Wed Jun 22 2016 Zdenek Dohnal <zdohnal@redhat.com> - 3.16.5-2
- bug 1341304 - name 'source_option' is not defined - bug 1341304 - name 'source_option' is not defined