fix-fixxref-not-found-file.patch

@@ -1,50 +0,0 @@
---- gtk-doc-1.33.2/gtkdoc/fixxref.py	2021-01-20 01:08:26.494552400 +0800
-+++ gtk-doc-1.33.2_bak/gtkdoc/fixxref.py	2021-07-26 10:52:56.295493736 +0800
-@@ -22,7 +22,7 @@
- ''"Fix cross-references in the HTML documentation.''"
- 
- import logging
--import os
-+import os,sys
- import re
- 
- from . import common, highlight
-@@ -51,6 +51,12 @@
-     LoadIndicies(options.module_dir, options.html_dir, options.extra_dir)
-     ReadSections(options.module)
-     FixCrossReferences(options.module_dir, options.module, options.src_lang)
-+    
-+    
-+    if not  os.path.exists(os.path.join(options.module_dir, 'style.css')):
-+      print (os.path.join(options.module_dir, 'style.css' + "  file is not found"))
-+      sys.exit()
-+
-     highlight.append_style_defs(os.path.join(options.module_dir, 'style.css'))
- 
- 
-@@ -187,6 +193,12 @@
- 
- def ReadSections(module):
-     """We don't warn on missing links to non-public sysmbols."""
-+    
-+    
-+    if not os.path.exists(module + '-sections.txt'):
-+        print (module + '-sections.txt' + "  file is not found")
-+        sys.exit()
-+
-     for line in open(module + '-sections.txt', 'r', encoding='utf-8'):
-         m1 = re.search(r'^<SUBSECTION\s*(.*)>', line)
-         if line.startswith('#') or line.strip() == '':
-@@ -211,6 +223,12 @@
- 
- def FixCrossReferences(module_dir, module, src_lang):
-     # TODO(ensonic): use glob.glob()?
-+
-+
-+    if not os.path.isdir(module_dir):
-+       print (module_dir + " directory is not found")
-+       sys.exit()
-+
-     for entry in sorted(os.listdir(module_dir)):
-         full_entry = os.path.join(module_dir, entry)
-         if os.path.isdir(full_entry):

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-mkdb-not-found-file.patch

@@ -1,57 +0,0 @@
---- gtk-doc-1.33.2/gtkdoc/mkdb.py	2021-01-20 01:08:26.503552400 +0800
-+++ gtk-doc-1.33.2_bak/gtkdoc/mkdb.py	2021-07-26 10:50:13.896786712 +0800
-@@ -25,7 +25,7 @@
- 
- from collections import OrderedDict
- import logging
--import os
-+import os,sys
- import re
- import string
- 
-@@ -286,7 +286,11 @@
- 
-     # extract docbook header or define default
-     doctype_header = GetDocbookHeader(main_sgml_file)
--
-+    
-+    if not os.path.exists(os.path.join(ROOT_DIR, MODULE + "-sections.txt")):
-+         print (os.path.join(ROOT_DIR, MODULE + "-sections.txt") + "  file is not found")
-+         sys.exit()
-+    
-     ReadKnownSymbols(os.path.join(ROOT_DIR, MODULE + "-sections.txt"))
-     ReadSignalsFile(os.path.join(ROOT_DIR, MODULE + ".signals"))
-     ReadArgsFile(os.path.join(ROOT_DIR, MODULE + ".args"))
-@@ -294,9 +298,19 @@
-     obj_tree = ReadObjectHierarchy(os.path.join(ROOT_DIR, MODULE + ".hierarchy"))
-     ReadInterfaces(os.path.join(ROOT_DIR, MODULE + ".interfaces"))
-     ReadPrerequisites(os.path.join(ROOT_DIR, MODULE + ".prerequisites"))
-+    
-+    
-+    if not os.path.exists(os.path.join(ROOT_DIR, MODULE + "-decl.txt")):
-+        print (os.path.join(ROOT_DIR, MODULE + "-decl.txt") + " file is not found")
-+        sys.exit()
- 
-     ReadDeclarationsFile(os.path.join(ROOT_DIR, MODULE + "-decl.txt"), 0)
-     if os.path.isfile(os.path.join(ROOT_DIR, MODULE + "-overrides.txt")):
-+        
-+        if not  os.path.exists(os.path.join(ROOT_DIR, MODULE + "-overrides.txt")):
-+            print (os.path.join(ROOT_DIR, MODULE + "-overrides.txt") + " file is not found")
-+            sys.exit()
-+
-         ReadDeclarationsFile(os.path.join(ROOT_DIR, MODULE + "-overrides.txt"), 1)
- 
-     logging.info("Data files read")
-@@ -3758,6 +3772,12 @@
-     # This array holds any subdirectories found.
-     subdirs = []
- 
-+
-+ 
-+    if not os.path.isdir(source_dir):
-+        print (source_dir + " directory is not found")
-+        sys.exit()
-+
-     for ifile in sorted(os.listdir(source_dir)):
-         logging.debug("... : %s", ifile)
-         if ifile.startswith('.'):

fixes-shift-count-out-of-range.patch

