[arch-commits] Commit in gtk-doc/trunk (PKGBUILD fix.diff fixperms.diff)

[Jan Steffens]

    Date: Tuesday, August 6, 2019 @ 13:59:49
  Author: heftig
Revision: 359253

1.31-2

Added:
  gtk-doc/trunk/fix.diff
    (from rev 359252, gtk-doc/trunk/fixperms.diff)
Modified:
  gtk-doc/trunk/PKGBUILD
Deleted:
  gtk-doc/trunk/fixperms.diff

---------------+
 PKGBUILD      |    8 ++++----
 fix.diff      |   41 +++++++++++++++++++++++++++++++++++++++++
 fixperms.diff |   26 --------------------------
 3 files changed, 45 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-06 13:59:19 UTC (rev 359252)
+++ PKGBUILD	2019-08-06 13:59:49 UTC (rev 359253)
@@ -2,7 +2,7 @@
 
 pkgname=gtk-doc
 pkgver=1.31
-pkgrel=1
+pkgrel=2
 pkgdesc="Documentation tool for public library API"
 url="https://www.gtk.org/gtk-doc/"
 arch=(any)
@@ -14,9 +14,9 @@
 optdepends=('dblatex: PDF support')
 _commit=c268fa535424d193953487c694e2a8f770d3255f  # tags/GTK_DOC_1_31^0
 source=("git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit"
-        fixperms.diff)
+        fix.diff)
 sha256sums=('SKIP'
-            '6264dc71d0c21f46c139691bf4ea98dd404549f8e4f93a45e93a3ee47753e2d4')
+            '25362c503667167f71f6991dc3d42d6a2a0bae4e6ecd128d9d2f9c62c4f5c74b')
 
 pkgver() {
   cd $pkgname
@@ -25,7 +25,7 @@
 
 prepare() {
   cd $pkgname
-  patch -Np1 -i ../fixperms.diff
+  patch -Np1 -i ../fix.diff
 }
 
 build() {

Copied: gtk-doc/trunk/fix.diff (from rev 359252, gtk-doc/trunk/fixperms.diff)
===================================================================
--- fix.diff	                        (rev 0)
+++ fix.diff	2019-08-06 13:59:49 UTC (rev 359253)
@@ -0,0 +1,41 @@
+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 d04d4d4..2103d02 100644
+--- i/gtkdoc/scan.py
++++ w/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()):
+diff --git i/meson.build w/meson.build
+index 85e83ca..5e4d288 100644
+--- i/meson.build
++++ w/meson.build
+@@ -1,5 +1,5 @@
+ project('gtk-doc', 'c',
+-  version: '1.30.1',
++  version: '1.31',
+   license: 'GPL2+',
+   meson_version: '>= 0.50.0', # needed for https://mesonbuild.com/Python-module.html#path
+ )

Deleted: fixperms.diff
===================================================================
--- fixperms.diff	2019-08-06 13:59:19 UTC (rev 359252)
+++ fixperms.diff	2019-08-06 13:59:49 UTC (rev 359253)
@@ -1,26 +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/meson.build w/meson.build
-index 85e83ca..5e4d288 100644
---- i/meson.build
-+++ w/meson.build
-@@ -1,5 +1,5 @@
- project('gtk-doc', 'c',
--  version: '1.30.1',
-+  version: '1.31',
-   license: 'GPL2+',
-   meson_version: '>= 0.50.0', # needed for https://mesonbuild.com/Python-module.html#path
- )