diff options
Diffstat (limited to 'print')
| -rw-r--r-- | print/hplip/Makefile | 2 | ||||
| -rw-r--r-- | print/hplip/files/patch-installer_dcheck.py | 16 |
2 files changed, 15 insertions, 3 deletions
diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 2449a48e17de..24e669481279 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -3,7 +3,7 @@ PORTNAME= hplip PORTVERSION= 3.17.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= SF diff --git a/print/hplip/files/patch-installer_dcheck.py b/print/hplip/files/patch-installer_dcheck.py index 10a435c16bfd..abea82e34aa9 100644 --- a/print/hplip/files/patch-installer_dcheck.py +++ b/print/hplip/files/patch-installer_dcheck.py @@ -1,4 +1,4 @@ ---- installer/dcheck.py.orig 2016-08-26 10:05:26 UTC +--- installer/dcheck.py.orig 2019-05-23 09:47:03 UTC +++ installer/dcheck.py @@ -48,7 +48,11 @@ mod_output = '' def update_ld_output(): @@ -13,7 +13,19 @@ if status != 0: log.debug("ldconfig failed.") -@@ -378,6 +382,8 @@ def get_libpthread_version(): +@@ -370,7 +374,10 @@ def get_pil_version(): + except ImportError: + return '-' + else: +- return Image.VERSION ++ if hasattr(Image, "__version__"): # required for Pillow >= 6.0.0 ++ return Image.__version__ ++ else: ++ return Image.VERSION + + def get_libpthread_version(): + try: +@@ -378,6 +385,8 @@ def get_libpthread_version(): except ImportError: return '-' else: |