commit: 0eb771864139886b2a39fcd5be598d97714ff9fd Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Tue Dec 9 00:40:01 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 9 09:49:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb77186
media-gfx/gimp: re-enable and fix headless tests Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44899 Closes: https://github.com/gentoo/gentoo/pull/44899 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch | 28 +++++++++++++++++++++++++ media-gfx/gimp/gimp-3.0.6.ebuild | 8 ++++--- media-gfx/gimp/gimp-3.2.0_rc1.ebuild | 8 ++++--- media-gfx/gimp/gimp-9999.ebuild | 4 +--- 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch b/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch new file mode 100644 index 000000000000..ca92daeee38f --- /dev/null +++ b/media-gfx/gimp/files/gimp-3.0.6-fix-tests.patch @@ -0,0 +1,28 @@ +https://gitlab.gnome.org/GNOME/gimp/-/issues/14822 +https://gitlab.gnome.org/GNOME/gimp/-/issues/15257 +https://gitlab.gnome.org/GNOME/gimp/-/merge_requests/2566 +https://gitlab.gnome.org/GNOME/gimp/-/commit/2fd12847496a9a242ca8edc448d400d3660b8009 +https://gitlab.gnome.org/GNOME/gimp/-/commit/93869f43cf3f489ed5aa35ce018f6f4edbbdcb67 + +From 2fd12847496a9a242ca8edc448d400d3660b8009 Mon Sep 17 00:00:00 2001 +From: Jehan <[email protected]> +Date: Thu, 4 Dec 2025 23:47:00 +0100 +Subject: [PATCH] Issue #15257: test failing because gegl:bevel doesn't see GPL + ops. + +--- a/app/tests/tests.c ++++ b/app/tests/tests.c +@@ -162,6 +162,10 @@ gimp_init_for_gui_testing_internal (gboolean show_gui, + + /* from main() */ + gimp_log_init (); ++ g_object_set (gegl_config (), ++ "use-opencl", FALSE, ++ "application-license", "GPL3", ++ NULL); + gegl_init (NULL, NULL); + + /* Introduce an error margin for positions written to sessionrc */ +-- +GitLab + diff --git a/media-gfx/gimp/gimp-3.0.6.ebuild b/media-gfx/gimp/gimp-3.0.6.ebuild index c04178752dde..adad573e62ba 100644 --- a/media-gfx/gimp/gimp-3.0.6.ebuild +++ b/media-gfx/gimp/gimp-3.0.6.ebuild @@ -120,6 +120,10 @@ BDEPEND=" DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" ) +PATCHES=( + "${FILESDIR}"/gimp-3.0.6-fix-tests.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -179,9 +183,7 @@ src_configure() { $(meson_feature openexr) $(meson_feature openmp) $(meson_feature postscript ghostscript) - # https://gitlab.gnome.org/GNOME/gimp/-/issues/14822 - -Dheadless-tests=disabled - #$(meson_feature test headless-tests) + $(meson_feature test headless-tests) $(meson_feature udev gudev) $(meson_feature vala) $(meson_feature webp) diff --git a/media-gfx/gimp/gimp-3.2.0_rc1.ebuild b/media-gfx/gimp/gimp-3.2.0_rc1.ebuild index a2bc9ecc9f56..e773a981cbba 100644 --- a/media-gfx/gimp/gimp-3.2.0_rc1.ebuild +++ b/media-gfx/gimp/gimp-3.2.0_rc1.ebuild @@ -150,6 +150,10 @@ BDEPEND=" DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" ) +PATCHES=( + "${FILESDIR}"/gimp-3.0.6-fix-tests.patch +) + pkg_pretend() { [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp } @@ -214,9 +218,7 @@ src_configure() { $(meson_feature openexr) $(meson_feature openmp) $(meson_feature postscript ghostscript) - # https://gitlab.gnome.org/GNOME/gimp/-/issues/14822 - -Dheadless-tests=disabled - #$(meson_feature test headless-tests) + $(meson_feature test headless-tests) $(meson_feature udev gudev) $(meson_feature vala) $(meson_feature webp) diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild index a2bc9ecc9f56..3f1a46690c32 100644 --- a/media-gfx/gimp/gimp-9999.ebuild +++ b/media-gfx/gimp/gimp-9999.ebuild @@ -214,9 +214,7 @@ src_configure() { $(meson_feature openexr) $(meson_feature openmp) $(meson_feature postscript ghostscript) - # https://gitlab.gnome.org/GNOME/gimp/-/issues/14822 - -Dheadless-tests=disabled - #$(meson_feature test headless-tests) + $(meson_feature test headless-tests) $(meson_feature udev gudev) $(meson_feature vala) $(meson_feature webp)
