guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.
commit 39584356824bda4e11bf9d55df43e64ded2fc1a4
Author: John Kehayias <[email protected]>
AuthorDate: Sat Sep 20 15:08:00 2025 -0400
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 ++--
gnu/packages/patches/gtk-doc-mkhtml-test-fix.patch | 33 ++++++++++++++++++++++
3 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1f3399ce1c..9d41eeef26 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1553,6 +1553,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 e9bdb59964..f36ce2e791 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -36,7 +36,7 @@
;;; Copyright © 2023 Sergiu Ivanov <[email protected]>
;;; Copyright © 2023, 2024 Zheng Junjie <[email protected]>
;;; Copyright © 2023, 2025 Janneke Nieuwenhuizen <[email protected]>
-;;; Copyright © 2024 John Kehayias <[email protected]>
+;;; Copyright © 2024, 2025 John Kehayias <[email protected]>
;;; Copyright © 2025 Florian Pelz <[email protected]>
;;; Copyright © 2025 Remco van 't Veer <[email protected]>
;;;
@@ -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 0000000000..b6adbbba8e
--- /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 <[email protected]>
+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 <[email protected]>
+---
+ 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
+
