From 04793e7346361499494a8b5a7e79868f07747cb1 Mon Sep 17 00:00:00 2001 From: Wenhua Huang Date: Wed, 20 Nov 2024 18:46:33 +0800 Subject: [PATCH] Fix mkhtml test fail --- fix-mkhtml-test.patch | 33 +++++++++++++++++++++++++++++++++ gtk-doc.spec | 8 ++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 fix-mkhtml-test.patch diff --git a/fix-mkhtml-test.patch b/fix-mkhtml-test.patch new file mode 100644 index 0000000..982b5bd --- /dev/null +++ b/fix-mkhtml-test.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 a1dd66c..236a1cc 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 + diff --git a/gtk-doc.spec b/gtk-doc.spec index 665f425..60ead46 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -3,14 +3,15 @@ Name: gtk-doc Version: 1.33.2 -Release: 6 +Release: 7 Summary: Generate API documentation from comments that can be added to C code -License: Verbatim and GPLv2+ +License: GPLv2+ URL: https://www.gtk.org/gtk-doc/ Source0: https://download.gnome.org/sources/gtk-doc/1.33/%{name}-%{version}.tar.xz Patch0: fix-fixxref-not-found-file.patch Patch1: fix-mkdb-not-found-file.patch Patch2: fix-gtkdoc-rebase-NoneType-object-has-no-attribute-group.patch +Patch3: fix-mkhtml-test.patch BuildRequires: docbook-utils libxslt gettext BuildRequires: itstool yelp-tools docbook-style-xsl gcc @@ -56,6 +57,9 @@ export PYTHON=%{__python3} %{_datadir}/help/*/%{name}-manual/ %changelog +* Wed Nov 20 2024 Wenhua Huang - 1.33.2-7 +- Fix mkhtml test + * Sat Feb 19 2022 Liu Zixian - 1.33.2-6 - Remove useless BuildRequires python3-devel -- Gitee