[arch-commits] Commit in subsurface/trunk (PKGBUILD)

[David Runge]

    Date: Thursday, October 15, 2020 @ 16:18:59
  Author: dvzrv
Revision: 724174

upgpkg: subsurface 4.9.6-3: Rebuild against libgit2 1.1.0.

Add all available sodeps in package() and the respective packages in makedepends.
Move libusb from depends to makedepends as it is only required during build time.
Apply latest cmake packaging guidelines.
Update contributor info.

Modified:
  subsurface/trunk/PKGBUILD

----------+
 PKGBUILD |   43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-15 16:15:09 UTC (rev 724173)
+++ PKGBUILD	2020-10-15 16:18:59 UTC (rev 724174)
@@ -1,37 +1,42 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: David Runge <dvzrv at archlinux.org>
 # Contributor: Francois Boulogne <fboulogne at april dot org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
 
 pkgname=subsurface
 _pkgname=Subsurface
 pkgver=4.9.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Divelog program'
 url='https://subsurface-divelog.org/'
 license=('GPL2')
 arch=('x86_64')
-makedepends=('cmake' 'asciidoc' 'qt5-tools')
-depends=('libzip' 'libxml2' 'libxslt' 'sqlite' 'libusb' 'libgit2'
-         'subsurface-libdc' 'qt5-svg' 'qt5-location'
-         'qt5-connectivity' 'qt5-webkit' 'grantlee' 'googlemaps')
+makedepends=('asciidoc' 'cmake' 'libgit2' 'libusb' 'qt5-tools')
+depends=('googlemaps' 'grantlee' 'hicolor-icon-theme' 'libzip' 'libxml2'
+'libxslt' 'subsurface-libdc' 'qt5-svg' 'qt5-location' 'qt5-connectivity'
+'qt5-webkit' 'sqlite')
 source=("https://subsurface-divelog.org/downloads/${_pkgname}-${pkgver}.tgz")
-sha256sums=('fed9485958f2b37d0efd8702b63a23eae1abfab0f01e1de1946aad5701c59f34')
+sha512sums=('6bef6a17e505aad2ab3d395483b3890ab358cc3c352671fc41f8e0fd946daee27f6aac98da3ed6f75cac7a148047581ad069d757714f40814f7bb0d950215564')
+b2sums=('2df46f721817c363904dd15f39266ea6d9d29686cad7c541996a28fe05c1c22d67563c2c58f7147c458c5b7746c4cba8bfd0e5bcf277d7360fa85efa80a4800f')
 
 # qt5-webkit still used for: printing, manual
 
+prepare() {
+  mv -v "${_pkgname}-${pkgver}" "${pkgname}-${pkgver}"
+}
+
 build() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	install -d build
-	cd build
-	cmake \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DLIBDIVECOMPUTER_INCLUDE_DIR=/usr/include/libdivecomputer \
-		..
-	make
+  cd "${pkgname}-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE='None' \
+        -DLIBDIVECOMPUTER_INCLUDE_DIR=/usr/include/libdivecomputer \
+        -W no-dev \
+        -B build \
+        -S .
+  make VERBOSE=1 -C build
 }
 
 package() {
-	cd "${srcdir}/${_pkgname}-${pkgver}"
-	cd build
-	make DESTDIR="${pkgdir}" install
+  depends+=('libgit2.so')
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install -C build
 }