[arch-commits] Commit in gtk-doc/repos/extra-any (PKGBUILD PKGBUILD gtkdoc.patch)
Jan Steffens
heftig at archlinux.org
Fri Aug 11 13:31:22 UTC 2017
Date: Friday, August 11, 2017 @ 13:31:22
Author: heftig
Revision: 301923
archrelease: copy trunk to extra-any
Added:
gtk-doc/repos/extra-any/PKGBUILD
(from rev 301922, gtk-doc/trunk/PKGBUILD)
gtk-doc/repos/extra-any/gtkdoc.patch
(from rev 301922, gtk-doc/trunk/gtkdoc.patch)
Deleted:
gtk-doc/repos/extra-any/PKGBUILD
--------------+
PKGBUILD | 82 +++++++++++++++++++++++------------------
gtkdoc.patch | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 158 insertions(+), 36 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-08-11 13:30:46 UTC (rev 301922)
+++ PKGBUILD 2017-08-11 13:31:22 UTC (rev 301923)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gtk-doc
-pkgver=1.25+33+g567353f
-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 perl source-highlight glib2-docs python2)
-makedepends=(dblatex git yelp-tools)
-optdepends=('dblatex: PDF support')
-_commit=567353f33c01db9979ba76c772f7b11dbd3ec15f # master~6
-source=("git+https://git.gnome.org/browse/gtk-doc#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed -e 's/GTK_DOC_//' -e 's/_/\./g' -e 's/-/+/g'
-}
-prepare() {
- cd $pkgname
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $pkgname
- make DESTDIR="${pkgdir}" install
-}
Copied: gtk-doc/repos/extra-any/PKGBUILD (from rev 301922, gtk-doc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-08-11 13:31:22 UTC (rev 301923)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gtk-doc
+pkgver=1.26
+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 source-highlight glib2-docs python-six)
+makedepends=(dblatex git yelp-tools)
+checkdepends=(bc gtk3)
+optdepends=('dblatex: PDF support')
+_commit=4c7bf464748963b275e0bf656beb6c12d48924df # tags/GTK_DOC_1_26^0
+source=("git+https://git.gnome.org/browse/gtk-doc#commit=$_commit"
+ gtkdoc.patch)
+sha256sums=('SKIP'
+ '0ccf34e1a523b7a9dce3d66eca845847bcd985335c1d61168bdd7cde93b07552')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed -e 's/GTK_DOC_//' -e 's/_/\./g' -e 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ patch -Np1 -i ../gtkdoc.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+check() {
+ cd $pkgname
+ make check
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+}
Copied: gtk-doc/repos/extra-any/gtkdoc.patch (from rev 301922, gtk-doc/trunk/gtkdoc.patch)
===================================================================
--- gtkdoc.patch (rev 0)
+++ gtkdoc.patch 2017-08-11 13:31:22 UTC (rev 301923)
@@ -0,0 +1,112 @@
+diff --git i/tests/annotations/docs/tester-docs.xml w/tests/annotations/docs/tester-docs.xml
+index e2abf742039ad3c7..7d80f9daef5450b4 100644
+--- i/tests/annotations/docs/tester-docs.xml
++++ w/tests/annotations/docs/tester-docs.xml
+@@ -16,15 +16,15 @@
+ </releaseinfo>
+ </bookinfo>
+
+- <reference label="II">
++ <reference label="2">
+ <title>API Reference</title>
+ <chapter id="main-api">
+ <title>Tests</title>
+ <xi:include href="xml/tester.xml"/>
+ </chapter>
+ </reference>
+
+- <part label="III">
++ <part label="3">
+ <title>Appendix</title>
+
+ <index id="api-index">
+diff --git i/tests/common.py w/tests/common.py
+index 3f782208f8792f34..8b45f1d404e740ff 100755
+--- i/tests/common.py
++++ w/tests/common.py
+@@ -20,24 +20,33 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+
+-import mock
++try:
++ from unittest import mock
++except ImportError:
++ import mock
++
++try:
++ import builtins
++except ImportError:
++ import __builtin__ as builtins
++
+ import unittest
+
+ from gtkdoc import common
+
+
+ class TestUpdateFileIfChanged(unittest.TestCase):
+
+ @mock.patch('os.path.exists')
+ @mock.patch('os.rename')
+ def test_NoOldFile(self, os_rename, os_path_exists):
+ os_path_exists.return_value = False
+ res = common.UpdateFileIfChanged('/old', '/new', False)
+ os_rename.assert_called_with('/new', '/old')
+ self.assertTrue(res)
+
+ @mock.patch('os.path.exists')
+- @mock.patch('__builtin__.open', mock.mock_open(read_data='bar'))
++ @mock.patch('builtins.open', mock.mock_open(read_data='bar'))
+ @mock.patch('os.unlink')
+ def test_FilesAreTheSame(self, os_unlink, os_path_exists):
+ os_path_exists.return_value = True
+diff --git i/tests/gobject/docs/tester-docs.xml w/tests/gobject/docs/tester-docs.xml
+index a534c557b2d04d67..05117ef166ee0b49 100644
+--- i/tests/gobject/docs/tester-docs.xml
++++ w/tests/gobject/docs/tester-docs.xml
+@@ -37,28 +37,28 @@
+ </para>
+ </preface>
+
+- <part label="I" id="part.i">
++ <part label="1" id="part.i">
+ <title>Overview</title>
+ <chapter id="Overview-building">
+ <title>How to build the library</title>
+ <para></para>
+ </chapter>
+ </part>
+
+- <reference label="II" id="part.ii">
++ <reference label="2" id="part.ii">
+ <title>API Reference</title>
+ <chapter id="main-api">
+ <title>Tests</title>
+ <xi:include href="xml/object.xml"/>
+ <xi:include href="xml/object2.xml"/>
+ <xi:include href="xml/object3.xml"/>
+ <xi:include href="xml/iface.xml"/>
+ <xi:include href="xml/iface2.xml"/>
+ <xi:include href="xml/types.xml"/>
+ </chapter>
+ </reference>
+
+- <part label="III" id="part.iii">
++ <part label="3" id="part.iii">
+ <title>Appendix</title>
+
+ <chapter id="object-tree">
+diff --git i/tests/gtk-doc.make w/tests/gtk-doc.make
+index 808fda4f1db02dd3..cb8e164b53e80baf 100644
+--- i/tests/gtk-doc.make
++++ w/tests/gtk-doc.make
+@@ -141,6 +141,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF
+ sgml.stamp: sgml-build.stamp
+ @true
+
++$(DOC_MAIN_SGML_FILE): sgml-build.stamp
++ @true
++
+ xml/gtkdocentities.ent: Makefile
+ @$(MKDIR_P) $(@D) && ( \
+ echo "<!ENTITY package \"$(PACKAGE)\">"; \
More information about the arch-commits
mailing list