Update manual patch; fix manual building

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

3 files changed, 16 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 283109cb57df..512f6fd8716c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hydrogen-git
 	pkgdesc = An advanced drum machine (git version)
-	pkgver = 1.0.0.r203.gc4982c6d
+	pkgver = 1.1.0.beta1.r31.gacd1b9f7
 	pkgrel = 1
 	url = https://github.com/hydrogen-music/hydrogen
 	arch = x86_64
@@ -16,6 +16,7 @@ pkgbase = hydrogen-git
 	makedepends = liblrdf
 	makedepends = libpulse
 	makedepends = libsndfile
+	makedepends = libxml2
 	makedepends = portaudio
 	makedepends = portmidi
 	makedepends = python
@@ -33,14 +34,14 @@ pkgbase = hydrogen-git
 	depends = qt5-xmlpatterns
 	optdepends = new-session-manager: for session management
 	provides = hydrogen
-	provides = hydrogen=1.0.0
+	provides = hydrogen=1.1.0.beta1
 	conflicts = hydrogen
 	source = hydrogen::git://github.com/hydrogen-music/hydrogen.git
 	source = hydrogen-docs::git+https://github.com/hydrogen-music/documentation.git
 	source = fix_dtd_version.patch
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = 67122f71e3be7546d0b483f6fc923b19
+	md5sums = dac93731dd33285ebd129eae60161337
 
 pkgname = hydrogen-git
 	depends = gcc-libs
diff --git a/PKGBUILD b/PKGBUILD
index 444471bea329..63002eea61e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=hydrogen
 pkgname="${_pkgname}-git"
-pkgver=1.0.0.r203.gc4982c6d
+pkgver=1.1.0.beta1.r31.gacd1b9f7
 pkgrel=1
 pkgdesc="An advanced drum machine (git version)"
 arch=('x86_64')
@@ -12,8 +12,8 @@ groups=('pro-audio')
 url="https://github.com/hydrogen-music/hydrogen"
 depends=('gcc-libs' 'glibc' 'hicolor-icon-theme' 'qt5-base' 'qt5-xmlpatterns')
 makedepends=('git' 'alsa-lib' 'cmake' 'jack' 'ladspa' 'libarchive' 'liblo'
-             'liblrdf' 'libpulse' 'libsndfile' 'portaudio' 'portmidi' 'python'
-             'qt5-tools' 'docbook-xml' 'docbook-sgml' 'docbook-utils'
+             'liblrdf' 'libpulse' 'libsndfile' 'libxml2' 'portaudio' 'portmidi'
+             'python' 'qt5-tools' 'docbook-xml' 'docbook-sgml' 'docbook-utils'
              'docbook-xsl' 'poxml' 'xmlto')
 optdepends=('new-session-manager: for session management')
 source=("${_pkgname}"::'git://github.com/hydrogen-music/hydrogen.git'
@@ -23,7 +23,7 @@ provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}")
 conflicts=("${_pkgname}")
 md5sums=('SKIP'
          'SKIP'
-         '67122f71e3be7546d0b483f6fc923b19')
+         'dac93731dd33285ebd129eae60161337')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -70,9 +70,11 @@ build() {
     make
   # build html manual & tutorial
   cd "${srcdir}/${_pkgname}/data/doc"
-  make
+  msg2 "Making manual..."
+  make -j1
   # update translations
   cd "${srcdir}/${_pkgname}/data/i18n"
+  msg2 "Updating translations..."
   ./updateTranslations.sh
 }
 
@@ -90,8 +92,9 @@ package() {
   # install html manual & tutorial
   cd "${srcdir}/${_pkgname}/data/doc"
   install -Dm644 *.html -t "${pkgdir}/usr/share/${_pkgname}/data/doc"
-  install -Dm644 img/*.png img/*.h2song -t "${pkgdir}/usr/share/${_pkgname}/data/doc/img"
-  install -Dm644 img/nl/*.png -t "${pkgdir}/usr/share/${_pkgname}/data/doc/img/nl"
+  install -Dm644 *.ods -t "${pkgdir}/usr/share/${_pkgname}/data/doc"
+  install -Dm644 img/*.png -t "${pkgdir}/usr/share/${_pkgname}/data/doc/img"
+  install -Dm644 img/admonitions/*.svg -t "${pkgdir}/usr/share/${_pkgname}/data/doc/img/admonitions"
   install -Dm644 img_tutorial/*.png -t "${pkgdir}/usr/share/${_pkgname}/data/doc/img_tutorial"
 }
 
diff --git a/fix_dtd_version.patch b/fix_dtd_version.patch
index 01da7a1ed5a2..5ca1e488d103 100644
--- a/fix_dtd_version.patch
+++ b/fix_dtd_version.patch
@@ -1,22 +1,11 @@
---- a/data/doc/manual.docbook	2016-11-05 09:22:50.000000000 +0100
-+++ b/data/doc/manual.docbook	2017-07-28 18:03:51.938394459 +0200
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?> <!-- -*- mode:nxml; indent-tabs-mode:nil; fill-column:80; -*- -->
--  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN"
--                      "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
-+  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
-+                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
- <book id="Hydrogen-manual" lang="en">
- 
-   <bookinfo>
 --- a/data/doc/tutorial.docbook	2016-11-05 09:22:50.000000000 +0100
 +++ b/data/doc/tutorial.docbook	2017-07-28 18:03:51.938394459 +0200
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8"?>
 -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.0//EN"
 -               "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
-+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
-+               "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
++<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
++               "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
  <book id="Hydrogen-tutorial" lang="en">
  
  <bookinfo>