commit: be35cf883544c0f0c73b00748601e411b9140b7c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Sep 18 04:22:30 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Sep 18 04:29:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be35cf88
media-gfx/inkscape: fix building tests, fix gtksourceview automagic * Fix building tests. Still restricted but fewer fail now. * Port to CMAKE_SKIP_TESTS. * Wire up gtksourceview. Closes: https://bugs.gentoo.org/871621 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/inkscape/inkscape-1.3.ebuild | 17 ++++++++++++++--- media-gfx/inkscape/inkscape-9999.ebuild | 21 ++++++++++++++++----- media-gfx/inkscape/metadata.xml | 1 + profiles/arch/hppa/package.use.mask | 4 ++++ 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/media-gfx/inkscape/inkscape-1.3.ebuild b/media-gfx/inkscape/inkscape-1.3.ebuild index 8f86e17bc1c1..0f162519d9ab 100644 --- a/media-gfx/inkscape/inkscape-1.3.ebuild +++ b/media-gfx/inkscape/inkscape-1.3.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"; LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline spell svg2 test visio wpg X" +IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Lots of test failures which need investigating, bug #871621 RESTRICT="!test? ( test ) test" @@ -77,6 +77,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) + sourceview? ( x11-libs/gtksourceview:4 ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 @@ -149,6 +150,7 @@ src_configure() { -DENABLE_LCMS=ON -DWITH_OPENMP=$(usex openmp) -DBUILD_SHARED_LIBS=ON + -DWITH_GSOURCEVIEW=$(usex sourceview) -DWITH_SVG2=$(usex svg2) -DWITH_LIBVISIO=$(usex visio) -DWITH_LIBWPG=$(usex wpg) @@ -159,14 +161,23 @@ src_configure() { } src_test() { - local myctestargs=( + CMAKE_SKIP_TESTS=( # render_text*: needs patched Cairo / maybe upstream changes # not yet in a release. # test_lpe/test_lpe64: precision differences b/c of new GCC? # cli_export-png-color-mode-gray-8_png_check_output: ditto? - -E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)" + render_test-use + render_test-glyph-y-pos + render_text-glyphs-combining + render_text-glyphs-vertical + render_test-rtl-vertical + test_lpe + test_lpe64 + cli_export-png-color-mode-gray-8_png_check_output ) + # bug #871621 + cmake_src_compile tests cmake_src_test -j1 } diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild index 7954fbf3efac..0f162519d9ab 100644 --- a/media-gfx/inkscape/inkscape-9999.ebuild +++ b/media-gfx/inkscape/inkscape-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="xml(+)" MY_P="${P/_/}" inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1 @@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"; else SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"; - KEYWORDS="~alpha ~amd64" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="SVG based generic vector-drawing program" @@ -21,7 +21,7 @@ HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"; LICENSE="GPL-2 LGPL-2.1" SLOT="0" -IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline spell svg2 test visio wpg X" +IUSE="cdr dia exif graphicsmagick imagemagick inkjar jpeg openmp postscript readline sourceview spell svg2 test visio wpg X" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # Lots of test failures which need investigating, bug #871621 RESTRICT="!test? ( test ) test" @@ -77,6 +77,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) + sourceview? ( x11-libs/gtksourceview:4 ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 @@ -149,6 +150,7 @@ src_configure() { -DENABLE_LCMS=ON -DWITH_OPENMP=$(usex openmp) -DBUILD_SHARED_LIBS=ON + -DWITH_GSOURCEVIEW=$(usex sourceview) -DWITH_SVG2=$(usex svg2) -DWITH_LIBVISIO=$(usex visio) -DWITH_LIBWPG=$(usex wpg) @@ -159,14 +161,23 @@ src_configure() { } src_test() { - local myctestargs=( + CMAKE_SKIP_TESTS=( # render_text*: needs patched Cairo / maybe upstream changes # not yet in a release. # test_lpe/test_lpe64: precision differences b/c of new GCC? # cli_export-png-color-mode-gray-8_png_check_output: ditto? - -E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)" + render_test-use + render_test-glyph-y-pos + render_text-glyphs-combining + render_text-glyphs-vertical + render_test-rtl-vertical + test_lpe + test_lpe64 + cli_export-png-color-mode-gray-8_png_check_output ) + # bug #871621 + cmake_src_compile tests cmake_src_test -j1 } diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml index f5a32443fc24..ec2121f26229 100644 --- a/media-gfx/inkscape/metadata.xml +++ b/media-gfx/inkscape/metadata.xml @@ -9,6 +9,7 @@ <flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag> <flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag> <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag> + <flag name="sourceview">Enable syntax highlighting support via <pkg>x11-libs/gtksourceview</pkg></flag> <flag name="svg2">Enable support for new SVG2 features</flag> <flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag> <flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag> diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask index 4c64949cc832..65d90de33e36 100644 --- a/profiles/arch/hppa/package.use.mask +++ b/profiles/arch/hppa/package.use.mask @@ -4,6 +4,10 @@ # NOTE: When masking a USE flag due to missing keywords, please file a keyword # request bug for the hppa arch. +# Sam James <s...@gentoo.org> (2023-09-18) +# x11-libs/gtksourceview:4 not keyworded here +media-gfx/inkscape sourceview + # Rich Freeman <ri...@gentoo.org> (2023-09-13) # Tests require shellcheck which is not currently available on hppa sys-process/systemd-cron test