@@ -1,90 +0,0 @@
-From 7fc8ea28893dea8c61bc14a902b0d9f4e3de4826 Mon Sep 17 00:00:00 2001
-From: wu-leilei <wu18740459704@163.com>
-Date: Tue, 27 Jul 2021 15:14:17 +0800
-Subject: [PATCH] shift count out of range
-
----
- buildsystems/autotools/gtkdocize.in | 52 ++++++++++++++++++++++-------
- 1 file changed, 40 insertions(+), 12 deletions(-)
-
-diff --git a/buildsystems/autotools/gtkdocize.in b/buildsystems/autotools/gtkdocize.in
-index 83127bf..7e15bd8 100755
---- a/buildsystems/autotools/gtkdocize.in
-+++ b/buildsystems/autotools/gtkdocize.in
-@@ -25,9 +25,16 @@ args="$*"
- while test $# -gt 0; do
-   case "$1" in
-   --srcdir)
--    shift
--    srcdir="$1"
--    shift ;;
-+    if test $# -gt 1; then
-+        shift
-+        srcdir="$1"
-+        shift
-+    elif test $# -eq 1; then
-+        shift
-+    else
-+        :
-+    fi
-+    ;;
-   --srcdir=*)
-     srcdir=`expr "X$1" : '[^=]*=\(.*\)'`
-     shift ;;
-@@ -83,23 +90,44 @@ while test $# -gt 0; do
-     copy=yes
-     shift ;;
-   --docdir)
--    shift
--    docdir="$1"
--    shift ;;
-+    if test $# -gt 1; then
-+        shift
-+        docdir="$1"
-+        shift
-+    elif test $# -eq 1; then
-+        shift
-+    else
-+        :
-+    fi
-+    ;;
-   --docdir=*)
-     docdir=`expr "X$1" : '[^=]*=\(.*\)'`
-     shift ;;
-   --flavour)
--    shift
--    flavour="$1"
--    shift ;;
-+    if test $# -gt 1; then
-+        shift
-+        flavour="$1"
-+        shift
-+    elif test $# -eq 1; then
-+        shift
-+    else
-+        :
-+    fi
-+    ;;
-   --flavour=*)
-     flavour=`expr "X$1" : '[^=]*=\(.*\)'`
-     shift ;;
-   --srcdir)
--    shift
--    # srcdir was set earlier.
--    shift ;;
-+    if test $# -gt 1; then
-+        shift
-+        # srcdir was set earlier.
-+        shift
-+    elif test $# -eq 1; then
-+        shift
-+    else
-+        :
-+    fi
-+    ;;
-   --srcdir=*)
-     # srcdir was set earlier.
-     shift ;;
--- 
-2.23.0
-

gtk-doc.spec

@@ -1,29 +1,25 @@
 %global debug_package %{nil}
 %global __python %{__python3}
 
+%bcond_with check
+
 Name:           gtk-doc
-Version:        1.33.2
+Version:        1.32
-Release:        5
+Release:        1
 Summary:        Generate API documentation from comments that can be added to C code
 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
+Source0:        https://download.gnome.org/sources/gtk-doc/1.32/%{name}-%{version}.tar.xz
-Patch0:         fix-fixxref-not-found-file.patch
-Patch1:         fix-mkdb-not-found-file.patch
-Patch2:         fixes-shift-count-out-of-range.patch
-Patch3:         fix-gtkdoc-rebase-NoneType-object-has-no-attribute-group.patch
 
-BuildRequires:  python3-devel docbook-utils libxslt gettext
+BuildRequires:  python3-six python3-devel docbook-utils libxslt gettext
 BuildRequires:  itstool yelp-tools docbook-style-xsl gcc gdb
-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
 
-
 %description
 GTK-Doc is a project which was started to generate API documentation from comments added to C code.
 It is typically used to document the public API of GTK and GNOME libraries, but it can also be used
@@ -36,46 +32,28 @@ mv doc/README doc/README.1
 
 %build
 export PYTHON=%{__python3}
-%meson
+%configure
-%meson_build
+%make_build
 
 %install
-%meson_install
+%make_install
 
 %check
-%meson_test
+%if %{with check}
+    make check
+%endif
 
 %files
 %doc README doc/* examples
 %license COPYING COPYING-DOCS AUTHORS
 %{_bindir}/*
-%{_libdir}/cmake/
 %{_datadir}/aclocal/
 %{_datadir}/%{name}/
 %{_datadir}/*/*.pc
 %{_datadir}/help/*/%{name}-manual/
+%{_datadir}/cmake/
 
 %changelog
-* Tue Jul 27 2021 wulei <wulei80@huawei.com> - 1.33.2-5
-- fixes shift count out of range
-
-* Mon Jul 26 2021 Ge Wang <wangge20@huawei.com> - 1.33.2-4
-- fix gtkdoc-rebase NoneType object has no attribute 'group'
-
-* Mon Jul 26 2021 wulei <wulei80@huawei.com> - 1.33.2-3
-- fixes shift count out of range
-
-* Sun Jul 25 2021 liyanan <liyanan32@huawei.com> - 1.33.2-2
-- fix not found file
-
-* Wed May 19 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.33.2-1
-- Upgrade to 1.33.2
-- Update Version
-- Vsesion 1.33.2 change its "cmake" dir to /lib64
-
-* Tue Dec 1 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 1.33.0-1
-- upgrade to 1.33.0
-
 * Mon Jun 8 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 1.32-1
 - upgrade to 1.32
 
@@ -88,9 +66,8 @@ export PYTHON=%{__python3}
 * Wed Jan 15 2020 gulining<gulining1@huawei.com> - 1.29-3
 - solve unresolveable
 
-* Wed Dec 4 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.29-2
+* Tue Dec 4 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.29-2
 - strenthen spec
 
-* Thu Aug 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.29-1
+* Mon Aug 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.29-1
 - Package init
-