Compare commits
No commits in common. "c8" and "c9-beta" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
SOURCES/gtk-doc-1.28.tar.xz
|
||||
SOURCES/gtk-doc-1.33.2.tar.xz
|
||||
|
||||
@ -1 +1 @@
|
||||
f48311fd3def5b393ebb32d5480a61ec6dfd2809 SOURCES/gtk-doc-1.28.tar.xz
|
||||
d48fc5e2ca19eef9420732625cfd53e40b331baf SOURCES/gtk-doc-1.33.2.tar.xz
|
||||
|
||||
@ -0,0 +1,29 @@
|
||||
From 0535ffb16de159c42f413f4d1b4e9f2f77395986 Mon Sep 17 00:00:00 2001
|
||||
From: Kalev Lember <klember@redhat.com>
|
||||
Date: Thu, 28 Nov 2019 14:38:59 +0100
|
||||
Subject: [PATCH] Partially revert a gtk-doc 1.31 change that broke e-d-s and
|
||||
NM builds
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1775560
|
||||
---
|
||||
gtkdoc/scan.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
|
||||
index d04d4d4..2103d02 100644
|
||||
--- a/gtkdoc/scan.py
|
||||
+++ b/gtkdoc/scan.py
|
||||
@@ -961,8 +961,8 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options):
|
||||
logging.info('struct/union level : %d', level)
|
||||
|
||||
# here we want in_declaration=='', otherwise we have a partial declaration
|
||||
- if in_declaration != '':
|
||||
- raise RuntimeError('partial declaration (%s) : %s ' % (in_declaration, decl))
|
||||
+ #if in_declaration != '':
|
||||
+ # raise RuntimeError('partial declaration (%s) : %s ' % (in_declaration, decl))
|
||||
|
||||
# print remaining forward declarations
|
||||
for symbol in sorted(forward_decls.keys()):
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,54 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From c8c288ab35f913603fb3f49dd4141aacbd7e8562 Mon Sep 17 00:00:00 2001
|
||||
From: Lubomir Rintel <lkundrak@v3.sk>
|
||||
Date: Fri, 29 Jun 2018 21:45:28 +0200
|
||||
Subject: [PATCH] scan: set title also when the class structure is opaque
|
||||
|
||||
libnm doesn't like to include the structure definitions of many object
|
||||
types in a public header, since they're not supposed to be subclassed
|
||||
and maintaining a stable ABI would me a maintanance burden:
|
||||
|
||||
nm-setting-user.c: struct _NMSettingUserClass { ... };
|
||||
nm-setting-user.h: typedef struct _NMSettingUserClass NMSettingUserClass;
|
||||
|
||||
However, gtkdoc-scan only sets <TITLE> for Class/Iface typedefs only when the
|
||||
structs are defined in the header. Fix that.
|
||||
---
|
||||
gtkdoc/scan.py | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
|
||||
index f1f1672..b59dd17 100644
|
||||
--- a/gtkdoc/scan.py
|
||||
+++ b/gtkdoc/scan.py
|
||||
@@ -434,6 +434,12 @@ def ScanHeader(input_file, section_list, decl_list, get_types, options):
|
||||
forward_decls[m9.group(2)] = '<%s>\n<NAME>%s</NAME>\n%s</%s>\n' % (
|
||||
structsym, m9.group(2), deprecated, structsym)
|
||||
|
||||
+ bm = re.search(r'^(\S+)(Class|Iface|Interface)\b', m9.group(2))
|
||||
+ if bm:
|
||||
+ objectname = bm.group(1)
|
||||
+ logging.info('Found object: "%s"', objectname)
|
||||
+ title = '<TITLE>%s</TITLE>' % objectname
|
||||
+
|
||||
elif re.search(r'^\s*(?:struct|union)\s+_(\w+)\s*;', line):
|
||||
# Skip private structs/unions.
|
||||
logging.info('private struct/union')
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,41 +1,40 @@
|
||||
%global debug_package %{nil}
|
||||
|
||||
%global __python %{__python3}
|
||||
|
||||
Name: gtk-doc
|
||||
Version: 1.28
|
||||
Release: 4%{?dist}
|
||||
Version: 1.33.2
|
||||
Release: 5%{?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
|
||||
URL: https://gitlab.gnome.org/GNOME/gtk-doc/
|
||||
Source0: http://download.gnome.org/sources/%{name}/1.33/%{name}-%{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
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2052721
|
||||
Patch2: gtk-doc-1.28-fix-opaque-class.patch
|
||||
# Partially revert a gtk-doc 1.31 change that broke e-d-s and NM builds
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1775560
|
||||
# https://gitlab.gnome.org/GNOME/gtk-doc/issues/98
|
||||
# https://gitlab.gnome.org/GNOME/gtk-doc/issues/110
|
||||
Patch0: 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
|
||||
|
||||
BuildRequires: dblatex
|
||||
BuildRequires: docbook-utils
|
||||
BuildRequires: /usr/bin/xsltproc
|
||||
BuildRequires: docbook-style-xsl
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gettext
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: meson
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-six
|
||||
BuildRequires: source-highlight
|
||||
BuildRequires: python3-pygments
|
||||
%if 0%{?fedora}
|
||||
BuildRequires: python3-parameterized
|
||||
%endif
|
||||
BuildRequires: python3-lxml
|
||||
BuildRequires: yelp-tools
|
||||
|
||||
# Following are not automatically installed
|
||||
Requires: docbook-utils /usr/bin/xsltproc docbook-style-xsl
|
||||
Requires: python3-six
|
||||
Requires: source-highlight
|
||||
Requires: python3-pygments
|
||||
Requires: python3-lxml
|
||||
|
||||
%description
|
||||
gtk-doc is a tool for generating API reference documentation.
|
||||
@ -49,39 +48,98 @@ and GNOME.
|
||||
mv doc/README doc/README.docs
|
||||
|
||||
%build
|
||||
export PYTHON=%{__python3}
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%meson_install
|
||||
|
||||
%py_byte_compile %{__python3} %{buildroot}%{_datadir}/gtk-doc/
|
||||
|
||||
%if 0%{?fedora}
|
||||
%check
|
||||
# For reasons unknown first make check fails with texlive debug spew in log
|
||||
# files. Just run it twice to work this around.
|
||||
make check || make check
|
||||
%meson_test
|
||||
%endif
|
||||
|
||||
%files
|
||||
%license COPYING COPYING-DOCS
|
||||
%doc AUTHORS README doc/* examples
|
||||
%{_bindir}/*
|
||||
%{_datadir}/aclocal/
|
||||
%{_datadir}/aclocal/gtk-doc.m4
|
||||
%{_datadir}/gtk-doc/
|
||||
%{_datadir}/pkgconfig/gtk-doc.pc
|
||||
%{_datadir}/help/*/gtk-doc-manual/
|
||||
%{_libdir}/cmake/
|
||||
|
||||
%changelog
|
||||
* Thu Apr 07 2022 David King <dking@redhat.com> - 1.28-4
|
||||
- Generate documentation for forward declarations (#2052721)
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.33.2-5
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* 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
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.33.2-4
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* 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
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.33.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jan 20 2021 Kalev Lember <klember@redhat.com> - 1.33.2-2
|
||||
- Drop no longer needed python3-anytree requires
|
||||
|
||||
* Tue Jan 19 2021 Kalev Lember <klember@redhat.com> - 1.33.2-1
|
||||
- Update to 1.33.2
|
||||
|
||||
* Tue Jan 19 2021 David King <amigadave@amigadave.com> - 1.33.1-3
|
||||
- Disable test suite on non-Fedora
|
||||
|
||||
* Mon Jan 18 2021 David King <amigadave@amigadave.com> - 1.33.1-2
|
||||
- Remove unused runtime dependency on python3-parameterized
|
||||
- Update URL (#1905556)
|
||||
|
||||
* Tue Nov 17 2020 Kalev Lember <klember@redhat.com> - 1.33.1-1
|
||||
- Update to 1.33.1
|
||||
|
||||
* Thu Oct 01 2020 Kalev Lember <klember@redhat.com> - 1.33-1
|
||||
- Update to 1.33
|
||||
- Switch to meson build system
|
||||
- Explicitly byte-compile python files using py_byte_compile macro
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.32-5
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.32-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.32-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Nov 28 2019 Kalev Lember <klember@redhat.com> - 1.32-2
|
||||
- Partially revert a gtk-doc 1.31 change that broke e-d-s and NM builds (#1775560)
|
||||
|
||||
* Mon Nov 11 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.32-1
|
||||
- Update to 1.32
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 1.29-3
|
||||
- Avoid owning /usr/share/aclocal dir as it's part of filesystem rpm now
|
||||
(#1672131)
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 1.29-1
|
||||
- Update to 1.29
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.28-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.28-3
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Thu May 10 2018 Adam Williamson <awilliam@redhat.com> - 1.28-2
|
||||
- Fix a couple of crasher bugs encountered by halfline (BGO#79601{1,2))
|
||||
|
||||
* Sat Mar 24 2018 Kalev Lember <klember@redhat.com> - 1.28-1
|
||||
- Update to 1.28
|
||||
|
||||
Loading…
Reference in New Issue
Block a user