Date: Saturday, November 9, 2019 @ 14:08:11 Author: arojas Revision: 367264
Update to 1.32 Modified: gtk-doc/trunk/PKGBUILD Deleted: gtk-doc/trunk/fix.diff ----------+ PKGBUILD | 17 +++++------------ fix.diff | 41 ----------------------------------------- 2 files changed, 5 insertions(+), 53 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-11-09 13:36:05 UTC (rev 367263) +++ PKGBUILD 2019-11-09 14:08:11 UTC (rev 367264) @@ -1,8 +1,8 @@ # Maintainer: Jan de Groot <j...@archlinux.org> pkgname=gtk-doc -pkgver=1.31 -pkgrel=2 +pkgver=1.32 +pkgrel=1 pkgdesc="Documentation tool for public library API" url="https://www.gtk.org/gtk-doc/" arch=(any) @@ -12,11 +12,9 @@ makedepends=(dblatex git yelp-tools meson) checkdepends=(bc gtk3 python-six python-parameterized) optdepends=('dblatex: PDF support') -_commit=c268fa535424d193953487c694e2a8f770d3255f # tags/GTK_DOC_1_31^0 -source=("git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit" - fix.diff) -sha256sums=('SKIP' - '25362c503667167f71f6991dc3d42d6a2a0bae4e6ecd128d9d2f9c62c4f5c74b') +_commit=7fce5688c973fca10951bfdbeab9acca034aa095 # tags/GTK_DOC_1_32^0 +source=("git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd $pkgname @@ -23,11 +21,6 @@ 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 Deleted: fix.diff =================================================================== --- fix.diff 2019-11-09 13:36:05 UTC (rev 367263) +++ fix.diff 2019-11-09 14:08:11 UTC (rev 367264) @@ -1,41 +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 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 - )