import gtk-doc-1.28-3.el8

SOURCES/0001-Please-make-the-output-reproducible.patch

@@ -0,0 +1,54 @@
+From 06eda7ca8fa42c654fd2ad861c1c43c1b395bc57 Mon Sep 17 00:00:00 2001
+From: Chris Lamb <lamby@debian.org>
+Date: Sat, 7 Dec 2019 13:56:24 +0000
+Subject: [PATCH] Please make the output reproducible
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Whilst working on the Reproducible Builds effort [0] we noticed that
+gtk-doc generates unreproducible output.
+
+There will likely be more issues but this one is at least fairly
+simple in that it iterates over a set structure when printing
+some .devhelp2 headers, for example:
+
+│ │ │ │ -    <sub name="Index of new API in 0.99.5" link="api-index-0-99-5.html"/>
+│ │ │ │ -    <sub name="Index of new API in 0.9.22" link="api-index-0-9-22.html"/>
+│ │ │ │      <sub name="Index of new API in 0.9.0" link="api-index-0-9-0.html"/>
+│ │ │ │ -    <sub name="Index of new API in 0.9.1" link="api-index-0-9-1.html"/>
+│ │ │ │ +    <sub name="Index of new API in 0.9.19" link="api-index-0-9-19.html"/>
+│ │ │ │      <sub name="Index of new API in 0.99.8" link="api-index-0-99-8.html"/>
+│ │ │ │ +    <sub name="Index of new API in 0.99.5" link="api-index-0-99-5.html"/>
+│ │ │ │      <sub name="Index of new API in 1.0" link="api-index-1-0.html"/>
+│ │ │ │ -    <sub name="Index of new API in 0.9.19" link="api-index-0-9-19.html"/>
+│ │ │ │      <sub name="Index of new API in 0.9.2" link="api-index-0-9-2.html"/>
+│ │ │ │ +    <sub name="Index of new API in 0.9.1" link="api-index-0-9-1.html"/>
+│ │ │ │ +    <sub name="Index of new API in 0.9.22" link="api-index-0-9-22.html"/>
+
+This was originally filed in Debian as #946311 [1].
+
+ [0] https://reproducible-builds.org/
+ [1] https://bugs.debian.org/946331
+
+Signed-off-by: Chris Lamb <lamby@debian.org>
+---
+ gtkdoc/mkdb.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtkdoc/mkdb.py b/gtkdoc/mkdb.py
+index 9404452..9184567 100644
+--- a/gtkdoc/mkdb.py
++++ b/gtkdoc/mkdb.py
+@@ -2491,7 +2491,7 @@ def OutputBook(main_file, book_top, book_bottom, obj_tree):
+     <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
+   </index>
+ ''')
+-        for version in set(Since.values()):
++        for version in sorted(set(Since.values())):
+             dash_version = version.replace('.', '-')
+             OUTPUT.write('''  <index id="api-index-%s" role="%s">
+     <title>Index of new API in %s</title>
+-- 
+2.26.2
+

SOURCES/0001-scangobj-Make-G_MAXINT-appear-as-such-on-32-bit.patch

@@ -0,0 +1,38 @@
+From 12f8e2014309403afc3bceabcea5e38b29fe5447 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 4 Sep 2018 09:50:15 +0200
+Subject: [PATCH] scangobj: Make G_MAXINT appear as such on 32-bit
+
+Don't overwrite the boundaries of integer properties when they match
+both G_MAXINT and G_MAXLONG. This also fixes a memory leak in the
+generated scanobj code.
+
+Closes: #49
+---
+ gtkdoc/scangobj.py | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/gtkdoc/scangobj.py b/gtkdoc/scangobj.py
+index 237863c..73c23b0 100644
+--- a/gtkdoc/scangobj.py
++++ b/gtkdoc/scangobj.py
+@@ -690,10 +690,12 @@ describe_unsigned_constant (gsize size, guint64 value)
+         else if (value == G_MAXUINT)
+           desc = g_strdup ("G_MAXUINT");
+       }
+-      if (value == (guint64)G_MAXLONG)
+-        desc = g_strdup ("G_MAXLONG");
+-      else if (value == G_MAXULONG)
+-        desc = g_strdup ("G_MAXULONG");
++      if (desc == NULL) {
++        if (value == (guint64)G_MAXLONG)
++          desc = g_strdup ("G_MAXLONG");
++        else if (value == G_MAXULONG)
++          desc = g_strdup ("G_MAXULONG");
++      }
+       break;
+     case 8:
+       if (value == G_MAXINT64)
+-- 
+2.29.2
+

SPECS/gtk-doc.spec

@@ -4,13 +4,21 @@
 
 Name: gtk-doc
 Version: 1.28
-Release: 1%{?dist}
+Release: 3%{?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
 
+# Backported from upstream
+# https://bugzilla.redhat.com/show_bug.cgi?id=1634770
+Patch0: 0001-Please-make-the-output-reproducible.patch
+
+# Backported from upstream
+# https://bugzilla.redhat.com/show_bug.cgi?id=1853142
+Patch1: 0001-scangobj-Make-G_MAXINT-appear-as-such-on-32-bit.patch
+
 BuildRequires: dblatex
 BuildRequires: docbook-utils
 BuildRequires: /usr/bin/xsltproc
@@ -61,6 +69,14 @@ make check || make check
 %{_libdir}/cmake/
 
 %changelog
+* Mon Feb 01 2021 Kalev Lember <klember@redhat.com> - 1.28-3
+- Backport an upstream patch to fix G_MAXINT appearing as G_MAXLONG on 32 bit
+- Related: #1853142
+
+* Mon Jul 20 2020 Kalev Lember <klember@redhat.com> - 1.28-2
+- Backport a patch to fix x86_64/i686 differences in generated documentation
+- Resolves: #1634770
+
 * Sat Mar 24 2018 Kalev Lember <klember@redhat.com> - 1.28-1
 - Update to 1.28
 - Switch to Python 3 (#1509660)