Add gobject exampledir to path for mkhtml test

Resolves FTBFS reported in #2261221 and #2254318. It is unclear why this
change is necessary, but I suspect it has to do with changes in gcc
around protections in path traversals, as the path is expanded to
`../xml/../../examples/gobject.c`.
This commit is contained in:
Neil Hanlon 2024-02-09 20:16:08 +00:00 committed by David King
parent 605672e5b7
commit cfcf9b18ff
2 changed files with 41 additions and 7 deletions

33
74.patch Normal file
View File

@ -0,0 +1,33 @@
From 951743698610eaaa0cc9030f7d7d02437419ac24 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@shrug.pw>
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 <neil@shrug.pw>
---
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

View File

@ -2,7 +2,7 @@
Name: gtk-doc
Version: 1.33.2
Release: 11%{?dist}
Release: 10%{?dist}
Summary: API documentation generation tool for GTK+ and GNOME
License: GPLv2+ and GFDL
@ -13,7 +13,11 @@ Source0: http://download.gnome.org/sources/%{name}/1.33/%{name}-%{version}.tar.x
# https://bugzilla.redhat.com/show_bug.cgi?id=1775560
# https://gitlab.gnome.org/GNOME/gtk-doc/issues/98
# https://gitlab.gnome.org/GNOME/gtk-doc/issues/110
Patch0: 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
Patch: 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
# Resolve FTBFS, unclear if solution is 'proper'
# https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/150
Patch: https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/74.patch
BuildRequires: dblatex
BuildRequires: docbook-utils
@ -75,11 +79,8 @@ mv doc/README doc/README.docs
%{_libdir}/cmake/GtkDoc/
%changelog
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Feb 09 2024 Neil Hanlon <neil@shrug.pw> - 1.33.2-10
- Add tests/gobject/examples to path argument (#2254318 #2261221)
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.33.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild