From owner-svn-ports-head@freebsd.org Tue Oct 15 07:25:12 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF943156050; Tue, 15 Oct 2019 07:25:12 +0000 (UTC) (envelope-from makc@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 46sn545bwHz3Jr9; Tue, 15 Oct 2019 07:25:12 +0000 (UTC) (envelope-from makc@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 A3C021B2C0; Tue, 15 Oct 2019 07:25:12 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9F7PC02056785; Tue, 15 Oct 2019 07:25:12 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9F7PCrO056784; Tue, 15 Oct 2019 07:25:12 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201910150725.x9F7PCrO056784@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Tue, 15 Oct 2019 07:25:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514492 - head/graphics/inkscape X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: head/graphics/inkscape X-SVN-Commit-Revision: 514492 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Tue, 15 Oct 2019 07:25:12 -0000 Author: makc Date: Tue Oct 15 07:25:12 2019 New Revision: 514492 URL: https://svnweb.freebsd.org/changeset/ports/514492 Log: graphics/inkscape: - Repair Python based extensions: patch Inkscape to look for suffixed python binary and add missing runtime dependencies. This also fixes export to optimized SVG [1]. PR: 234797 [1] Reported by: georg-bsd Approved by: gnome (maintainer timeout, 2 weeks) Modified: head/graphics/inkscape/Makefile Modified: head/graphics/inkscape/Makefile ============================================================================== --- head/graphics/inkscape/Makefile Tue Oct 15 07:08:24 2019 (r514491) +++ head/graphics/inkscape/Makefile Tue Oct 15 07:25:12 2019 (r514492) @@ -3,7 +3,7 @@ PORTNAME= inkscape PORTVERSION= 0.92.4 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics gnome MASTER_SITES= https://media.inkscape.org/dl/resources/file/ @@ -29,9 +29,12 @@ LIB_DEPENDS= libpopt.so:devel/popt \ libpotrace.so:graphics/libpotrace \ libpng.so:graphics/png \ libMagick++-6.so:graphics/ImageMagick6 +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scour>0:textproc/py-scour@${PY_FLAVOR} USES= compiler:c++11-lib cmake cpe desktop-file-utils gnome \ - iconv:wchar_t jpeg pathfix pkgconfig python:2.7,build \ + iconv:wchar_t jpeg pathfix pkgconfig python:2.7 \ shebangfix tar:bzip2 USE_GNOME= gtkmm24 libxml2 libxslt USE_XORG= x11 @@ -82,6 +85,9 @@ USES+= gettext post-patch: @${REINPLACE_CMD} -e 's|COMMAND python|COMMAND ${PYTHON_VERSION}|g' \ ${WRKSRC}/share/*/CMakeLists.txt + # Third entry in the table of interpreters is basename of executable + @${REINPLACE_CMD} -e 's|python|${PYTHON_VERSION}|3' \ + ${WRKSRC}/src/extension/implementation/script.cpp # Obtained from Arch Linux @${REINPLACE_CMD} -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \ ${WRKSRC}/src/extension/internal/pdfinput/pdf-parser.*