Re: [PR PATCH] [Updated] Subsurface

[adbrown101 <adbrown101@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]

There is an updated pull request by adbrown101 against master on the void-packages repository

https://github.com/adbrown101/void-packages subsurface
https://github.com/void-linux/void-packages/pull/34187

Subsurface
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64, x86_64-musl, i686
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64, aarch64-musl
 
I have been using subsurface for some time and have used on x86_64 and x86_64-musl. Works well on void.


A patch file from https://github.com/void-linux/void-packages/pull/34187.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-subsurface-34187.patch --]
[-- Type: text/x-diff, Size: 5761 bytes --]

From 6d97f4adff12a37979116ec68d6eeb44f708bf55 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Thu, 25 Nov 2021 18:22:14 +0000
Subject: [PATCH 1/3] New package: qtlocation-plugin-googlemaps-0.0.0.2

---
 srcpkgs/qtlocation-plugin-googlemaps/template | 19 +++++++++++++++++++
 srcpkgs/qtlocation-plugin-googlemaps/update   |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 srcpkgs/qtlocation-plugin-googlemaps/template
 create mode 100644 srcpkgs/qtlocation-plugin-googlemaps/update

diff --git a/srcpkgs/qtlocation-plugin-googlemaps/template b/srcpkgs/qtlocation-plugin-googlemaps/template
new file mode 100644
index 000000000000..754271e3c7da
--- /dev/null
+++ b/srcpkgs/qtlocation-plugin-googlemaps/template
@@ -0,0 +1,19 @@
+# Template file for 'qtlocation-plugin-googlemaps'
+pkgname=qtlocation-plugin-googlemaps
+_distpkgname=googlemaps
+version=0.0.0.2
+revision=1
+wrksrc=${_distpkgname}-v.${version}
+build_style=qmake
+hostmakedepends="qt5-qmake qt5-devel"
+makedepends="qt5-devel qt5-location-devel qt5-declarative-devel"
+short_desc="Googlemaps plugin for QtLocation"
+maintainer="Alan Brown <adbrown@rocketmail.com>"
+license="MIT"
+homepage="https://github.com/vladest/googlemaps"
+distfiles="https://github.com/vladest/${_distpkgname}/archive/v.${version}.tar.gz"
+checksum=aac2f995917e75dff2861ce38049ccbb1cd51d078cb45d78158caa40a97a5bf0
+
+post_install() {
+	vlicense LICENSE.txt
+}
diff --git a/srcpkgs/qtlocation-plugin-googlemaps/update b/srcpkgs/qtlocation-plugin-googlemaps/update
new file mode 100644
index 000000000000..7b68f9be62e3
--- /dev/null
+++ b/srcpkgs/qtlocation-plugin-googlemaps/update
@@ -0,0 +1,2 @@
+pkgname=googlemaps
+pattern="v\.\K[\d\.]+(?=\.tar\.gz)"

From 8419888b044803eb07545dbf47b08995651f7906 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Thu, 25 Nov 2021 18:23:04 +0000
Subject: [PATCH 2/3] New package: libdivecomputer-subsurface-5.0.5

---
 srcpkgs/libdivecomputer-subsurface-devel    |  1 +
 srcpkgs/libdivecomputer-subsurface/template | 30 +++++++++++++++++++++
 srcpkgs/libdivecomputer-subsurface/update   |  2 ++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/libdivecomputer-subsurface-devel
 create mode 100644 srcpkgs/libdivecomputer-subsurface/template
 create mode 100644 srcpkgs/libdivecomputer-subsurface/update

diff --git a/srcpkgs/libdivecomputer-subsurface-devel b/srcpkgs/libdivecomputer-subsurface-devel
new file mode 120000
index 000000000000..3500e0b5b0d5
--- /dev/null
+++ b/srcpkgs/libdivecomputer-subsurface-devel
@@ -0,0 +1 @@
+libdivecomputer-subsurface
\ No newline at end of file
diff --git a/srcpkgs/libdivecomputer-subsurface/template b/srcpkgs/libdivecomputer-subsurface/template
new file mode 100644
index 000000000000..30b595dfd170
--- /dev/null
+++ b/srcpkgs/libdivecomputer-subsurface/template
@@ -0,0 +1,30 @@
+# Template file for 'libdivecomputer-subsurface'
+pkgname=libdivecomputer-subsurface
+version=5.0.5
+revision=1
+wrksrc="libdivecomputer-subsurface-branch-${version}"
+build_style=gnu-configure
+hostmakedepends="libtool automake autoconf pkg-config"
+short_desc="Subsurface version of libdivecomputer"
+maintainer="Alan Brown <adbrown@rocketmail.com>"
+license="LGPL-2.1-only"
+homepage="https://subsurface-divelog.org/"
+distfiles="${homepage}/downloads/${pkgname}-branch-${version}.tgz"
+checksum=94b69d1b12d3c35376fdce96088c0cce21392a37a0ff67991246171d22055c02
+shlib_provides="libdivecomputer.so"
+
+pre_configure() {
+	autoreconf -fi
+}
+
+libdivecomputer-subsurface-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
+	}
+}
diff --git a/srcpkgs/libdivecomputer-subsurface/update b/srcpkgs/libdivecomputer-subsurface/update
new file mode 100644
index 000000000000..61fff2459745
--- /dev/null
+++ b/srcpkgs/libdivecomputer-subsurface/update
@@ -0,0 +1,2 @@
+site="${homepage}/downloads"
+pattern="${pkgname}-branch-\K[\d\.]+(?=\.tgz)"

From 2a4a98291b38ed1ca8040206a7c8a49b90ab3be2 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Thu, 25 Nov 2021 18:23:39 +0000
Subject: [PATCH 3/3] New package: Subsurface-5.0.5

---
 srcpkgs/Subsurface/template | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 srcpkgs/Subsurface/template

diff --git a/srcpkgs/Subsurface/template b/srcpkgs/Subsurface/template
new file mode 100644
index 000000000000..4bc80569aeeb
--- /dev/null
+++ b/srcpkgs/Subsurface/template
@@ -0,0 +1,24 @@
+# Template file for 'Subsurface'
+pkgname=Subsurface
+version=5.0.5
+revision=1
+build_style=cmake
+configure_args="-DSUBSURFACE_TARGET_EXECUTABLE=DesktopExecutable
+ -DCMAKE_BUILD_TYPE=Release -DBTSUPPORT=ON -DNO_USERMANUAL=OFF
+ -DNO_PRINTING=OFF"
+make_cmd=make
+hostmakedepends="pkg-config autoconf automake libtool qt5-devel"
+makedepends="libdivecomputer-subsurface-devel libbluetooth-devel libcurl-devel
+ sqlite-devel libssh2-devel eudev-libudev-devel libusb-devel libxml2-devel
+ libxslt-devel qt5-devel qt5-connectivity-devel qt5-declarative-devel
+ qt5-location-devel qt5-script-devel qt5-svg-devel qt5-tools-devel
+ qt5-webkit-devel bluez-qt5-devel libgit2-devel libzip-devel libmtp-devel"
+depends="libdivecomputer-subsurface qtlocation-plugin-googlemaps"
+short_desc="Multi-platform divelog software"
+maintainer="Alan Brown <adbrown@rocketmail.com>"
+license="GPL-2.0-only"
+homepage="https://subsurface-divelog.org/"
+distfiles="${homepage}/downloads/${pkgname}-${version}.tgz"
+checksum=fe0ff8b1f65441b2a76a27a0072fe5faaf734ee08f5e19845400d0fc3d35541c
+
+export CMAKE_GENERATOR="Unix Makefiles"