Fix git source URL and some PKGBUILD cleanup

3 files changed, 47 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbe246150967..60687972ac07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = hydrogen-git
 	pkgdesc = An advanced drum machine (git version)
-	pkgver = 1.1.0.beta1.r31.gacd1b9f7
-	pkgrel = 2
+	pkgver = 1.1.1.r1064.ga219c3092
+	pkgrel = 1
 	url = https://github.com/hydrogen-music/hydrogen
 	arch = x86_64
 	groups = pro-audio
@@ -35,9 +35,9 @@ pkgbase = hydrogen-git
 	depends = qt5-xmlpatterns
 	optdepends = new-session-manager: for session management
 	provides = hydrogen
-	provides = hydrogen=1.1.0.beta1
+	provides = hydrogen=1.1.1
 	conflicts = hydrogen
-	source = hydrogen::git://github.com/hydrogen-music/hydrogen.git
+	source = hydrogen::git+https://github.com/hydrogen-music/hydrogen.git
 	source = hydrogen-docs::git+https://github.com/hydrogen-music/documentation.git
 	source = fix_dtd_version.patch
 	md5sums = SKIP
@@ -60,4 +60,3 @@ pkgname = hydrogen-git
 	depends = libportmidi.so
 	depends = libpulse.so
 	depends = libsndfile.so
-
diff --git a/.gitignore b/.gitignore
index b6c6724e9ab9..65df3077355b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 pkg/
 src/
-.AURINFO
 hydrogen/
 hydrogen-docs/
 hydrogen-git-*.pkg.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 4e8b0a0a0ee0..ace84940956a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,31 +2,31 @@
 # Contributor: hbdee <hbdee.arch@gmail.com>
 
 _pkgname=hydrogen
-pkgname="${_pkgname}-git"
-pkgver=1.1.0.beta1.r31.gacd1b9f7
-pkgrel=2
-pkgdesc="An advanced drum machine (git version)"
-arch=('x86_64')
-license=('GPL')
-groups=('pro-audio')
+pkgname="$_pkgname-git"
+pkgver=1.1.1.r1064.ga219c3092
+pkgrel=1
+pkgdesc='An advanced drum machine (git version)'
+arch=(x86_64)
+license=(GPL)
+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' 'itstool' 'jack' 'ladspa' 'libarchive' 'liblo'
-             'liblrdf' 'libpulse' 'libsndfile' 'libxml2' 'portaudio' 'portmidi'
-             'python' 'qt5-tools' 'docbook-xml' 'docbook-sgml' 'docbook-utils'
-             'docbook-xsl' 'poxml' 'xmlto')
+depends=(gcc-libs glibc hicolor-icon-theme qt5-base qt5-xmlpatterns)
+makedepends=(git alsa-lib cmake itstool jack ladspa libarchive liblo
+             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'
-        "hydrogen-docs::git+https://github.com/hydrogen-music/documentation.git"
+source=($_pkgname::'git+https://github.com/hydrogen-music/hydrogen.git'
+        'hydrogen-docs::git+https://github.com/hydrogen-music/documentation.git'
         'fix_dtd_version.patch')
-provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}")
-conflicts=("${_pkgname}")
+provides=($_pkgname "$_pkgname=${pkgver//.r*/}")
+conflicts=($_pkgname)
 md5sums=('SKIP'
          'SKIP'
          'dac93731dd33285ebd129eae60161337')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
+  cd $_pkgname
 
   ( set -o pipefail
     git describe --long --tags 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
@@ -35,30 +35,24 @@ pkgver() {
 }
 
 prepare() {
-  cd "${srcdir}/${_pkgname}"
-
-  if [[ -d build ]]; then
-    rm -rf build
-  fi
-
-  mkdir build
+  cd $_pkgname
 
   # link docs sources
   git submodule init
-  git config submodule.doc.url "${srcdir}/hydrogen-docs"
+  git config submodule.doc.url "$srcdir"/hydrogen-docs
   git submodule update
 
   # update docbook dtd version
-  patch -Np1 -r - -i "${srcdir}/fix_dtd_version.patch" || true
+  patch -Np1 -r - -i "$srcdir"/fix_dtd_version.patch || true
 }
 
 build() {
-  cd "${srcdir}/${_pkgname}/build"
+  cd $_pkgname
 
-  cmake .. \
-    -DCMAKE_BUILD_TYPE='None' \
-    -DCMAKE_INSTALL_LIBDIR=lib \
+  cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_BUILD_TYPE=None \
     -DWANT_CPPUNIT=OFF \
     -DWANT_DEBUG=OFF \
     -DWANT_LASH=OFF \
@@ -66,36 +60,38 @@ build() {
     -DWANT_PORTAUDIO=ON \
     -DWANT_PORTMIDI=ON \
     -DWANT_PULSEAUDIO=ON \
-    -Wno-dev
-    make
+    -Wno-dev \
+    -B build \
+    -S .
+  make VERBOSE=1 -C build
   # build html manual & tutorial
-  cd "${srcdir}/${_pkgname}/data/doc"
+  cd data/doc
   msg2 "Making manual..."
   make -j1
   # update translations
-  cd "${srcdir}/${_pkgname}/data/i18n"
+  cd ../i18n
   msg2 "Updating translations..."
   ./updateTranslations.sh
 }
 
 package() {
-  depends+=('libarchive.so' 'libasound.so' 'liblo.so' 'libjack.so' 'liblrdf.so'
-            'liblo.so' 'libportaudio.so' 'libportmidi.so' 'libpulse.so'
-            'libsndfile.so')
-  cd "${srcdir}/${_pkgname}/build"
+  depends+=(libarchive.so libasound.so liblo.so libjack.so liblrdf.so
+            liblo.so libportaudio.so libportmidi.so libpulse.so
+            libsndfile.so)
+  cd $_pkgname
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" -C build install
 
   # install docs
-  install -t "${pkgdir}/usr/share/doc/${pkgname}" \
-    -vDm644 ../{ChangeLog,DEVELOPERS,INSTALL.md,README.txt}
+  install -vDm644 ChangeLog DEVELOPERS INSTALL.md README.txt \
+      -t "$pkgdir"/usr/share/doc/$pkgname
   # install html manual & tutorial
-  cd "${srcdir}/${_pkgname}/data/doc"
-  install -Dm644 *.html -t "${pkgdir}/usr/share/${_pkgname}/data/doc"
-  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"
+  cd data/doc
+  install -Dm644 *.html -t "$pkgdir"/usr/share/$_pkgname/data/doc
+  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
 }
 
 # vim:set ts=2 sw=2 et: