diff --git a/.gitignore b/.gitignore index 15d92d3..35d9db3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ gtk-doc-1.15.tar.bz2 /gtk-doc-1.26.tar.xz /gtk-doc-1.27.tar.xz /gtk-doc-1.28.tar.xz +/gtk-doc-1.29.tar.xz diff --git a/0001-Fix-a-missed-variable-rename-in-ScanDirectory-caused.patch b/0001-Fix-a-missed-variable-rename-in-ScanDirectory-caused.patch deleted file mode 100644 index 0f50acb..0000000 --- a/0001-Fix-a-missed-variable-rename-in-ScanDirectory-caused.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 203785526af7308a799401c0b037db409269119c Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 10 May 2018 11:00:17 -0700 -Subject: [PATCH 1/2] Fix a missed variable rename in ScanDirectory (caused a - crash) - -halfline ran into gtk-doc crashing when he was trying to cut an -accountsservice release; looking into it we found that the first -arg to ScanDirectory was renamed from `dir` to `scan_dir` in -9292e0a (to avoid overriding a builtin, I guess) but this one -reference to it was not changed. This should fix it. - -Signed-off-by: Adam Williamson ---- - gtkdoc/rebase.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtkdoc/rebase.py b/gtkdoc/rebase.py -index 424c3e6..2a1d495 100755 ---- a/gtkdoc/rebase.py -+++ b/gtkdoc/rebase.py -@@ -108,7 +108,7 @@ def ScanDirectory(scan_dir, options): - - if onlinedir and entry == "index.sgml": - log(options, "Reading index from index.sgml") -- onlinedir = ReadIndex(dir, entry) -+ onlinedir = ReadIndex(scan_dir, entry) - have_index = True - elif entry == "index.sgml.gz" and not os.path.exists(os.path.join(scan_dir, 'index.sgml')): - # debian/ubuntu started to compress this as index.sgml.gz :/ --- -2.17.0 - diff --git a/0002-Replace-match.groups-1-with-match.group-1.patch b/0002-Replace-match.groups-1-with-match.group-1.patch deleted file mode 100644 index e0eb7c9..0000000 --- a/0002-Replace-match.groups-1-with-match.group-1.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 43fac1c26c9c6bdede2d32b5243e74636bda8a98 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 10 May 2018 11:08:02 -0700 -Subject: [PATCH 2/2] Replace `match.groups(1)` with `match.group(1)` - -halfline ran into a crash in gtk-doc when trying to cut an -accountsservice release, a TypeError pointing to this re.sub -call. Looking at it, the use of `match.groups(1)` is clearly -wrong. `match.groups()` returns a tuple consisting of *all* -the match subgroups; the argument it takes is the value to use -for subgroups which didn't capture anything (the default being -None). What the code here clearly actually *wants* is not that -tuple, but the contents of the first match subgroup only, as a -string. To get that you do `match.group(1)`. So, let's fix that. - -There are two other occurrences of the same error later in the -file, so let's fix that too. If I'm reading it correctly, those -ones wouldn't have caused crashes, they would only cause the -block they're in not to work properly and produce "Can't -determine package for '(something)'" log messages even when it -should have worked (because 'package' will be the tuple, not the -subgroup, and will never be 'in' `OnlineMap` or `LocalMap`). - -Note, these have been lying around for a long time, but the one -that causes the crash was not hit until 1.28, because of the -regex error fixed by b77d97b. Until that regex was fixed, -ReadDevhelp never worked on this codebase, so we never hit the -bug in ReadIndex. The crash might have happened with some other -codebase for which the ReadDevhelp regex *did* work, though. - -Signed-off-by: Adam Williamson ---- - gtkdoc/rebase.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gtkdoc/rebase.py b/gtkdoc/rebase.py -index 2a1d495..4b0266c 100755 ---- a/gtkdoc/rebase.py -+++ b/gtkdoc/rebase.py -@@ -154,7 +154,7 @@ def ReadIndex(dir, file): - match = re.match(r'''^''', line) - if match: - # Remove trailing non-directory component. -- onlinedir = re.sub(r'''(.*/).*''', r'\1', match.groups(1)) -+ onlinedir = re.sub(r'''(.*/).*''', r'\1', match.group(1)) - return onlinedir - - -@@ -226,10 +226,10 @@ def RebaseLink(href, options): - else: - match = re.match(r'\.\./([^/]+)', href) - if match is not None: -- package = match.groups(1) -+ package = match.group(1) - elif options.aggressive: - match = re.search(r'''([^/]+)/$''', href) -- package = match.groups(1) -+ package = match.group(1) - - if package: - if options.online and package in OnlineMap: --- -2.17.0 - diff --git a/gtk-doc.spec b/gtk-doc.spec index 31dd427..9f7d87e 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -3,19 +3,13 @@ %global __python %{__python3} Name: gtk-doc -Version: 1.28 -Release: 4%{?dist} +Version: 1.29 +Release: 1%{?dist} Summary: API documentation generation tool for GTK+ and GNOME License: GPLv2+ and GFDL URL: http://www.gtk.org/gtk-doc -Source0: http://download.gnome.org/sources/gtk-doc/1.28/gtk-doc-%{version}.tar.xz -# Fix a crasher bug caused by mismatched variable name: -# https://bugzilla.gnome.org/show_bug.cgi?id=796011 -Patch0: 0001-Fix-a-missed-variable-rename-in-ScanDirectory-caused.patch -# Fix another crasher bug caused by wrong use of re groups: -# https://bugzilla.gnome.org/show_bug.cgi?id=796012 -Patch1: 0002-Replace-match.groups-1-with-match.group-1.patch +Source0: http://download.gnome.org/sources/gtk-doc/1.29/gtk-doc-%{version}.tar.xz BuildRequires: gcc BuildRequires: dblatex @@ -68,6 +62,9 @@ make check || make check %{_libdir}/cmake/ %changelog +* Fri Sep 07 2018 Kalev Lember - 1.29-1 +- Update to 1.29 + * Fri Jul 13 2018 Fedora Release Engineering - 1.28-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 76bac06..95e57d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gtk-doc-1.28.tar.xz) = 801c36802c98320496b88371b819da0026076d5e92ad115bf451e5c89424cc05e631d1145703395920350ec8cdf5389ba406f4a292a4101ccbab5b7c74b40c18 +SHA512 (gtk-doc-1.29.tar.xz) = 97e17be2563c2c12a04394633feaf6591918968a794c38e945a65be9c2de2bed5ce586592a7fe396a1874b8e43e63d6380c6d1a3193ccb7f9bb3d3a331526421