From ec170514a2a385dea711b5bb0a548f64c0e72d57 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 26 Jun 2019 08:54:54 +0000
Subject: user/gtk-doc: bump to 1.30

---
 ...el-parts-with-decimals-not-roman-numerals.patch | 76 ----------------------
 user/gtk-doc/APKBUILD                              | 22 +++----
 2 files changed, 8 insertions(+), 90 deletions(-)
 delete mode 100644 user/gtk-doc/0001-tests-Label-parts-with-decimals-not-roman-numerals.patch

(limited to 'user')

diff --git a/user/gtk-doc/0001-tests-Label-parts-with-decimals-not-roman-numerals.patch b/user/gtk-doc/0001-tests-Label-parts-with-decimals-not-roman-numerals.patch
deleted file mode 100644
index f53d261db..000000000
--- a/user/gtk-doc/0001-tests-Label-parts-with-decimals-not-roman-numerals.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From a8475278880270a3bf682d9552e26651081330ce Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Fri, 11 Aug 2017 21:19:28 +0200
-Subject: [PATCH] tests: Label parts with decimals, not roman numerals
-
-dblatex (via gtkdoc-mkpdf) warns that labels must be integers:
-
-    Warning: only an integer in @label can be processed: 'I'
-    Warning: only an integer in @label can be processed: 'II'
-    Warning: only an integer in @label can be processed: 'III'
-
-Make the labels decimal to placate dblatex. I'm not sure this is
-actually the best solution, though.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=786174
----
- tests/annotations/docs/tester-docs.xml | 4 ++--
- tests/gobject/docs/tester-docs.xml     | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/tests/annotations/docs/tester-docs.xml b/tests/annotations/docs/tester-docs.xml
-index e2abf74..7d80f9d 100644
---- a/tests/annotations/docs/tester-docs.xml
-+++ b/tests/annotations/docs/tester-docs.xml
-@@ -16,7 +16,7 @@
-     </releaseinfo>
-   </bookinfo>
- 
--  <reference label="II">
-+  <reference label="2">
-     <title>API Reference</title>
-     <chapter id="main-api">
-       <title>Tests</title>
-@@ -24,7 +24,7 @@
-     </chapter>
-   </reference>
- 
--  <part label="III">
-+  <part label="3">
-     <title>Appendix</title>
- 
-     <index id="api-index">
-diff --git a/tests/gobject/docs/tester-docs.xml b/tests/gobject/docs/tester-docs.xml
-index a534c55..05117ef 100644
---- a/tests/gobject/docs/tester-docs.xml
-+++ b/tests/gobject/docs/tester-docs.xml
-@@ -37,7 +37,7 @@
-     </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>
-@@ -45,7 +45,7 @@
-     </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>
-@@ -58,7 +58,7 @@
-     </chapter>
-   </reference>
- 
--  <part label="III" id="part.iii">
-+  <part label="3" id="part.iii">
-     <title>Appendix</title>
- 
-     <chapter id="object-tree">
--- 
-2.13.0
-
diff --git a/user/gtk-doc/APKBUILD b/user/gtk-doc/APKBUILD
index 193cd2f50..4dda99f7e 100644
--- a/user/gtk-doc/APKBUILD
+++ b/user/gtk-doc/APKBUILD
@@ -1,28 +1,25 @@
 # Maintainer: 
 pkgname=gtk-doc
-pkgver=1.29
-pkgrel=2
+pkgver=1.30
+pkgrel=0
 pkgdesc="Documentation tool for public library API"
 url="https://www.gtk.org/gtk-doc/"
 arch="noarch"
+# it does not seem to be possible to disable tests of pdf which requires dblatex or fop
+# disable checks for now
+options="!check"
 license="GFDL"
 depends="docbook-xsl perl python3 py3-six pkgconf glib-dev highlight"
 makedepends="rarian-dev py-libxml2 itstool autoconf automake libtool"
 checkdepends="bc"
-source="https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
-	0001-tests-Label-parts-with-decimals-not-roman-numerals.patch
-	"
-# it does not seem to be possible to disable tests of pdf which requires dblatex or fop
-# disable checks for now
-options="!check"
+source="https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
 
 prepare() {
-	cd "$builddir"
 	autoreconf -vif
+	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	export PYTHON="/usr/bin/python3"
 	./configure \
 		--build=$CBUILD \
@@ -33,14 +30,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="97e17be2563c2c12a04394633feaf6591918968a794c38e945a65be9c2de2bed5ce586592a7fe396a1874b8e43e63d6380c6d1a3193ccb7f9bb3d3a331526421  gtk-doc-1.29.tar.xz
-a86438a9cbbf1bb60d2aea93f10a473f3fe7814cdbf0a454ff42bea88e79f21f9e748e063335aa6332878fa8f8a1c00ef288a44631b510471cc6bb806851b391  0001-tests-Label-parts-with-decimals-not-roman-numerals.patch"
+sha512sums="8fde6aa89cdf0ce59999a17d7f1ecb51e63f93aa7514aeffac6504a357408151f8fb86431050285596e9da2a9612840969a42d7423e8df316e9dadddd5fc1612  gtk-doc-1.30.tar.xz"
-- 
cgit v1.2.3-70-g09d2