Re: [PR PATCH] [Updated] New package: QGIS

[ar-jan <ar-jan@users.noreply.github.com>]

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

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

https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812

New package: QGIS
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

New packages:

- QGIS
- libkml

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


Completed: ~Depends on #31620 being updated/merged.~

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

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

From b9fa0a01dbb0cef0401294f99f63e0b473ea0ac1 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1

---
 srcpkgs/libgeotiff-devel    |  1 +
 srcpkgs/libgeotiff/template | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 120000 srcpkgs/libgeotiff-devel
 create mode 100644 srcpkgs/libgeotiff/template

diff --git a/srcpkgs/libgeotiff-devel b/srcpkgs/libgeotiff-devel
new file mode 120000
index 0000000000000..192e7a87a2aed
--- /dev/null
+++ b/srcpkgs/libgeotiff-devel
@@ -0,0 +1 @@
+libgeotiff
\ No newline at end of file
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..b35993a0b73c4
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,29 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+	vlicense LICENSE
+	vmkdir usr/share/doc/libgeotiff
+	mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
+
+libgeotiff-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove usr/share/cmake
+	}
+}

From 70976091ab3b4611731664ca16c611cde9761856 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6

---
 srcpkgs/draco-devel    |  1 +
 srcpkgs/draco/template | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 120000 srcpkgs/draco-devel
 create mode 100644 srcpkgs/draco/template

diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..d9a6e86796766
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,24 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share/cmake
+	}
+}

From f252c9cff1bea14832da472b6363070136ac7e78 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6

---
 common/shlibs                 |  2 ++
 srcpkgs/libpdal-devel         |  1 +
 srcpkgs/libpdal/libpdal-devel |  1 +
 srcpkgs/libpdal/template      | 40 +++++++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+)
 create mode 120000 srcpkgs/libpdal-devel
 create mode 120000 srcpkgs/libpdal/libpdal-devel
 create mode 100644 srcpkgs/libpdal/template

diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f8417..fc9a91b900620 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2468,6 +2468,8 @@ libu2f-server.so.0 libu2f-server-1.1.0_9
 libsqlcipher.so.0 sqlcipher-4.3.0_3
 libgta.so.1 libgta-1.2.0_1
 libgdal.so.31 libgdal-3.5.3_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
 libosgViewer.so.161 osg-3.6.5_1
 libosgShadow.so.161 osg-3.6.5_1
 libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..10c4991fe4ad7
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,40 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel libgdal-devel libgeotiff-devel libunwind-devel
+ libxml2-devel python3-devel tiff-devel zlib-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+
+do_check() {
+	cd build
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) ;;
+		x86_64*) ctest -E 'pdal_app_plugin_test' ;;
+	esac
+}
+
+post_install() {
+	vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/bin/pdal-config
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 777048d747afccb7e1061bf6c0f444185e3e3240 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] New package: libkml-1.3.0

---
 srcpkgs/libkml/patches/NOUNCRYPT.patch | 17 +++++++++++++++++
 srcpkgs/libkml/template                | 16 ++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch
 create mode 100644 srcpkgs/libkml/template

diff --git a/srcpkgs/libkml/patches/NOUNCRYPT.patch b/srcpkgs/libkml/patches/NOUNCRYPT.patch
new file mode 100644
index 0000000000000..5b7e016c0e023
--- /dev/null
+++ b/srcpkgs/libkml/patches/NOUNCRYPT.patch
@@ -0,0 +1,17 @@
+minizip/crypt.h was removed from the packet minizip-1.2.11_2. 
+
+with "#define NOUNCRYPT" libkml can be built without "crypt.h"
+https://github.com/void-linux/void-packages/commit/952ac913cf
+https://github.com/madler/zlib/pull/229
+
+--- a/src/kml/base/contrib/minizip/unzip.c	2015-12-21 18:23:05.000000000 +0100
++++ b/src/kml/base/contrib/minizip/unzip.c	2020-11-26 15:45:55.033835816 +0100
+@@ -42,7 +42,7 @@
+ #include <zlib.h> //RR
+ #include "unzip.h"
+ #include "iomem_simple.h"
+-#undef NOUNCRYPT
++#define NOUNCRYPT
+ 
+ #ifdef STDC
+ #  include <stddef.h>
diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
new file mode 100644
index 0000000000000..44d298a09a429
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,16 @@
+# Template file for 'libkml'
+pkgname=libkml
+version=1.3.0
+revision=1
+build_style=cmake
+makedepends="boost-devel expat-devel minizip-devel uriparser-devel zlib-devel"
+short_desc="Library to manipulate KML OGC files"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/libkml/libkml"
+distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz"
+checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
+
+post_install() {
+	vlicense LICENSE
+}

From bdcced5e57cb76961cf76f3717797ce0598d6506 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] common/shlibs: add libspatialindex.so.6 for QGIS

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index fc9a91b900620..e7c673a515e35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4061,6 +4061,7 @@ libawt_xawt.so openjdk17-jre-17.0.1+12_1
 libjava.so openjdk17-jre-17.0.1+12_1
 libjli.so openjdk17-jre-17.0.1+12_1
 libjvm.so openjdk17-jre-17.0.1+12_1
+libspatialindex.so.6 libspatialindex-1.9.3_1
 librttopo.so.1 librttopo-1.1.0_1
 libspatialite.so.7 libspatialite-5.0.1_1
 mod_spatialite.so.7 libspatialite-5.0.1_1

From 6c811b013d438d5447b1955f48ef51341452af57 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0

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

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..fe5ddfa2ef313
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,38 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-devel netcdf-devel ocl-icd-devel opencl-clhpp postgresql-libs-devel
+ proj-devel protobuf-devel python3-devel python3-PyQt-builder
+ python3-PyQt5-devel python3-PyQt5-devel-tools python3-PyQt5-multimedia
+ python3-pyqt5-qsci-devel python3-PyQt5-webkit python3-sip-PyQt5 qca-qt5-devel
+ qca-qt5-ossl qscintilla-qt5-devel qt5-3d-devel qt5-declarative-devel qt5-devel
+ qt5-gamepad-devel qt5-location-devel qt5-multimedia-devel qt5-plugin-mysql
+ qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
+ qt5-serialport-devel qt5-webkit-devel qtkeychain-qt5-devel qwt-devel
+ sqlite-devel"
+depends="libgdal-python3 libspatialite-devel python3-dateutil python3-dateutil
+ python3-Jinja2 python3-numpy python3-numpy python3-owslib python3-Pillow
+ python3-psycopg2 python3-Pygments python3-PyQt5 python3-PyQt5-location
+ python3-pyqt5-qsci python3-PyQt5-sql python3-PyQt5-svg python3-pytz
+ python3-requests python3-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+post_install() {
+	mv ${DESTDIR}/usr/share/qgis/python ${DESTDIR}/usr/lib/qgis/
+	ln -s ../../lib/qgis/python ${DESTDIR}/usr/share/qgis/python
+	mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share/
+}