[arch-commits] Commit in gtk-doc/trunk (PKGBUILD fix.diff)
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 === --- PKGBUILD2019-11-12 16:58:25 UTC (rev 367996) +++ PKGBUILD2019-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.diff2019-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()):
[arch-commits] Commit in gtk-doc/trunk (PKGBUILD fix.diff)
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 === --- PKGBUILD2019-11-09 13:36:05 UTC (rev 367263) +++ PKGBUILD2019-11-09 14:08:11 UTC (rev 367264) @@ -1,8 +1,8 @@ # Maintainer: Jan de Groot 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.diff2019-11-09 13:36:05 UTC (rev 367263) +++ fix.diff2019-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 - )
[arch-commits] Commit in gtk-doc/trunk (PKGBUILD fix.diff fixperms.diff)
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 === --- PKGBUILD2019-08-06 13:59:19 UTC (rev 359252) +++ PKGBUILD2019-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.diff2019-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 - )