From nobody Sun May 21 17:27:37 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QPSFj56ZKz4CFX9; Sun, 21 May 2023 17:27:37 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QPSFj3nPHz3mqX; Sun, 21 May 2023 17:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684690057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MqWNK/IB6MUbztQBRcdxCK7aR/fzKVD445pUacuGzAQ=; b=Og/WR0a4Svp3eWOe3QG4LWuoqoYYESNEc3GMXiYuokfNH/Cg6yjRXDAvc+U616A5htsk+h T5IYT9XSWs6v+ML37fK3+yBJopglcrhc3rBF/m9dEt2IDUJ3hTEWFdGVFr28YoOC/FXvat QQkM21AetT9G1BPpKYKwIa8/oDoRJOMrYYGHMeto4Z/HxHxw4j+k9k2P//GNUIsZexomSR 1c9oyEz3Bmb6UE3h55eWu0kBNlgwwhkQru/KWI0OhPOn1QYm6anCxj810eid87027YUKho WwnmuyYqXxZEqWVTxd87q4/PY3NuKjlwSb0yaWR1GhKIgcrb/rxP578lSOTKDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684690057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MqWNK/IB6MUbztQBRcdxCK7aR/fzKVD445pUacuGzAQ=; b=srRHuBcJtimy+T7iNic76I3Qnm9+Wc3D0R180PD4CM2MtzRDJFp4fe2eDt4rnb5wQCiMAI 9kiVSCPDfOTADCXkBnqVTDNgIy/HAD5WkKZ1GvhbuSF2KCvGN7uqkl24Bw4OPukNmlECOa wbyWTDBZbytZbk/3xhM9rxHJsyiS2mTkaCDiQuHF0ttPJIBH8/ySWYKk3c5vn5X/DQYuk8 /mZwhHw+euSZUC5hO0I/rWvYnRBmrTE5T8nohLqbg6+gBhpmHhlh7ZF41aNo3xhg2rFzr9 9sXYZbO8RDnaxXKu+GjzK7TOUF3bqWbH74Ittf5I/G6C528VnBbLR912lshPzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684690057; a=rsa-sha256; cv=none; b=jhpk3LAslFJ875CTGFP7nU+6jKW2O/qxcp9VZolog+lKsl+/JIL98nIhvjwqcx6tB75X9p JSii9I2O40kRubis8DavZxhjeLeulmUROLpW7xEkYw0Wj3OqKYFYi+B91j/j8J7gS0CJM1 bjfNGAJu1vkk9LkaFX31mXuirtEkfKsEpb93hsuXGAAqQrzWCW4or1yu/aSbJxNrQ5aj4d v+XP7kGW3o2wfsOmwq9KhT53SlsrmqumMARKvXvCfI6h4dfhywXFF39HB1Gr4rXRLg/IVA JxbI+xkuTyiTa17u/hOjtrumKtc0yCNJAu/pnoKjcmbPQHMmuDSCXMh41YgJIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QPSFj1jbVz10bB; Sun, 21 May 2023 17:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34LHRbMN065832; Sun, 21 May 2023 17:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34LHRb0N065831; Sun, 21 May 2023 17:27:37 GMT (envelope-from git) Date: Sun, 21 May 2023 17:27:37 GMT Message-Id: <202305211727.34LHRb0N065831@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: dc299b36fdc2 - 2023Q2 - textproc/py-sphinxcontrib-svg2pdfconverter: depend on correct librsvg2 automatically List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: dc299b36fdc2faedaab1b411afa5e6cae7b68619 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc299b36fdc2faedaab1b411afa5e6cae7b68619 commit dc299b36fdc2faedaab1b411afa5e6cae7b68619 Author: Robert Clausecker AuthorDate: 2023-05-20 11:44:04 +0000 Commit: Robert Clausecker CommitDate: 2023-05-21 17:27:20 +0000 textproc/py-sphinxcontrib-svg2pdfconverter: depend on correct librsvg2 automatically Instead of providing a port option, have USES=gnome figure out the right librsvg2 to depend on. This avoids conflicts when installing mame with other ports that depend on librsvg2{,-rust}. Approved by: agh@riseup.net (maintainer) MFH: 2023Q2 PR: 271530 (cherry picked from commit bce94ecce5f905028f4f922b80bb32e5e1563dda) --- textproc/py-sphinxcontrib-svg2pdfconverter/Makefile | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/textproc/py-sphinxcontrib-svg2pdfconverter/Makefile b/textproc/py-sphinxcontrib-svg2pdfconverter/Makefile index 4e96ce2f215f..23beba86d18b 100644 --- a/textproc/py-sphinxcontrib-svg2pdfconverter/Makefile +++ b/textproc/py-sphinxcontrib-svg2pdfconverter/Makefile @@ -1,5 +1,6 @@ PORTNAME= sphinxcontrib-svg2pdfconverter PORTVERSION= 1.2.1 +PORTREVISION= 1 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,20 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} -USES= python:3.8+ +USES= gnome python:3.8+ +USE_GNOME= librsvg2 USE_PYTHON= autoplist concurrent distutils flavors NO_ARCH= yes -OPTIONS_DEFINE= RSVGIMPL -RSVGIMPL_DESC= Depend on the Rust implementation of rsvg-convert - -.include - -.if ${PORT_OPTIONS:MRSVGIMPL} -RUN_DEPENDS+= rsvg-convert:graphics/librsvg2-rust -.else -RUN_DEPENDS+= rsvg-convert:graphics/librsvg2 -.endif - .include