From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B67DD158094 for ; Sat, 3 Sep 2022 04:25:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1D5AE0729; Sat, 3 Sep 2022 04:25:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9FBFE0729 for ; Sat, 3 Sep 2022 04:25:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B10493410B2 for ; Sat, 3 Sep 2022 04:25:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09A3C75 for ; Sat, 3 Sep 2022 04:25:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1662179125.477f855ab8b07386d15b74308a13ac4eae0d0d6d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/, media-gfx/inkscape/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch media-gfx/inkscape/inkscape-1.2.1-r1.ebuild media-gfx/inkscape/inkscape-1.2.1-r2.ebuild media-gfx/inkscape/inkscape-1.2.1.ebuild X-VCS-Directories: media-gfx/inkscape/ media-gfx/inkscape/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 477f855ab8b07386d15b74308a13ac4eae0d0d6d X-VCS-Branch: master Date: Sat, 3 Sep 2022 04:25:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c419371b-74fa-4c4f-939d-29b8bc7603ac X-Archives-Hash: 889c7a4bc048970dea180ef08f831294 commit: 477f855ab8b07386d15b74308a13ac4eae0d0d6d Author: Sam James gentoo org> AuthorDate: Sat Sep 3 04:25:20 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 3 04:25:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477f855a media-gfx/inkscape: update Poppler 22.09.0 patch Switch to revision sent upstream. Signed-off-by: Sam James gentoo.org> media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch | 2 +- .../inkscape/{inkscape-1.2.1.ebuild => inkscape-1.2.1-r1.ebuild} | 4 ---- .../inkscape/{inkscape-1.2.1.ebuild => inkscape-1.2.1-r2.ebuild} | 0 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch index 87583019d6e3..80d071d51b0b 100644 --- a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch +++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch @@ -43,7 +43,7 @@ Signed-off-by: Sam James } } +#if POPPLER_CHECK_VERSION(22, 9, 0) -+ state->setLineDash(std::vector (*dash, length), args[1].getNum()); ++ state->setLineDash(std::vector (dash, dash + length), args[1].getNum()); +#else state->setLineDash(dash, length, args[1].getNum()); +#endif diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild similarity index 98% copy from media-gfx/inkscape/inkscape-1.2.1.ebuild copy to media-gfx/inkscape/inkscape-1.2.1-r1.ebuild index a0df591ee0d9..e2183428d93b 100644 --- a/media-gfx/inkscape/inkscape-1.2.1.ebuild +++ b/media-gfx/inkscape/inkscape-1.2.1-r1.ebuild @@ -108,10 +108,6 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" -PATCHES=( - "${FILESDIR}"/${PN}-1.2.1-poppler-22.09.0.patch -) - pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild similarity index 100% rename from media-gfx/inkscape/inkscape-1.2.1.ebuild rename to media-gfx/inkscape/inkscape-1.2.1-r2.ebuild