[arch-commits] Commit in hplip/trunk (3 files)
Andreas Radke
andyrtr at archlinux.org
Thu May 13 07:34:07 UTC 2021
Date: Thursday, May 13, 2021 @ 07:34:07
Author: andyrtr
Revision: 415123
upgpkg: hplip 1:3.21.4-1: upstream update 3.21.4
Modified:
hplip/trunk/PKGBUILD
Deleted:
hplip/trunk/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
hplip/trunk/hplip-thread-isalive-removed.patch
-----------------------------------------------------------------+
0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch | 123 ----------
PKGBUILD | 16 -
hplip-thread-isalive-removed.patch | 93 -------
3 files changed, 3 insertions(+), 229 deletions(-)
Deleted: 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
===================================================================
--- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch 2021-05-13 06:43:10 UTC (rev 415122)
+++ 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch 2021-05-13 07:34:07 UTC (rev 415123)
@@ -1,123 +0,0 @@
-From fa9c0cf1a5db9bf8880b4796d5e3e0da46534e3d Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx at 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 \
---- hplip-3.21.2/prnt/hpcups/HPCupsFilter.cpp 2021-02-15 00:55:21.000000000 +0100
-+++ hplip-3.21.2/prnt/hpcups/HPCupsFilter.cpp.new 2021-02-22 08:34:47.515932980 +0100
-@@ -31,7 +31,6 @@
- \*****************************************************************************/
-
- #include "HPCupsFilter.h"
--#include "ImageProcessor.h"
-
- #include <signal.h>
- #include <sys/wait.h>
-@@ -651,21 +650,9 @@
-
- sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name);
-
-- image_processor_t* imageProcessor=NULL;
-- IMAGE_PROCESSOR_ERROR result;
-- //added if condition to check if pinter language is "ljzjstream"
-- //If so, then bypass imageprocessing functions while running HPCUPS filter.
-- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){
-- imageProcessor = imageProcessorCreate();
-- }
- while (cupsRasterReadHeader2(cups_raster, &cups_header))
- {
-- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){
-- 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) {
-@@ -764,14 +751,6 @@
- color_raster = rgbRaster;
- black_raster = kRaster;
-
-- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
-- {
-- 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
-@@ -801,14 +780,6 @@
- }
- } // for() loop end
-
-- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
-- {
-- result = imageProcessorEndPage(imageProcessor);
-- if (result != IPE_SUCCESS){
-- dbglog("DEBUG: imageProcessorEndPage failed result = %d\n", result);
-- }
-- }
--
- m_Job.NewPage();
- if (err != NO_ERROR) {
- break;
-@@ -824,10 +795,6 @@
- }
-
-
-- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0)
-- {
-- imageProcessorDestroy(imageProcessor);
-- }
- unlink(hpPreProcessedRasterFile);
- return ret_status;
- }
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-13 06:43:10 UTC (rev 415122)
+++ PKGBUILD 2021-05-13 07:34:07 UTC (rev 415123)
@@ -4,7 +4,7 @@
# Contributor: Morgan LEFIEUX <comete at archlinuxfr.org>
pkgname=hplip
-pkgver=3.21.2
+pkgver=3.21.4
pkgrel=1
epoch=1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
@@ -28,22 +28,17 @@
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
- 0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
- #https://launchpadlibrarian.net/480406888/hplip-configure-python.patch # no more available
# use the one from Fedora
hplip-configure-python.patch
python3.diff
- hplip-thread-isalive-removed.patch
reproducible-gzip.patch)
-sha512sums=('73ba37275cfe34a58b81c9656514e15da67c1a69af5471ad132a1538d324efe640879cb7e60c359915607e41b63e653e7ae757661e553235f6e83e378ab46474'
+sha512sums=('3f22433b3d35013025b63163ccd879da203adcec821f9f90748ee8399b370a129ecdffb5889efa57da1dc5c3f45c42f7593d2198d9166240156baf839b55fce6'
'SKIP'
'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
'22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
'763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
- '25b701fdac63a8a85989616b66b8760fbf8e0ae9418c8cd0d39cf932f65b9534da6ddd0374b205c78f77153733a871086a70ac7922d9a969dbfae6eabba74253'
'089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8'
'5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82'
- '6cf68bbc5c2b1a03ca8528e834e9867d33b982a9fa073d28c9faa514d5057d9b71de6fb494597d3b496ee56b68a179b2e11ba14cec4d01c4fc7dec72a4a2ff0b'
'7bad907228b7c2f3c43128f087a2f8e03778760b7a26179ff441c1f60127e2fca08c94dff76baea2469d3a253a8f46b285d0af0f62a6d8738926caf7a10f670b')
validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
@@ -52,19 +47,13 @@
# disable insecure update - https://bugs.archlinux.org/task/38083
patch -Np0 -i "${srcdir}"/disable_upgrade.patch
-
# add missing 'include <cups/ppd.h>' at various places
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
- # remove binary blob libImageProcessor and all linking - FS#59681
- patch -Np1 -i "${srcdir}"/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
# Workaround patch for missing Python3 transition of the old
# (pre-USB-storage) photo memory card support (pcardext) - Debian patch
patch -Np1 -i "${srcdir}"/python3.diff
- # python 3.9 emoved a deprecated method of threading
- # https://bugs.archlinux.org/task/68910 / hplip-thread-isalive-removed.patch
- patch -Np1 -i "${srcdir}"/hplip-thread-isalive-removed.patch
# https://bugs.launchpad.net/hplip/+bug/1879445
# broken scanning - https://bugs.archlinux.org/task/66704
@@ -84,6 +73,7 @@
--disable-qt4 \
--enable-hpcups-install \
--enable-cups-drv-install \
+ --disable-imageProcessor-build \
--enable-pp-build #--help
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
Deleted: hplip-thread-isalive-removed.patch
===================================================================
--- hplip-thread-isalive-removed.patch 2021-05-13 06:43:10 UTC (rev 415122)
+++ hplip-thread-isalive-removed.patch 2021-05-13 07:34:07 UTC (rev 415123)
@@ -1,93 +0,0 @@
-diff --git a/copier/copier.py b/copier/copier.py
-index a595baa..7794f48 100644
---- a/copier/copier.py
-+++ b/copier/copier.py
-@@ -73,13 +73,13 @@ class PMLCopyDevice(device.Device):
-
- def isCopyActive(self):
- if self.copy_thread is not None:
-- return self.copy_thread.isAlive()
-+ return self.copy_thread.is_alive()
- else:
- return False
-
- def waitForCopyThread(self):
- if self.copy_thread is not None and \
-- self.copy_thread.isAlive():
-+ self.copy_thread.is_alive():
-
- self.copy_thread.join()
-
-diff --git a/fax/fax.py b/fax/fax.py
-index 3d69226..0878a64 100644
---- a/fax/fax.py
-+++ b/fax/fax.py
-@@ -478,13 +478,13 @@ class FaxDevice(device.Device):
-
- def isSendFaxActive(self):
- if self.send_fax_thread is not None:
-- return self.send_fax_thread.isAlive()
-+ return self.send_fax_thread.is_alive()
- else:
- return False
-
- def waitForSendFaxThread(self):
- if self.send_fax_thread is not None and \
-- self.send_fax_thread.isAlive():
-+ self.send_fax_thread.is_alive():
-
- try:
- self.send_fax_thread.join()
-diff --git a/fax/pmlfax.py b/fax/pmlfax.py
-index b68ff6a..b1020d0 100644
---- a/fax/pmlfax.py
-+++ b/fax/pmlfax.py
-@@ -179,13 +179,13 @@ class PMLFaxDevice(FaxDevice):
-
- def isUploadLogActive(self):
- if self.upload_log_thread is not None:
-- return self.upload_log_thread.isAlive()
-+ return self.upload_log_thread.is_alive()
- else:
- return False
-
- def waitForUploadLogThread(self):
- if self.upload_log_thread is not None and \
-- self.upload_log_thread.isAlive():
-+ self.upload_log_thread.is_alive():
-
- self.upload_log_thread.join()
-
-diff --git a/scan/sane.py b/scan/sane.py
-index b6c4acd..e8f8db8 100755
---- a/scan/sane.py
-+++ b/scan/sane.py
-@@ -378,14 +378,14 @@ class ScanDevice:
-
- def isScanActive(self):
- if self.scan_thread is not None:
-- return self.scan_thread.isAlive() and self.scan_thread.scan_active
-+ return self.scan_thread.is_alive() and self.scan_thread.scan_active
- else:
- return False
-
-
- def waitForScanDone(self):
- if self.scan_thread is not None and \
-- self.scan_thread.isAlive() and \
-+ self.scan_thread.is_alive() and \
- self.scan_thread.scan_active:
-
- try:
-@@ -398,9 +398,9 @@ class ScanDevice:
- #time.sleep(0.5)
- if self.scan_thread is not None:
- while True:
-- #print self.scan_thread.isAlive()
-+ #print self.scan_thread.is_alive()
- #print self.scan_thread.scan_active
-- if self.scan_thread.isAlive() and \
-+ if self.scan_thread.is_alive() and \
- self.scan_thread.scan_active:
- return
-
More information about the arch-commits
mailing list