[arch-commits] Commit in gtk-doc/trunk (3 files)

[Jan Steffens]

    Date: Friday, March 19, 2021 @ 10:23:13
  Author: heftig
Revision: 410286

replace patch

Added:
  gtk-doc/trunk/0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
    (from rev 410285, gtk-doc/trunk/fix.diff)
Modified:
  gtk-doc/trunk/PKGBUILD
Deleted:
  gtk-doc/trunk/fix.diff

-----------------------------------------------------------------+
 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch |   28 +++++++++
 PKGBUILD                                                        |    8 +-
 fix.diff                                                        |   30 ----------
 3 files changed, 33 insertions(+), 33 deletions(-)

Copied: gtk-doc/trunk/0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch (from rev 410285, gtk-doc/trunk/fix.diff)
===================================================================
--- 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch	                        (rev 0)
+++ 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch	2021-03-19 10:23:13 UTC (rev 410286)
@@ -0,0 +1,28 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember at 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
+
+Bug: https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/98
+Bug: https://gitlab.gnome.org/GNOME/gtk-doc/-/issues/110
+Bug-Fedora: 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 4b5b8a9..7963840 100644
+--- a/gtkdoc/scan.py
++++ b/gtkdoc/scan.py
+@@ -978,8 +978,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()):

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-19 10:18:07 UTC (rev 410285)
+++ PKGBUILD	2021-03-19 10:23:13 UTC (rev 410286)
@@ -15,9 +15,9 @@
 optdepends=('dblatex: PDF support')
 _commit=14391142ee9d43da116f0f530746ae34cc46930a  # tags/1.33.2^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit"
-        fix.diff)
+        0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch)
 sha256sums=('SKIP'
-            '120d6d92fe2040b3500fee17a9c52e3f427cec70637d7aa71dbd561226103237')
+            '95208f0e0dd6e888892b04e3396b131218d1d98e433edfbd4af70b158921319c')
 
 pkgver() {
   cd $pkgname
@@ -26,7 +26,9 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../fix.diff
+
+  # https://gitlab.gnome.org/GNOME/gtk-doc/-/merge_requests/58
+  git apply -3 ../0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch
 }
 
 build() {

Deleted: fix.diff
===================================================================
--- fix.diff	2021-03-19 10:18:07 UTC (rev 410285)
+++ fix.diff	2021-03-19 10:23:13 UTC (rev 410286)
@@ -1,30 +0,0 @@
-diff --git i/gtkdoc/highlight.py w/gtkdoc/highlight.py
-index ba1c601..226aa12 100644
---- i/gtkdoc/highlight.py
-+++ w/gtkdoc/highlight.py
-@@ -46,6 +46,9 @@ def highlight_code(code, lang='c'):
- 
- 
- def append_style_defs(css_file_name):
--    os.chmod(css_file_name, 0o644)
-+    try:
-+        os.chmod(css_file_name, 0o644)
-+    except OSError:
-+        pass
-     with open(css_file_name, 'at', newline='\n', encoding='utf-8') as css:
-         css.write(HTML_FORMATTER.get_style_defs())
-diff --git i/gtkdoc/scan.py w/gtkdoc/scan.py
-index 4b5b8a9..7963840 100644
---- i/gtkdoc/scan.py
-+++ w/gtkdoc/scan.py
-@@ -978,8 +978,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()):