Date: Tuesday, November 12, 2019 @ 18:23:03
Author: arojas
Revision: 367998
archrelease: copy trunk to extra-any
Added:
gtk-doc/repos/extra-any/PKGBUILD
(from rev 367997, gtk-doc/trunk/PKGBUILD)
gtk-doc/repos/extra-any/fix.diff
(from rev 367997, gtk-doc/trunk/fix.diff)
Deleted:
gtk-doc/repos/extra-any/PKGBUILD
----------+
PKGBUILD | 79 +++++++++++++++++++++++++++++++++----------------------------
fix.diff | 30 +++++++++++++++++++++++
2 files changed, 73 insertions(+), 36 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-11-12 18:22:30 UTC (rev 367997)
+++ PKGBUILD 2019-11-12 18:23:03 UTC (rev 367998)
@@ -1,36 +0,0 @@
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgname=gtk-doc
-pkgver=1.32
-pkgrel=1
-pkgdesc="Documentation tool for public library API"
-url="https://www.gtk.org/gtk-doc/";
-arch=(any)
-license=(GPL FDL)
-depends=(docbook-xsl docbook-xml glib2-docs python-lxml python-pygments
- python-anytree)
-makedepends=(dblatex git yelp-tools meson)
-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')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed -e 's/GTK_DOC_//' -e 's/_/\./g' -e 's/-/+/g'
-}
-
-build() {
- arch-meson $pkgname build
- ninja -C build
-}
-
-check() {
- # Tests don't work yet
- meson test -C build --print-errorlogs || :
-}
-
-package() {
- DESTDIR="$pkgdir" meson install -C build
-}
Copied: gtk-doc/repos/extra-any/PKGBUILD (from rev 367997,
gtk-doc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-11-12 18:23:03 UTC (rev 367998)
@@ -0,0 +1,43 @@
+# Maintainer: Jan de Groot <j...@archlinux.org>
+
+pkgname=gtk-doc
+pkgver=1.32
+pkgrel=2
+pkgdesc="Documentation tool for public library API"
+url="https://www.gtk.org/gtk-doc/";
+arch=(any)
+license=(GPL FDL)
+depends=(docbook-xsl docbook-xml glib2-docs python-lxml python-pygments
+ python-anytree)
+makedepends=(dblatex git yelp-tools meson)
+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";
+ fix.diff)
+sha256sums=('SKIP'
+ '0391f47af6bd11bdc870ba826836612c68f538a12bc12fe0b4f34e6c11482baf')
+
+pkgver() {
+ cd $pkgname
+ 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
+}
+
+check() {
+ # Tests don't work yet
+ meson test -C build --print-errorlogs || :
+}
+
+package() {
+ DESTDIR="$pkgdir" meson install -C build
+}
Copied: gtk-doc/repos/extra-any/fix.diff (from rev 367997,
gtk-doc/trunk/fix.diff)
===================================================================
--- fix.diff (rev 0)
+++ fix.diff 2019-11-12 18:23:03 UTC (rev 367998)
@@ -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()):
