hplip-1:3.19.3-1.par1: updating version

4 files changed, 131 insertions, 55 deletions

diff --git a/libre/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch b/libre/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
new file mode 100644
index 000000000..8d3b4d7bf
--- /dev/null
+++ b/libre/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
@@ -0,0 +1,113 @@
+From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001
+From: Didier Raboud <odyx@debian.org>
+Date: Tue, 21 Aug 2018 18:18:10 +0200
+Subject: Remove all ImageProcessor functionality, which is closed-source
+
+---
+ Makefile.am                  | 14 ++------------
+ prnt/hpcups/HPCupsFilter.cpp | 21 ---------------------
+ 2 files changed, 2 insertions(+), 33 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1b097c4f9..8d5d78c9f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -166,7 +166,7 @@ if !HPLIP_CLASS_DRIVER
+ dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
+ endif #HPLIP_CLASS_DRIVER
+ 
+-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
++dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
+ dist_noinst_SCRIPTS += dat2drv.py install.py  hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
+ 
+ if !HPLIP_CLASS_DRIVER
+@@ -594,7 +594,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
+ 	prnt/hpcups/ImageProcessor.h
+ 
+ hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
+-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
++hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
+ #else
+ #hpcupsdir = $(cupsfilterdir)
+ #hpcups_PROGRAMS = hpcups
+@@ -686,16 +686,6 @@ endif #HPLIP_CLASS_DRIVER
+ 
+ install-data-hook:
+ if HPLIP_BUILD
+-	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
+-	fi; \
+-	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
+-		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
+-		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
+-		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
+-	fi
+ if !HPLIP_CLASS_DRIVER
+ #	   If scanner build, add hpaio entry to sane dll.conf.
+ 	if [ "$(scan_build)" = "yes" ]; then \
+diff --git a/prnt/hpcups/HPCupsFilter.cpp b/prnt/hpcups/HPCupsFilter.cpp
+index 5b282d83f..0bacfafac 100644
+--- a/prnt/hpcups/HPCupsFilter.cpp
++++ b/prnt/hpcups/HPCupsFilter.cpp
+@@ -31,7 +31,6 @@
+ \*****************************************************************************/
+ 
+ #include "HPCupsFilter.h"
+-#include "ImageProcessor.h"
+ 
+ #include <signal.h>
+ #include <sys/wait.h>
+@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+ 
+ 
+     sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
+-    image_processor_t* imageProcessor = imageProcessorCreate();
+ 
+     while (cupsRasterReadHeader2(cups_raster, &cups_header))
+     {
+ 
+-        IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header);
+-        if (result != IPE_SUCCESS){
+-            dbglog("DEBUG: imageProcessorStartPage failed result = %d\n", result);
+-        }
+-
+         current_page_number++;
+ 
+         if (current_page_number == 1) {
+@@ -745,12 +738,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+             color_raster = rgbRaster;
+             black_raster = kRaster;
+ 
+-            result = imageProcessorProcessLine(imageProcessor, m_pPrinterBuffer, cups_header.cupsBytesPerLine);
+-            if (result != IPE_SUCCESS){
+-                dbglog("DEBUG: imageProcessorProcessLine failed result = %d\n", result);
+-            }
+-
+-
+             if ((y == 0) && !is_ljmono) {
+                 //For ljmono, make sure that first line is not a blankRaster line.Otherwise printer
+                 //may not skip blank lines before actual data
+@@ -780,12 +767,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+             }
+         }  // for() loop end
+ 
+-        result = imageProcessorEndPage(imageProcessor);
+-        if (result != IPE_SUCCESS){
+-                dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
+-        }
+-
+-
+         m_Job.NewPage();
+         if (err != NO_ERROR) {
+             break;
+@@ -800,8 +781,6 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster)
+         rgbRaster = NULL;
+     }
+ 
+-    imageProcessorDestroy(imageProcessor);
+-
+     unlink(hpPreProcessedRasterFile);
+     return ret_status;
+ }
diff --git a/libre/hplip/PKGBUILD b/libre/hplip/PKGBUILD
index 71d22e19b..9990e8885 100644
--- a/libre/hplip/PKGBUILD
+++ b/libre/hplip/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 284832 2016-12-27 06:46:54Z bpiotrowski $
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Contributor (Arch): Rémy Oudompheng <remy@archlinux.org>
@@ -9,15 +8,18 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=hplip
-pkgver=3.18.6
-pkgrel=1.parabola3
+pkgver=3.19.3
+pkgrel=1
+pkgrel+=.par1
 epoch=1
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)"
-arch=('i686' 'x86_64' 'armv7h')
-url="http://hplipopensource.com"
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+pkgdesc+=", without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)"
+arch=('x86_64')
+arch+=('i686' 'armv7h')
+url="https://hplipopensource.com"
 license=('GPL' 'custom')
-depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine')
-makedepends=('python-pyqt5' 'python-gobject' 'sane' 'rpcbind' 'cups' 'libusb')
+depends=('python-dbus' 'ghostscript' 'net-snmp' 'foomatic-db-engine' 'python-gobject')
+makedepends=('python-pyqt5' 'sane' 'rpcbind' 'cups' 'libusb')
 optdepends=('cups: for printing support'
             'sane: for scanner support'
             'xsane: sane scanner frontend'
@@ -25,7 +27,6 @@ optdepends=('cups: for printing support'
             'python-reportlab: for pdf output in hp-scan'
             'rpcbind: for network support'
             'python-pyqt5: for running GUI and hp-toolbox'
-            'python-gobject: for running hp-toolbox'
             'libusb: for advanced usb support'
             'wget: for network support')
 replaces=(${pkgname}-libre)
@@ -35,15 +36,13 @@ source=(https://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.a
         disable_upgrade.patch
         0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
         0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
-        fix_install.patch
-        python.patch)
-sha256sums=('0ecf3e68b09480f602de81798ac00774cf8ffe754692e784bbbe0f9b2e337b7d'
+        0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch)
+sha512sums=('6191974d6c9a35e58a9b0d2ff1077b3a9479e44ccb76a551f3e29ca56d420bfe0778fa6b7a4e51b18f2e55cae9ad1f5216f716e22b651122ec0fe9e730fcd29a'
             'SKIP'
-            'eca366677583122f2e1048103f0d4a2b002a18c1e6d17b0bc71f4067a221fd38'
-            'a5ee6546d33db8f41ecea2b377355ce261b3e98d7f9988ee1652f0daebb6d0da'
-            '85cd7fa2314f217cf8072a2635bff82831564f842dba245e0619e0630a8fc0f5'
-            '6edaedfd3f0925b099632a7052e054f18549be25381689680e8374c869687dc6'
-            '7116e9bb1bd9a01b6638dd705671f6e12076b143757edff3273c1cf89a1bbdd1')
+            'f0cf2774e53070406e89614b748e3c45079be889b83d5854340b92093643f6f8b332d6b6e617884d2bdcbef667a84ee5741b07c5fb080bb04925bb454af448d1'
+            '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
+            '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
+            '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP <hplip@hp.com>
 
 prepare() {
@@ -81,10 +80,8 @@ prepare() {
  patch -Np1 -i ${srcdir}/0022-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch
  # fix some handling unicode file names FS#58412
  patch -Np1 -i ${srcdir}/0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
- # fix installation of missing library - FS#59548
-# patch -Np1 -i ${srcdir}/fix_install.patch
- # fix python issue - FS#59548
-# patch -Np1 -i ${srcdir}/python.patch
+ # remove binary blob libImageProcessor and all linking - FS#59681
+ patch -Np1 -i ${srcdir}/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
 
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
diff --git a/libre/hplip/fix_install.patch b/libre/hplip/fix_install.patch
deleted file mode 100644
index adbec2c57..000000000
--- a/libre/hplip/fix_install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- hplip-3.18.7/Makefile.am	2018-07-15 22:08:37.000000000 +0200
-+++ hplip-3.18.7/Makefile.am.new	2018-08-08 19:54:20.671794852 +0200
-@@ -680,14 +680,14 @@
- install-data-hook:
- if HPLIP_BUILD
- 	if [ \( "$(UNAME)" = "x86_64" -a  -d "$(libdir)/" \) ]; then \
--		cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
--		chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
--		ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
-+		cp prnt/hpcups/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/ ; \
-+		chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_64.so ; \
-+		ln -sf $(libdir)/libImageProcessor-x86_64.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \
- 	fi; \
- 	if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
--		cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
--		chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
--		ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
-+		cp prnt/hpcups/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/ ; \
-+		chmod 775 $(DESTDIR)$(libdir)/libImageProcessor-x86_32.so ; \
-+		ln -sf $(libdir)/libImageProcessor-x86_32.so $(DESTDIR)$(libdir)/libImageProcessor.so ; \
- 	fi
- if !HPLIP_CLASS_DRIVER
- #	   If scanner build, add hpaio entry to sane dll.conf.
diff --git a/libre/hplip/python.patch b/libre/hplip/python.patch
deleted file mode 100644
index b75d1f598..000000000
--- a/libre/hplip/python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hplip-3.18.7/base/utils.py	2018-07-15 22:08:37.000000000 +0200
-+++ hplip-3.18.7/base/utils.py.new	2018-08-08 21:46:48.721947940 +0200
-@@ -265,7 +265,7 @@
-     try:
-         names = os.listdir(root)
-     except os.error:
--        raise StopIteration
-+        return
- 
-     pattern = pattern or '*'
-     pat_list = pattern.split(';')