Attachment 204567 Details for Bug 238072 – hplip-fix-runtime-with-pillow-6.0.0.patch

[patch] hplip-fix-runtime-with-pillow-6.0.0.patch

hplip-fix-runtime-with-pillow-6.0.0.patch (text/plain), 1.48 KB, created by Kai Knoblich on 2019-05-23 13:01:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Knoblich

Created: 2019-05-23 13:01:34 UTC

Size: 1.48 KB

patch

obsolete

>Index: print/hplip/Makefile
>===================================================================
>--- print/hplip/Makefile	(revision 502256)
>+++ print/hplip/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	hplip
> PORTVERSION=	3.17.11
>-PORTREVISION=	4
>+PORTREVISION=	5
> CATEGORIES=	print
> MASTER_SITES=	SF
> 
>Index: print/hplip/files/patch-installer_dcheck.py
>===================================================================
>--- print/hplip/files/patch-installer_dcheck.py	(revision 502256)
>+++ print/hplip/files/patch-installer_dcheck.py	(working copy)
>@@ -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,10 +13,22 @@
>  
>      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:
> +        if sys.platform.startswith('freebsd'):
> +            return '-'
>  #        LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True)

Flags:

woodsb02: maintainer-approval+

Actions: View | Diff

Attachments on bug 238072: 204567