fix-gtkdoc-rebase-NoneType-object-has-no-attribute-group.patch

@@ -1,27 +0,0 @@
-From 1caecce7002efded6cc3cc95e17372a98189b6f1 Mon Sep 17 00:00:00 2001
-From: wang--ge <wang__ge@126.com>
-Date: Mon, 26 Jul 2021 16:21:42 +0800
-Subject: [PATCH] fix gtkdoc-rebase NoneType object has no attribute group
- error
-
----
- gtkdoc/rebase.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtkdoc/rebase.py b/gtkdoc/rebase.py
-index 31a9b4f..60a8ebf 100755
---- a/gtkdoc/rebase.py
-+++ b/gtkdoc/rebase.py
-@@ -228,7 +228,8 @@ def RebaseLink(href, options):
-                 package = match.group(1)
-             elif options.aggressive:
-                 match = re.search(r'''([^/]+)/$''', href)
--                package = match.group(1)
-+                if not match is None:
-+                    package = match.group(1)
- 
-         if package:
-             if options.online and package in OnlineMap:
--- 
-2.27.0
-

fix-mkhtml-test.patch

@@ -1,33 +0,0 @@
-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
-

gtk-doc.spec

@@ -3,24 +3,22 @@
 
 Name:           gtk-doc
 Version:        1.33.2
-Release:        7
+Release:        3
 Summary:        Generate API documentation from comments that can be added to C code
-License:        GPLv2+
+License:        GPLv2+ and GFDL
 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:  python3-devel docbook-utils libxslt gettext
 BuildRequires:  itstool yelp-tools docbook-style-xsl gcc
-BuildRequires:  meson glib2-devel
+BuildRequires:  dblatex meson glib2-devel
 BuildRequires:  python3-pygments
 BuildRequires:  python3-parameterized
 BuildRequires:  python3-anytree
 BuildRequires:  python3-lxml
-Requires:       docbook-style-xsl docbook-utils libxslt glib2-devel
+Requires:       docbook-style-xsl docbook-utils libxslt
 Requires:       python3-pygments python3-parameterized python3-anytree python3-lxml
 
 
@@ -31,7 +29,6 @@ to document application code.
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-sed -i 's/@DBLATEX@/\/usr\/bin\/dblatex/g' gtkdoc/config_data.py.in
 
 mv doc/README doc/README.1
 
@@ -57,21 +54,9 @@ export PYTHON=%{__python3}
 %{_datadir}/help/*/%{name}-manual/
 
 %changelog
-* Wed Nov 20 2024 Wenhua Huang <huangwenhua@kylinos.cn> - 1.33.2-7
+* Thu 22 Jul 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.33.2-3
-- Fix mkhtml test
-
-* Sat Feb 19 2022 Liu Zixian <liuzixian4@huawei.com> - 1.33.2-6
-- Remove useless BuildRequires python3-devel
-
-* Fri Oct 15 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.33.2-5
-- Del buildrequire dblatex by replace macro @DBLATEX@ with dblatex path
-
-* Tue Jul 27 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.33.2-4
 - Del useless buildrequire gdb
 
-* Mon Jul 26 2021 Ge Wang <wangge20@huawei.com> - 1.33.2-3
-- fix gtkdoc-rebase NoneType object has no attribute 'group'
-
 * Sun Jul 25 2021 liyanan <liyanan32@huawei.com> - 1.33.2-2
 - fix not found file