- enhanced struct-end patch not to crash on empty row after nested struct/union ...

- relese 5

diff --git a/gtk-doc-struct-end.patch b/gtk-doc-struct-end.patch
index d6373855505de71be8ed36a62edba7bfaba1ae7f..70ca59739b5eff1ce6ef48df786f96e5df05d448 100644 (file)
--- 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':

diff --git a/gtk-doc.spec b/gtk-doc.spec
index f338126e63bc5c06645ac9da405a72965a60490a..381b1b0e8b61b7f306b27e9b3a4165e6439d959f 100644 (file)
--- 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