commit 1239a33071087ed31ee2dfaf9391ae14fc60265a
Author: Jakub Bogusz <[email protected]>
Date: Fri Jul 2 06:31:44 2021 +0200
- enhanced struct-end patch not to crash on empty row after nested
struct/union (NetworkManager case)
- relese 5
gtk-doc-struct-end.patch | 11 +++++++++++
gtk-doc.spec | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/gtk-doc.spec b/gtk-doc.spec
index f338126..381b1b0 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8): Narzędzie do generowania dokumentacji
API do GTK+ i GNOME
Summary(pt_BR.UTF-8): O gerador de documentação do GTK
Name: gtk-doc
Version: 1.33.2
-Release: 4
+Release: 5
License: GPL v2+
Group: Development/Tools
Source0:
https://download.gnome.org/sources/gtk-doc/1.33/%{name}-%{version}.tar.xz
diff --git a/gtk-doc-struct-end.patch b/gtk-doc-struct-end.patch
index d637385..70ca597 100644
--- a/gtk-doc-struct-end.patch
+++ b/gtk-doc-struct-end.patch
@@ -2,6 +2,17 @@ Detect struct end (and don't crash) on indented "}".
--- gtk-doc-1.33.2/gtkdoc/scan.py.orig 2021-06-21 17:26:04.628579149 +0200
+++ gtk-doc-1.33.2/gtkdoc/scan.py 2021-06-21 17:26:07.118565660 +0200
+@@ -839,6 +839,10 @@ def ScanHeaderContent(input_lines, decl_
+ logging.info('skipping, in decl %s, decl=[%s]', in_declaration,
decl)
+ continue
+
++ if line.strip() == "":
++ # avoid matching ';' from previous line by ';\s*$'
++ continue
++
+ if in_declaration == "g-declare":
+ dm =
re.search(r'\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*\).*$',
decl)
+ # FIXME the original code does s// stuff here and we don't. Is it
necessary?
@@ -941,7 +941,7 @@
# comments will cause problems.
if in_declaration == 'struct' or in_declaration == 'union':
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-doc.git/commitdiff/1239a33071087ed31ee2dfaf9391ae14fc60265a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
