From 1068b01fa8ca39c221c03e5e9c3f0c52e14c6965 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 23 Dec 2024 18:03:59 +0300 Subject: [PATCH] import gtk-doc-1.33.2-12.el10 --- .gtk-doc.metadata | 2 +- SOURCES/74.patch | 33 ++++++++++++++++++++++++++++++++ SPECS/gtk-doc.spec | 47 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 SOURCES/74.patch diff --git a/.gtk-doc.metadata b/.gtk-doc.metadata index 95ad38e..aeb062d 100644 --- a/.gtk-doc.metadata +++ b/.gtk-doc.metadata @@ -1 +1 @@ -d48fc5e2ca19eef9420732625cfd53e40b331baf SOURCES/gtk-doc-1.33.2.tar.xz +d48fc5e2ca19eef9420732625cfd53e40b331baf SOURCES/gtk-doc-1.33.2.tar.xz diff --git a/SOURCES/74.patch b/SOURCES/74.patch new file mode 100644 index 0000000..982b5bd --- /dev/null +++ b/SOURCES/74.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/SPECS/gtk-doc.spec b/SPECS/gtk-doc.spec index 8c847cf..80017e8 100644 --- a/SPECS/gtk-doc.spec +++ b/SPECS/gtk-doc.spec @@ -2,7 +2,7 @@ Name: gtk-doc Version: 1.33.2 -Release: 5%{?dist} +Release: 12%{?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 @@ -36,6 +40,9 @@ Requires: docbook-utils /usr/bin/xsltproc docbook-style-xsl Requires: python3-pygments Requires: python3-lxml +# Required for cmake directory +Requires: cmake-filesystem + %description gtk-doc is a tool for generating API reference documentation. It is used for generating the documentation for GTK+, GLib @@ -69,15 +76,39 @@ mv doc/README doc/README.docs %{_datadir}/gtk-doc/ %{_datadir}/pkgconfig/gtk-doc.pc %{_datadir}/help/*/gtk-doc-manual/ -%{_libdir}/cmake/ +%{_libdir}/cmake/GtkDoc/ %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.33.2-5 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Dec 23 2024 Arkady L. Shane - 1.33.2-12 +- Rebuilt for MSVSphere 10 + +* Tue Oct 29 2024 Troy Dawson - 1.33.2-12 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 1.33.2-11 +- Bump release for June 2024 mass rebuild + +* Fri Feb 09 2024 Neil Hanlon - 1.33.2-10 +- Add tests/gobject/examples to path argument (#2254318 #2261221) + +* Thu Jul 20 2023 Fedora Release Engineering - 1.33.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jan 31 2023 Jeremy Newton - 1.33.2-8 +- Fix ownership of cmake directory + +* Thu Jan 19 2023 Fedora Release Engineering - 1.33.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.33.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.33.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Fri Apr 16 2021 Mohan Boddu - 1.33.2-4 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Thu Jul 22 2021 Fedora Release Engineering - 1.33.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Tue Jan 26 2021 Fedora Release Engineering - 1.33.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild