Merge pull request #3378 from suvari/master

hplip: ver. bump to 3.16.11

hardware/printer/hplip/files/Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch

@@ -0,0 +1,50 @@
+From b3a7fa4d4a573cfe0073ae50197f679af7e3a0ac Mon Sep 17 00:00:00 2001
+From: Till Kamppeter <till.kamppeter@canonical.com>
+Date: Sat, 24 Sep 2016 10:37:20 +0200
+Subject: Add 'include <cups/ppd.h>' in various places as CUPS 2.2 moved some
+ definitions to ppd.h
+
+---
+ configure.in               | 2 +-
+ prnt/hpcups/HPCupsFilter.h | 2 ++
+ prnt/hpijs/hpcupsfax.cpp   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index d3a1ddb..eabe14a 100755
+--- a/configure.in
++++ b/configure.in
+@@ -554,7 +554,7 @@ fi
+ 
+ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then
+    AC_CHECK_LIB([cups], [cupsDoFileRequest], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libcups support], 9)])
+-   AC_CHECK_HEADERS(cups/cups.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
++   AC_CHECK_HEADERS(cups/cups.h cups/ppd.h, ,[AC_MSG_ERROR([cannot find cups-devel support], 3)])
+    if test "$libusb01_build" = "yes"; then
+       AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)])
+       AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)])
+diff --git a/prnt/hpcups/HPCupsFilter.h b/prnt/hpcups/HPCupsFilter.h
+index ff5548e..c517989 100644
+--- a/prnt/hpcups/HPCupsFilter.h
++++ b/prnt/hpcups/HPCupsFilter.h
+@@ -38,6 +38,8 @@
+ 
+ #include "dbuscomm.h"
+ 
++#include <cups/ppd.h>
++
+ #define		DBITMAPFILEHEADER		14
+ #define		DBITMAPINFOHEADER		40
+ 
+diff --git a/prnt/hpijs/hpcupsfax.cpp b/prnt/hpijs/hpcupsfax.cpp
+index 8514775..994e50f 100644
+--- a/prnt/hpijs/hpcupsfax.cpp
++++ b/prnt/hpijs/hpcupsfax.cpp
+@@ -43,6 +43,7 @@
+ #include <arpa/inet.h>
+ #include <math.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <cups/raster.h>
+ #include <string>
+ #ifdef FALSE

hardware/printer/hplip/files/fix_tabs.patch

@@ -0,0 +1,17 @@
+--- prnt/filters/hpps	2016-08-26 12:04:29.000000000 +0200
++++ prnt/filters/hpps.new	2016-08-31 21:19:57.868640372 +0200
+@@ -191,11 +191,11 @@
+             msg("Setting Pin to default")
+     else:
+         szKeyInitials = ['HPFIDigit', 'HPSEDigit', 'HPTHDigit', 'HPFTDigit']                                 
+-	for x in szKeyInitials:
++    for x in szKeyInitials:
+            try:
+-	        secpin += opts[x]
++            secpin += opts[x]
+            except KeyError:
+-	        secpin += '0'
++            secpin += '0'
+ 
+     os.write(output_fd, to_bytes_utf8('@PJL SET HOLDKEY="%s"\x0a' % secpin))
+ 

hardware/printer/hplip/pspec.xml

@@ -12,7 +12,7 @@
         <License>MIT</License>
         <Summary>HP Linux Imaging and Printing System</Summary>
         <Description>HP Linux Imaging and Printing (HPLIP) System includes printer and scanner drivers and related service tools.</Description>
-        <Archive sha1sum="59264a6668ab37871fd007fcee70d4932f11f9d7" type="targz">mirrors://sourceforge/hplip/hplip/3.16.5/hplip-3.16.5.tar.gz</Archive>
+        <Archive sha1sum="177252a6c3e508b6d4f9d02663fe3556f37de71e" type="targz">mirrors://sourceforge/hplip/hplip-3.16.11.tar.gz</Archive>
         <AdditionalFiles>
             <!-- PPD patcher -->
             <AdditionalFile permission="0755" target="patch-ppds">patch-ppds.sh</AdditionalFile>
@@ -64,13 +64,14 @@
             <Patch level="1">pisilinux/desktop-i18n.patch</Patch>
             <Patch level="0">pisilinux/desktop-i18n-1.patch</Patch>
             <Patch level="1">pisilinux/add-pisilinux-support.patch</Patch>
-            <Patch level="1">pisilinux/fix-polkit-directory.patch</Patch>    
+            <Patch level="1">pisilinux/fix-polkit-directory.patch</Patch>
 
             <!-- Suppress module warnings when the command is run as root -->
             <Patch level="1">pisilinux/suppress-module-warnings.patch</Patch>
 
             <!-- Consume session parameter from systray as it avoids startup -->
-            <Patch level="1">pisilinux/hp-systray-consume-session-param.patch</Patch>    
+            <Patch level="1">pisilinux/hp-systray-consume-session-param.patch</Patch>
+            <Patch level="1">Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch</Patch>
         </Patches>
     </Source>
 
@@ -162,6 +163,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2017-04-09</Date>
+            <Version>3.16.11</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2016-06-09</Date>
             <Version>3.16.5</Version>
@@ -184,4 +192,4 @@
             <Email>alihan@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
+</PISI>