[arch-commits] Commit in hplip/trunk (PKGBUILD hplip-pillow-version.patch)

[Andreas Radke]

    Date: Sunday, October 20, 2019 @ 13:52:03
  Author: andyrtr
Revision: 365238

upgpkg: hplip 1:3.19.8-2

fix python-pillow versioning issue - FS#64187

Added:
  hplip/trunk/hplip-pillow-version.patch
Modified:
  hplip/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   11 ++++++++---
 hplip-pillow-version.patch |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-20 13:30:29 UTC (rev 365237)
+++ PKGBUILD	2019-10-20 13:52:03 UTC (rev 365238)
@@ -5,7 +5,7 @@
 
 pkgname=hplip
 pkgver=3.19.8
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('x86_64')
@@ -28,13 +28,15 @@
         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)
+        0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
+        hplip-pillow-version.patch)
 sha512sums=('99b7661c9b1d70f3c762658fcbff1ab0c170be8f8fd6cc8bbc80bb0860ccc6d69d38b662ff8be2bd38986a95385a5e5766f22003ee3e74b764dab3d46c6cb9ac'
             'SKIP'
             'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
             '22aeb5b851f78bc6bc62e0bc3da99fecaf42d7604af41e2f3343f8d3666541f7b06b7d1a7d0ddf24f1731ac7b12dfe582375a98e3b94dfa323d6ce954549ca67'
             '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
-            '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b')
+            '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
+            'db2a830d3b737c434892abd31c0f47f6a1a74011dbfa808d2027aa55f83bae21c6920b79b45c350678f8a8911d8b8644e922869890582e909234d9718ee7325b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
 prepare() {
@@ -50,6 +52,9 @@
  # remove binary blob libImageProcessor and all linking - FS#59681
  patch -Np1 -i "${srcdir}"/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
 
+ # fix python-pillow versioning issue - FS#64187
+ patch -Np1 -i "${srcdir}"/hplip-pillow-version.patch
+
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 }

Added: hplip-pillow-version.patch
===================================================================
--- hplip-pillow-version.patch	                        (rev 0)
+++ hplip-pillow-version.patch	2019-10-20 13:52:03 UTC (rev 365238)
@@ -0,0 +1,14 @@
+diff --git a/dcheck.py b/dcheck.py
+index 38bb76c..3d0624e 100644
+--- a/installer/dcheck.py
++++ b/installer/dcheck.py
+@@ -370,7 +370,7 @@ def get_pil_version():
+     except ImportError:
+         return '-'
+     else:
+-         return Image.VERSION
++         return Image.PILLOW_VERSION
+ 
+ def get_libpthread_version():
+     try:
+