diff --git a/SOURCES/0001-scangobj-Make-G_MAXINT-appear-as-such-on-32-bit.patch b/SOURCES/0001-scangobj-Make-G_MAXINT-appear-as-such-on-32-bit.patch new file mode 100644 index 0000000..a6ec72e --- /dev/null +++ b/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 +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 + diff --git a/SPECS/gtk-doc.spec b/SPECS/gtk-doc.spec index 17cbc16..a5a439a 100644 --- a/SPECS/gtk-doc.spec +++ b/SPECS/gtk-doc.spec @@ -4,7 +4,7 @@ Name: gtk-doc Version: 1.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: API documentation generation tool for GTK+ and GNOME License: GPLv2+ and GFDL @@ -15,6 +15,10 @@ Source0: http://download.gnome.org/sources/gtk-doc/1.28/gtk-doc-%{version}.tar.x # 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 @@ -65,6 +69,10 @@ make check || make check %{_libdir}/cmake/ %changelog +* Mon Feb 01 2021 Kalev Lember - 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 - 1.28-2 - Backport a patch to fix x86_64/i686 differences in generated documentation - Resolves: #1634770