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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3C39138350 for ; Fri, 21 Feb 2020 19:54:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9C04E08CD; Fri, 21 Feb 2020 19:54:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96D05E08CD for ; Fri, 21 Feb 2020 19:54:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C3E6634EF2A for ; Fri, 21 Feb 2020 19:54:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 481F3116 for ; Fri, 21 Feb 2020 19:54:20 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1582314721.a4603d7c1dc746eb7b4b0170d5120ca5e5efb222.mjo@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.0_beta2-r1.ebuild media-gfx/inkscape/inkscape-9999.ebuild X-VCS-Directories: media-gfx/inkscape/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: a4603d7c1dc746eb7b4b0170d5120ca5e5efb222 X-VCS-Branch: master Date: Fri, 21 Feb 2020 19:54:20 +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: c9c6d61b-45b1-468e-a66a-924d8ec5da30 X-Archives-Hash: 7cc896baa8b8675f4c08df6322ddac47 commit: a4603d7c1dc746eb7b4b0170d5120ca5e5efb222 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Feb 21 15:49:50 2020 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Fri Feb 21 19:52:01 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4603d7c media-gfx/inkscape: disable the effects of USE=nls. The upstream build system is broken with USE=nls at the moment. Rather than drop the USE flag entirely (which might lead users to think that it's going away) this commit comments out the resulting -DWITH_NLS parameter that gets passed to the build system. Thus "USE=-nls" becomes a lie, but it should begin to work again once the upstream bug is fixed. There is a highly visible comment in the ebuild reminding the maintainers to check on the upstream bug periodically. Bug: https://bugs.gentoo.org/699658 Inkscape-bug: https://gitlab.com/inkscape/inkscape/issues/168 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Orlitzky gentoo.org> media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild | 9 ++++++++- media-gfx/inkscape/inkscape-9999.ebuild | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild index 52bc56d18a5..6350c33d337 100644 --- a/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild +++ b/media-gfx/inkscape/inkscape-1.0_beta2-r1.ebuild @@ -132,13 +132,20 @@ src_configure() { -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick -DWITH_JEMALLOC=$(usex jemalloc) -DENABLE_LCMS=$(usex lcms) - -DWITH_NLS=$(usex nls) -DWITH_OPENMP=$(usex openmp) -DBUILD_SHARED_LIBS=$(usex !static-libs) -DWITH_SVG2=$(usex svg2) -DWITH_LIBVISIO=$(usex visio) -DWITH_LIBWPG=$(usex wpg) ) + # We should also have, + # + # -DWITH_NLS=$(usex nls) + # + # in this list, but it's broken upstream at the moment: + # + # * https://bugs.gentoo.org/699658 + # * https://gitlab.com/inkscape/inkscape/issues/168 cmake_src_configure } diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index bc57307639b..aa29d78aa48 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -131,13 +131,20 @@ src_configure() { -DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick -DWITH_JEMALLOC=$(usex jemalloc) -DENABLE_LCMS=$(usex lcms) - -DWITH_NLS=$(usex nls) -DWITH_OPENMP=$(usex openmp) -DBUILD_SHARED_LIBS=$(usex !static-libs) -DWITH_SVG2=$(usex svg2) -DWITH_LIBVISIO=$(usex visio) -DWITH_LIBWPG=$(usex wpg) ) + # We should also have, + # + # -DWITH_NLS=$(usex nls) + # + # in this list, but it's broken upstream at the moment: + # + # * https://bugs.gentoo.org/699658 + # * https://gitlab.com/inkscape/inkscape/issues/168 cmake_src_configure }