Re: [PR PATCH] [Updated] New package: qgis-3.28.2

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

[-- Attachment #1: Type: text/plain, Size: 1268 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-3.28.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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


<!-- 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
-->


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: 14563 bytes --]

From b1a19e46737aa50b6e1245622b929abd0627ebc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.

---
 .../patches/configure.py-objdir-support.patch | 42 ---------------
 srcpkgs/qscintilla-qt5/template               | 51 +++++++++++++++++--
 srcpkgs/qscintilla-qt5/update                 |  3 +-
 3 files changed, 47 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch

diff --git a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch b/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
deleted file mode 100644
index 774e4eb5a863..000000000000
--- a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
-<scott@kitterman.com>
-patch the configure script for the Python bindings to support object dir
-builds
-Index: Python/configure.py
-===================================================================
---- a/Python/configure.py	2014-07-05 10:02:02.318834374 -0400
-+++ b/Python/configure.py	2014-07-05 10:02:02.306834375 -0400
-@@ -31,6 +31,8 @@
- import optparse
- import sys
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-+
- 
- ###############################################################################
- # You shouldn't need to modify anything above this line.
-@@ -210,6 +212,8 @@
-                     "The QScintilla version number could not be determined by "
-                     "reading %s." % sciglobal)
- 
-+        return # Debian: do not check for the installed version, we're good this way.
-+
-         lib_dir = target_configuration.qsci_lib_dir
-         if lib_dir is None:
-             lib_dir = target_configuration.qt_lib_dir
-@@ -264,7 +268,12 @@
-         the target configuration.
-         """
- 
--        return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
-+        if target_configuration.pyqt_package == 'PyQt5':
-+            return os.path.join(src_dir, 'sip/qscimod5.sip')
-+        else:
-+            return os.path.join(src_dir, 'sip/qscimod4.sip')
-+
-+        #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
- 
-     def get_sip_installs(self, target_configuration):
-         """ Return a tuple of the installation directory of the module's .sip
-
diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
index 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
 # Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
 pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
 revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
 build_style=qmake
 hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-devel"
 short_desc="Qt5 port of Neil Hodgson's Scintilla C++ editor class"
 maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
 license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
-distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"
-checksum=029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+	local _qt_arch
+	local qmake_args
+	if [ "$CROSS_BUILD" ]; then
+		case $XBPS_TARGET_MACHINE in
+			i686*) _qt_arch=i386;;
+			x86_64*) _qt_arch=x86_64;;
+			aarch64*) _qt_arch=arm64;;
+			arm*) _qt_arch=arm;;
+			mips*) _qt_arch=mips;;
+			ppc64*) _qt_arch=power64;;
+			ppc*) _qt_arch=power;;
+		esac
+		qmake_args="-qtconf ${wrksrc}/qt.conf
+			PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+	fi
+	cd ../designer
+	/usr/lib/qt5/bin/qmake \
+		${qmake_args} \
+		PREFIX=/usr \
+		QT_INSTALL_PREFIX=/usr \
+		LIB=/usr/lib \
+		QMAKE_CC=$CC QMAKE_CXX=$CXX \
+		QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+		QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+		QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+		QMAKE_LFLAGS="${LDFLAGS}" \
+		${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+		CONFIG+=no_qt_rpath
+}
+
+post_build() {
+	make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+	make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+		INSTALL_ROOT=${DESTDIR} install
+}
 
 qscintilla-qt5-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 100644
--- a/srcpkgs/qscintilla-qt5/update
+++ b/srcpkgs/qscintilla-qt5/update
@@ -1,3 +1,2 @@
 site="https://www.riverbankcomputing.com/software/qscintilla/download"
-pkgname=QScintilla_gpl
-ignore="*dev*"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'

From 63513c3b9280660207a05668ff0376d46e7e947c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1

---
 srcpkgs/python3-pyqt5-qsci-devel              |  1 +
 .../python3-pyqt5-qsci/patches/cross.patch    | 20 ++++++++++
 srcpkgs/python3-pyqt5-qsci/template           | 39 +++++++++++++++++++
 srcpkgs/python3-pyqt5-qsci/update             |  2 +
 4 files changed, 62 insertions(+)
 create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
 create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
 create mode 100644 srcpkgs/python3-pyqt5-qsci/template
 create mode 100644 srcpkgs/python3-pyqt5-qsci/update

diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+         # static or dynamic).
+         self.qsci_external_lib = not os.path.isdir('src')
+ 
++    def run_command(self, args, *, fatal=True):
++        """ Run a command and display the output if requested. """
++        qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++        builddir = os.environ.get("XBPS_BUILDDIR")
++        if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++            qemu = "qemu-{}-static".format(qemu_machine)
++            args.insert(0, qemu)
++        super().run_command(args, fatal=fatal)
++
+     def apply_user_defaults(self, tool):
+         """ Set default values for user options that haven't been set yet. """
+ 
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..27ca229fced3
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+	QtWidgets QtPrintSupport)"
+
+post_extract() {
+	rm -rf src
+	ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	lib32disabled=yes
+	pkg_install() {
+		vmove ${py3_sitelib}/PyQt5/bindings
+		vmove usr/share/qt5/qsci/api
+	}
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'

From db742ab168886a848dd0ca9fae0d3aad8d2e4618 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 000000000000..5b7e016c0e02
--- /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 000000000000..44d298a09a42
--- /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 1ec0a3357801dfba9c3bca70bd103bd732faff23 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 f632ce9c76da..f8485b04a13d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4114,6 +4114,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 acb6c373ee1f228e55fb51f89a9f2388980a19c3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.2

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

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..1d0ef4f55b3e
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.2
+revision=1
+archs="x86_64* i686*"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-devel hdf5-devel
+ libgdal-devel libspatialindex-devel libspatialite-devel libxml2-devel
+ libzip-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-qsci
+ python3-PyQt5-sql python3-PyQt5-svg python3-pytz python3-requests
+ 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=8dcc8604addaee7ee5447c08e4c5d25d088a73ef7ae03d6cbba95c43af877fa7
+
+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/
+}