diff --git a/fix-gtkdoc-rebase-NoneType-object-has-no-attribute-group.patch b/fix-gtkdoc-rebase-NoneType-object-has-no-attribute-group.patch new file mode 100644 index 0000000000000000000000000000000000000000..e4a472a761fd230361026b0c6179b83aede19006 --- /dev/null +++ b/fix-gtkdoc-rebase-NoneType-object-has-no-attribute-group.patch @@ -0,0 +1,27 @@ +From 1caecce7002efded6cc3cc95e17372a98189b6f1 Mon Sep 17 00:00:00 2001 +From: wang--ge +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 + diff --git a/fixes-shift-count-out-of-range.patch b/fixes-shift-count-out-of-range.patch new file mode 100644 index 0000000000000000000000000000000000000000..8bd672695b8956d2e33fc01340eb8d74d880fd21 --- /dev/null +++ b/fixes-shift-count-out-of-range.patch @@ -0,0 +1,90 @@ +From 7fc8ea28893dea8c61bc14a902b0d9f4e3de4826 Mon Sep 17 00:00:00 2001 +From: wu-leilei +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 + diff --git a/gtk-doc.spec b/gtk-doc.spec index 7a81cc5d3f9cc2d607c3c6a2f3ce85bc1602671a..3d6c300078c374b4dcae80599a58d5942c5988db 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -3,13 +3,15 @@ Name: gtk-doc Version: 1.33.2 -Release: 2 +Release: 5 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 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: itstool yelp-tools docbook-style-xsl gcc gdb @@ -18,7 +20,7 @@ BuildRequires: python3-pygments BuildRequires: python3-parameterized BuildRequires: python3-anytree BuildRequires: python3-lxml -Requires: docbook-style-xsl docbook-utils libxslt +Requires: docbook-style-xsl docbook-utils libxslt glib2-devel Requires: python3-pygments python3-parameterized python3-anytree python3-lxml @@ -54,6 +56,15 @@ export PYTHON=%{__python3} %{_datadir}/help/*/%{name}-manual/ %changelog +* Tue Jul 27 2021 wulei - 1.33.2-5 +- fixes shift count out of range + +* Mon Jul 26 2021 Ge Wang - 1.33.2-4 +- fix gtkdoc-rebase NoneType object has no attribute 'group' + +* Mon Jul 26 2021 wulei - 1.33.2-3 +- fixes shift count out of range + * Sun Jul 25 2021 liyanan - 1.33.2-2 - fix not found file