Date: Tuesday, November 12, 2019 @ 18:22:30
Author: arojas
Revision: 367997
Restore the parts of the patch that are still relevant
Added:
gtk-doc/trunk/fix.diff
Modified:
gtk-doc/trunk/PKGBUILD
----------+
PKGBUILD | 13 ++++++++++---
fix.diff | 30 ++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-12 16:58:25 UTC (rev 367996)
+++ PKGBUILD 2019-11-12 18:22:30 UTC (rev 367997)
@@ -2,7 +2,7 @@
pkgname=gtk-doc
pkgver=1.32
-pkgrel=1
+pkgrel=2
pkgdesc="Documentation tool for public library API"
url="https://www.gtk.org/gtk-doc/"
arch=(any)
@@ -13,8 +13,10 @@
checkdepends=(bc gtk3 python-six python-parameterized)
optdepends=('dblatex: PDF support')
_commit=7fce5688c973fca10951bfdbeab9acca034aa095 # tags/GTK_DOC_1_32^0
-source=("git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit")
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit"
+ fix.diff)
+sha256sums=('SKIP'
+ '0391f47af6bd11bdc870ba826836612c68f538a12bc12fe0b4f34e6c11482baf')
pkgver() {
cd $pkgname
@@ -21,6 +23,11 @@
git describe --tags | sed -e 's/GTK_DOC_//' -e 's/_/\./g' -e 's/-/+/g'
}
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../fix.diff
+}
+
build() {
arch-meson $pkgname build
ninja -C build
Added: fix.diff
===================================================================
--- fix.diff (rev 0)
+++ fix.diff 2019-11-12 18:22:30 UTC (rev 367997)
@@ -0,0 +1,30 @@
+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()):