commit: a4603d7c1dc746eb7b4b0170d5120ca5e5efb222 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> AuthorDate: Fri Feb 21 15:49:50 2020 +0000 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> 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 <mjo <AT> 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 }
