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
This commit is contained in:
Kalev Lember 2019-11-28 14:42:51 +01:00
parent 712a8e508b
commit 75fe7ae897
2 changed files with 39 additions and 1 deletions

View File

@ -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

View File

@ -8,13 +8,19 @@
Name: gtk-doc
Version: 1.32
Release: 1%{?dist}
Release: 2%{?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.32/gtk-doc-%{version}.tar.xz
# 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
@ -71,6 +77,9 @@ fi
%{_datadir}/cmake/
%changelog
* 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