From owner-svn-ports-head@freebsd.org Sun Jun 2 21:00:07 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7CB515BF9A9; Sun, 2 Jun 2019 21:00:07 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4A7F580466; Sun, 2 Jun 2019 21:00:07 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 331B32C3EB; Sun, 2 Jun 2019 21:00:07 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x52L07OP086766; Sun, 2 Jun 2019 21:00:07 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x52L06Xg086764; Sun, 2 Jun 2019 21:00:06 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201906022100.x52L06Xg086764@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Sun, 2 Jun 2019 21:00:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503333 - in head/print/hplip: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head/print/hplip: . files X-SVN-Commit-Revision: 503333 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4A7F580466 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Jun 2019 21:00:07 -0000 Author: kai Date: Sun Jun 2 21:00:06 2019 New Revision: 503333 URL: https://svnweb.freebsd.org/changeset/ports/503333 Log: print/hplip: Fix runtime with graphics/py-pillow 6.0.0 Fix a possible runtime error in installers/dcheck.py when graphics/py-pillow is updated to 6.0.0, which removed the previously deprecated constant Image.VERSION . PR: 238072, 237426 (related) Approved by: woodsb02 (maintainer) Modified: head/print/hplip/Makefile head/print/hplip/files/patch-installer_dcheck.py Modified: head/print/hplip/Makefile ============================================================================== --- head/print/hplip/Makefile Sun Jun 2 19:50:16 2019 (r503332) +++ head/print/hplip/Makefile Sun Jun 2 21:00:06 2019 (r503333) @@ -3,7 +3,7 @@ PORTNAME= hplip PORTVERSION= 3.17.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= SF Modified: head/print/hplip/files/patch-installer_dcheck.py ============================================================================== --- head/print/hplip/files/patch-installer_dcheck.py Sun Jun 2 19:50:16 2019 (r503332) +++ head/print/hplip/files/patch-installer_dcheck.py Sun Jun 2 21:00:06 2019 (r503333) @@ -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: