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 D5D1315808B for ; Fri, 18 Mar 2022 21:30:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15798E07F9; Fri, 18 Mar 2022 21:30:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 D278DE07F9 for ; Fri, 18 Mar 2022 21:30:36 +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 F36EC343880 for ; Fri, 18 Mar 2022 21:30:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 33272327 for ; Fri, 18 Mar 2022 21:30:34 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1647639017.23b746af7800902dacd9550026813ab694fff110.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/inkscape/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/inkscape/inkscape-1.1-r1.ebuild media-gfx/inkscape/inkscape-1.1.1.ebuild media-gfx/inkscape/inkscape-1.1.2.ebuild media-gfx/inkscape/inkscape-9999.ebuild X-VCS-Directories: media-gfx/inkscape/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 23b746af7800902dacd9550026813ab694fff110 X-VCS-Branch: master Date: Fri, 18 Mar 2022 21:30:34 +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: b0ecc796-f3d8-4b06-accc-68ff2ab78f0c X-Archives-Hash: a2bf934fe441204079af13d0bb03bf23 commit: 23b746af7800902dacd9550026813ab694fff110 Author: Petr Vaněk atlas cz> AuthorDate: Sun Mar 13 18:16:57 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Mar 18 21:30:17 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b746af media-gfx/inkscape: use internal 2geom explicitly When inkscape is first time emerged to the system its 2geom library detection mechanism selects bundled version and installs it as part of the package. This detection mechanism can lead to a runtime problem when inkscape is reemerged, because the 2geom library is located in the system (from previous installation), therefore bundled version is not selected nor appended to the package and emerge removes 2geom library from the system because there is no replacement in a new package. Then, inkscape fails to start because of missing library. It is necessary to force use of the bundled 2geom library in order to address the problem. Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/24555 Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/inkscape/inkscape-1.1-r1.ebuild | 1 + media-gfx/inkscape/inkscape-1.1.1.ebuild | 1 + media-gfx/inkscape/inkscape-1.1.2.ebuild | 1 + media-gfx/inkscape/inkscape-9999.ebuild | 1 + 4 files changed, 4 insertions(+) diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild index acc281e6d6ee..517577f93f25 100644 --- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild +++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild @@ -125,6 +125,7 @@ src_configure() { -DENABLE_POPPLER=ON -DENABLE_POPPLER_CAIRO=ON -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON -DBUILD_TESTING=OFF -DWITH_LIBCDR=$(usex cdr) -DWITH_DBUS=$(usex dbus) diff --git a/media-gfx/inkscape/inkscape-1.1.1.ebuild b/media-gfx/inkscape/inkscape-1.1.1.ebuild index 080afaf78213..e76f7867922d 100644 --- a/media-gfx/inkscape/inkscape-1.1.1.ebuild +++ b/media-gfx/inkscape/inkscape-1.1.1.ebuild @@ -120,6 +120,7 @@ src_configure() { -DENABLE_POPPLER=ON -DENABLE_POPPLER_CAIRO=ON -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON -DBUILD_TESTING=OFF -DWITH_LIBCDR=$(usex cdr) -DWITH_DBUS=$(usex dbus) diff --git a/media-gfx/inkscape/inkscape-1.1.2.ebuild b/media-gfx/inkscape/inkscape-1.1.2.ebuild index 636fc5106966..c966f1a88c05 100644 --- a/media-gfx/inkscape/inkscape-1.1.2.ebuild +++ b/media-gfx/inkscape/inkscape-1.1.2.ebuild @@ -118,6 +118,7 @@ src_configure() { -DENABLE_POPPLER=ON -DENABLE_POPPLER_CAIRO=ON -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON -DBUILD_TESTING=OFF -DWITH_LIBCDR=$(usex cdr) -DWITH_DBUS=$(usex dbus) diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index 863a38c311f8..70cee13a08d3 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -135,6 +135,7 @@ src_configure() { -DENABLE_POPPLER=ON -DENABLE_POPPLER_CAIRO=ON -DWITH_PROFILING=OFF + -DWITH_INTERNAL_2GEOM=ON -DBUILD_TESTING=$(usex test) -DWITH_LIBCDR=$(usex cdr) -DWITH_DBUS=$(usex dbus)