Date: Wednesday, December 9, 2020 @ 15:46:45
Author: andyrtr
Revision: 403207
upgpkg: hplip 1:3.20.11-2: apply python 3.9 fix for scan/copy/fax tools /
FS#68910
Added:
hplip/trunk/hplip-thread-isalive-removed.patch
Modified:
hplip/trunk/PKGBUILD
------------------------------------+
PKGBUILD | 10 ++-
hplip-thread-isalive-removed.patch | 93 +++++++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-09 15:30:39 UTC (rev 403206)
+++ PKGBUILD 2020-12-09 15:46:45 UTC (rev 403207)
@@ -5,7 +5,7 @@
pkgname=hplip
pkgver=3.20.11
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and
some LaserJet"
arch=('x86_64')
@@ -33,6 +33,7 @@
# use the one from Fedora
hplip-configure-python.patch
python3.diff
+ hplip-thread-isalive-removed.patch
reproducible-gzip.patch)
sha512sums=('f583fb4140a29c5e21956c3e51fe3620baa65d33b40447af419d7fc61473a1148a1873216a84e89be785b155ee8e9aebd5e3eb19d2ded82b8415b1a35de1b55d'
'SKIP'
@@ -42,6 +43,7 @@
'8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
'089c102357ea5fd55d81ae76aaff62713f780fd84500c3b92ecd6b2bb11ccdc3a162978548e9a5f9e98a8354a5be3997e416c52daa18eda4621ed79a29d6fea8'
'5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82'
+
'6cf68bbc5c2b1a03ca8528e834e9867d33b982a9fa073d28c9faa514d5057d9b71de6fb494597d3b496ee56b68a179b2e11ba14cec4d01c4fc7dec72a4a2ff0b'
'7bad907228b7c2f3c43128f087a2f8e03778760b7a26179ff441c1f60127e2fca08c94dff76baea2469d3a253a8f46b285d0af0f62a6d8738926caf7a10f670b')
validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux
Imaging and Printing) <hp...@hp.com>
@@ -60,6 +62,9 @@
# 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
@@ -74,7 +79,6 @@
build() {
cd "$pkgname"-$pkgver
-# export CFLAGS+=" $(python3-config --includes)" # Fix build with python 3.8
./configure --prefix=/usr \
--enable-qt5 \
--disable-qt4 \
@@ -81,7 +85,7 @@
--enable-hpcups-install \
--enable-cups-drv-install \
--enable-pp-build #--help
-sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
Added: hplip-thread-isalive-removed.patch
===================================================================
--- hplip-thread-isalive-removed.patch (rev 0)
+++ hplip-thread-isalive-removed.patch 2020-12-09 15:46:45 UTC (rev 403207)
@@ -0,0 +1,93 @@
+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
+
