From 8a3dedc2b3257954ca908be86cb9e54ac2335341 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sat, 20 Sep 2025 15:08:00 -0400 Subject: [PATCH] gnu: gtk-doc: Fix test. * gnu/packages/gtk.scm (gtk-doc)[source]: Add patch. * gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Ie1cc25bbef294755534db00380b880719c9ee9ff --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 5 +-- .../patches/gtk-doc-mkhtml-test-fix.patch | 33 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index b087a8a90769b7830d8b610becea39357c5c7d62..b0f305f6f6a86e2ab28ca960e4fee96706bc73b5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1557,6 +1557,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk-doc-respect-xml-catalog.patch \ + %D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \ %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e9bdb59964fc62a77ba565fbc8a2370c434ad71f..f36ce2e791b72c8b5f13ceac7961ede7650756b1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -36,7 +36,7 @@ ;;; Copyright © 2023 Sergiu Ivanov ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023, 2025 Janneke Nieuwenhuizen -;;; Copyright © 2024 John Kehayias +;;; Copyright © 2024, 2025 John Kehayias ;;; Copyright © 2025 Florian Pelz ;;; Copyright © 2025 Remco van 't Veer ;;; @@ -2341,7 +2341,8 @@ information.") (base32 "0746lwxgybc5ss3hzdd0crjjghk0ck0x9jbmz73iig405arp42xj")) (patches - (search-patches "gtk-doc-respect-xml-catalog.patch")))) + (search-patches "gtk-doc-respect-xml-catalog.patch" + "gtk-doc-mkhtml-test-fix.patch")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch b/gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..b6adbbba8e7dc41744fbe4a27aa6c7bfa56e9e7d --- /dev/null +++ b/gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch @@ -0,0 +1,33 @@ +From 951743698610eaaa0cc9030f7d7d02437419ac24 Mon Sep 17 00:00:00 2001 +From: Neil Hanlon +Date: Fri, 9 Feb 2024 15:32:38 -0500 +Subject: [PATCH] Add gobject example source code to path for mkhtml test + +Fixes #150 + +I'm not really sure why this is required, but I suspect it has to do +with changes in how GCC handles path traversal due to recent (ish) +security issues, as the code here is evaluated to +`../xml/../../examples/gobject.c` which probably looks unhealthy to +automatically include. + +Signed-off-by: Neil Hanlon +--- + tests/gobject/docs/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/gobject/docs/meson.build b/tests/gobject/docs/meson.build +index a1dd66ca..236a1cc0 100644 +--- a/tests/gobject/docs/meson.build ++++ b/tests/gobject/docs/meson.build +@@ -119,6 +119,7 @@ test( + '--path=@0@'.format(':'.join([ + gobject_test_docs_dir, + srcdir, ++ join_paths(srcdir, 'tests/gobject/examples'), + ]) + ), + ], +-- +GitLab +