Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.x.x

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

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

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

https://github.com/Nyx70/void-packages qgis
https://github.com/void-linux/void-packages/pull/27041

[WIP] New package: qgis-3.x.x 
**Help wanted**


[https://github.com/void-linux/void-packages/issues/9180](https://github.com/void-linux/void-packages/issues/9180)

building instructions: [https://nýx.ch/prj/qgis/](https://nýx.ch/prj/qgis/)

TODO

- [x] New package: libkml [#26727](https://github.com/void-linux/void-packages/pull/26727)
- [x] New package: libspatialite [#28053](https://github.com/void-linux/void-packages/pull/28053)
- [x] proj: update
- [x] New package: proj-data *
- [x] New package: python3-pyproj
- [x] qscintilla-qt5: update
- [x] New package: python3-PyQt5-Qsci
  - [x] python3-PyQt5-Qsci: x86_64*
  - [ ] python3-PyQt5-Qsci: i686*
  - [ ] python3-PyQt5-Qsci: aarch64*
  - [ ] python3-PyQt5-Qsci: arm*
- [x] New package: python3-OWSLib
- [x] libgdal: update
  - [x] libgdal: postgresql & kml support
  - [x] libgdal: OSM support (spatialite)
  - [ ] libgdal: aarch64
  - [ ] libgdal: arm
- [X] New package: qgis
  - [x] qgis: uptate to 3.16.2
  - [x] qgis: uptate to 3.16.3
  - [x] qgis: temporary SIP5 / SIP6 patch
  - [ ] qgis: uptate to 3.18.0
  - [ ] --- fix FindSIP_v6.patch
  - [ ] qgis-server
- [ ] ...

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

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

From 6dfad4a20746ef944279674728a42f305668a586 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 26 Nov 2020 18:47:25 +0100
Subject: [PATCH 01/17] New package: libkml-1.3.0

libkml is a library to process Google-KML GEO files.
It can be used in GDAL (libgdal), OSSIM, OTB and osgEarth
---
 srcpkgs/libkml-devel                   |  1 +
 srcpkgs/libkml/patches/NOUNCRYPT.patch | 17 +++++++++++++++++
 srcpkgs/libkml/shlibs                  |  6 ++++++
 srcpkgs/libkml/template                | 24 ++++++++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/libkml-devel
 create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch
 create mode 100644 srcpkgs/libkml/shlibs
 create mode 100644 srcpkgs/libkml/template

diff --git a/srcpkgs/libkml-devel b/srcpkgs/libkml-devel
new file mode 120000
index 00000000000..cf12be102f4
--- /dev/null
+++ b/srcpkgs/libkml-devel
@@ -0,0 +1 @@
+libkml
\ No newline at end of file
diff --git a/srcpkgs/libkml/patches/NOUNCRYPT.patch b/srcpkgs/libkml/patches/NOUNCRYPT.patch
new file mode 100644
index 00000000000..5b7e016c0e0
--- /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/shlibs b/srcpkgs/libkml/shlibs
new file mode 100644
index 00000000000..71dbff62431
--- /dev/null
+++ b/srcpkgs/libkml/shlibs
@@ -0,0 +1,6 @@
+libkmlbase.so.1 libkml-1.3.0_1
+libkmlconvenience.so.1 libkml-1.3.0_1
+libkmldom.so.1 libkml-1.3.0_1
+libkmlengine.so.1 libkml-1.3.0_1
+libkmlregionator.so.1 libkml-1.3.0_1
+libkmlxsd.so.1 libkml-1.3.0_1
diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
new file mode 100644
index 00000000000..7d4f5a72660
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,24 @@
+# Template file for 'libkml'
+pkgname=libkml
+version=1.3.0
+revision=1
+build_style=cmake
+makedepends="zlib-devel expat-devel boost-devel minizip-devel uriparser-devel"
+short_desc="Library to manipulate KML OGC files"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/libkml/libkml"
+distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz"
+checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
+patch_args=-Np1
+
+libkml-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 122dbac1a2dac41289d73cf005427f00cc3e8dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 20 Jan 2021 16:40:47 +0100
Subject: [PATCH 02/17] libkml: add to common/shlibs

needed by libgdal ...
---
 common/shlibs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index a911b3892cb..3bd645ea239 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3965,3 +3965,9 @@ libsimavr.so.1 simavr-1.6_2
 libsimavrparts.so.1 simavr-1.6_2
 libsword-1.8.1.so libsword-1.8.1_6
 libtree-sitter.so.0 tree-sitter-0.19.0_1
+libkmlbase.so.1 libkml-1.3.0_1
+libkmlconvenience.so.1 libkml-1.3.0_1
+libkmldom.so.1 libkml-1.3.0_1
+libkmlengine.so.1 libkml-1.3.0_1
+libkmlregionator.so.1 libkml-1.3.0_1
+libkmlxsd.so.1 libkml-1.3.0_1

From 3d8270a18b9d98baf8d38007411dbcb880710f0d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 20 Dec 2020 14:49:30 +0100
Subject: [PATCH 03/17] New package: libspatialite-5.0.0

SpatiaLite is an open source library intended to extend the SQLite core
to support fully fledged Spatial SQL capabilities.
---
 srcpkgs/libspatialite-devel                   |  1 +
 .../patches/disable_check_sql.patch           | 29 ++++++++++++++
 srcpkgs/libspatialite/shlibs                  |  2 +
 srcpkgs/libspatialite/template                | 38 +++++++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 create mode 100644 srcpkgs/libspatialite/patches/disable_check_sql.patch
 create mode 100644 srcpkgs/libspatialite/shlibs
 create mode 100644 srcpkgs/libspatialite/template

diff --git a/srcpkgs/libspatialite-devel b/srcpkgs/libspatialite-devel
new file mode 120000
index 00000000000..588ba2ad7c0
--- /dev/null
+++ b/srcpkgs/libspatialite-devel
@@ -0,0 +1 @@
+libspatialite
\ No newline at end of file
diff --git a/srcpkgs/libspatialite/patches/disable_check_sql.patch b/srcpkgs/libspatialite/patches/disable_check_sql.patch
new file mode 100644
index 00000000000..e1f1a0857b6
--- /dev/null
+++ b/srcpkgs/libspatialite/patches/disable_check_sql.patch
@@ -0,0 +1,29 @@
+disable check_sql_stmt test
+
+https://www.gaia-gis.it/fossil/libspatialite/tktview/3e46349bf2bfc58b3e3051d1ff7cab73eed19a88?plaintext
+
+--- test/Makefile.am	2020-08-23 18:46:23.000000000 +0200
++++ test/Makefile.am	2020-12-22 14:45:10.206085515 +0100
+@@ -31,10 +31,6 @@
+ 		check_gaia_utf8 \
+ 		check_extension \
+ 		check_recover_geom \
+-		check_sql_stmt \
+-		check_sql_stmt_tiny \
+-		check_sql_stmt_legacy \
+-		check_sql_stmt_extension \
+ 		check_multithread \
+ 		check_virtualtable1 \
+ 		check_virtualtable2 \
+--- test/Makefile.in	2020-08-23 18:46:23.000000000 +0200
++++ test/Makefile.in	2020-12-22 14:41:06.416335737 +0100
+@@ -102,9 +102,6 @@
+ 	check_xls_load$(EXEEXT) check_math_funcs$(EXEEXT) \
+ 	check_gaia_util$(EXEEXT) check_gaia_utf8$(EXEEXT) \
+ 	check_extension$(EXEEXT) check_recover_geom$(EXEEXT) \
+-	check_sql_stmt$(EXEEXT) check_sql_stmt_tiny$(EXEEXT) \
+-	check_sql_stmt_legacy$(EXEEXT) \
+-	check_sql_stmt_extension$(EXEEXT) check_multithread$(EXEEXT) \
+ 	check_virtualtable1$(EXEEXT) check_virtualtable2$(EXEEXT) \
+ 	check_virtualtable3$(EXEEXT) check_virtualtable4$(EXEEXT) \
+ 	check_virtualtable5$(EXEEXT) check_virtualtable6$(EXEEXT) \
diff --git a/srcpkgs/libspatialite/shlibs b/srcpkgs/libspatialite/shlibs
new file mode 100644
index 00000000000..eee57edae59
--- /dev/null
+++ b/srcpkgs/libspatialite/shlibs
@@ -0,0 +1,2 @@
+libspatialite.so.7 libspatialite-5.0.0_1
+mod_spatialite.so.7 libspatialite-5.0.0_1
diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
new file mode 100644
index 00000000000..0b8caa0bc11
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,38 @@
+# Template file for 'libspatialite'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+#   license changed
+pkgname=libspatialite
+version=5.0.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config libxml2"
+makedepends="sqlite-devel minizip-devel zlib-devel proj-devel freexl-devel
+ geos-devel libxml2-devel"
+depends="sqlite"
+short_desc="Geospatial extension for SQLite"
+maintainer="Bo Son <boson@gmx.at>"
+license="MPL-1.0"
+homepage="https://www.gaia-gis.it/fossil/libspatialite/index"
+distfiles="http://www.gaia-gis.it/gaia-sins/${pkgname}-${version}.tar.gz"
+checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
+
+CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" libtool geos-devel"
+fi
+
+post_install() {
+	vlicense COPYING
+}
+
+libspatialite-devel_package() {
+	depends="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From d981596ddf3952c8da195f5caa90b31878172e57 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:22:47 +0100
Subject: [PATCH 04/17] proj: update to 7.2.1.

---
 common/shlibs         |  2 +-
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 ++++++-------
 srcpkgs/proj/update   |  1 -
 4 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/proj/shlibs
 delete mode 100644 srcpkgs/proj/update

diff --git a/common/shlibs b/common/shlibs
index 3bd645ea239..5302849a8bf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3020,7 +3020,7 @@ libwithsctp.so.1 lksctp-tools-1.0.17_1
 libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4
 libunshield.so.0 libunshield-0.6_1
 libMyGUIEngine.so.3.4.0 libmygui-3.4.0_1
-libproj.so.18 proj-6.3.0_1
+libproj.so.19 proj-7.2.1_1
 libnlopt.so.0 nlopt-2.4.2_1
 libeb.so.16 libeb-4.3.3_1
 libchipcard.so.6 libchipcard-5.0.4_1
diff --git a/srcpkgs/proj/shlibs b/srcpkgs/proj/shlibs
new file mode 100644
index 00000000000..a61a9c20bc9
--- /dev/null
+++ b/srcpkgs/proj/shlibs
@@ -0,0 +1 @@
+libproj.so.19 proj-7.2.1_1
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index 51c4638234b..e9b2b6fefe2 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,17 +1,17 @@
 # Template file for 'proj'
 pkgname=proj
-version=6.3.2
+version=7.2.1
 revision=1
 build_style=cmake
-configure_args="-DPROJ_TESTS=OFF"
+configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="python3"
-makedepends="sqlite-devel"
+makedepends="sqlite-devel tiff-devel libcurl-devel"
 short_desc="Cartographic Projections Library"
-maintainer="John <me@johnnynator.dev>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="MIT"
-homepage="https://proj4.org"
+homepage="https://proj.org"
 distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=cb776a70f40c35579ae4ba04fb4a388c1d1ce025a1df6171350dc19f25b80311
+checksum=b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14
 
 post_install() {
 	vlicense COPYING
@@ -22,7 +22,6 @@ proj-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share/man/man3
 		vmove usr/lib/cmake
 		vmove "usr/lib/*.so"
 	}
diff --git a/srcpkgs/proj/update b/srcpkgs/proj/update
deleted file mode 100644
index 667700bc719..00000000000
--- a/srcpkgs/proj/update
+++ /dev/null
@@ -1 +0,0 @@
-ignore="*RC*"

From ce3521b7d31ce16e0d6572a2c9c4f2333b39c241 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Fri, 27 Nov 2020 07:02:22 +0100
Subject: [PATCH 05/17] libgdal: update to 3.2.1.

- update to 3.2.1.
- --with-expat / --with-spatialite added (OSM support)
- postgresql and kml support added
- python3-gdal module added
---
 common/shlibs            |  2 +-
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 74 +++++++++++++++++++++++++++++++++-------
 srcpkgs/python3-gdal     |  1 +
 4 files changed, 65 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs
 create mode 120000 srcpkgs/python3-gdal

diff --git a/common/shlibs b/common/shlibs
index 5302849a8bf..6791ac70b9d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2461,7 +2461,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5
 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.26 libgdal-3.0.4_9
+libgdal.so.28 libgdal-3.2.1_1
 libosgViewer.so.131 osg-3.4.1_1
 libosgShadow.so.131 osg-3.4.1_1
 libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/shlibs b/srcpkgs/libgdal/shlibs
new file mode 100644
index 00000000000..814d5434346
--- /dev/null
+++ b/srcpkgs/libgdal/shlibs
@@ -0,0 +1 @@
+libgdal.so.28 libgdal-3.2.1_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index f921ca3fffc..999fbf91a2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,27 +1,63 @@
 # Template file for 'libgdal'
 pkgname=libgdal
-version=3.0.4
-revision=9
+version=3.2.1
+revision=1
+# aarch & arm temporary disabled
+archs="~aarch* ~armv*"
 wrksrc="gdal-${version}"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+configure_args="
+ --with-expat=yes
+ --with-liblzma=yes
+ --with-opencl=yes
+ --with-podofo=yes
+ --with-spatialite=yes
+ --with-sqlite3=yes
+ --with-webp=yes
+ --with-zstd=yes
+ $(vopt_if kml libkml)
+ $(vopt_with postgresql pg)"
+hostmakedepends="gettext-devel pkg-config python3-numpy json-c-devel swig"
+makedepends="boost-devel expat-devel freexl-devel geos-devel jasper-devel
+ json-c-devel libcurl-devel libopenexr-devel libopenjpeg2-devel
+ libpodofo-devel libqhull-devel libspatialite-devel libwebp-devel
+ libxml2-devel libzstd-devel netcdf-devel ocl-icd-devel opencl-headers
+ pcre2-devel proj-devel python3-devel sqlite-devel
+ $(vopt_if kml libkml-devel)
+ $(vopt_if postgresql postgresql-libs-devel)"
 short_desc="Geospatial Data Abstraction Library"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+distfiles="https://github.com/OSGeo/gdal/releases/download/v${version}/gdal-${version}.tar.gz"
+checksum=43d40ba940e3927e38f9e98062ff62f9fa993ceade82f26f16fab7e73edb572e
+subpackages="python3-gdal libgdal-devel libgdal-tools"
+
+build_options="kml postgresql"
+build_options_default="kml"
 
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi
 
+do_build() {
+	: ${make_cmd:=make}
+	${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
+	# python modules
+	rm -f swig/python/*_wrap.cpp
+	${make_cmd} -C swig/python generate
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	cd swig/python
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -46,3 +82,17 @@ libgdal-devel_package() {
 		vmove usr/lib/*.so
 	}
 }
+
+python3-gdal_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - Python3 bindings"
+	pkg_install() {
+		vmove usr/bin/*.py
+		vmove "usr/lib/python*"
+		vlicense $wrksrc/$build_wrksrc/LICENSE.TXT
+		vdoc $wrksrc/$build_wrksrc/swig/python/README.rst
+		mkdir -p ${PKGDESTDIR}/usr/share/${pkgname}
+		cp -r $wrksrc/$build_wrksrc/swig/python/samples ${PKGDESTDIR}/usr/share/${pkgname}/examples
+		rm -rf ${PKGDESTDIR}/lib
+	}
+}
diff --git a/srcpkgs/python3-gdal b/srcpkgs/python3-gdal
new file mode 120000
index 00000000000..377d50dfc2b
--- /dev/null
+++ b/srcpkgs/python3-gdal
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file

From 88b0e6911cdd68ecfe0552129b1f5f3c820149a6 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:45:30 +0100
Subject: [PATCH 06/17] qscintilla-qt5: update to 2.11.6

---
 srcpkgs/qscintilla-qt5/template | 14 ++++++++------
 srcpkgs/qscintilla-qt5/update   |  3 ---
 2 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 srcpkgs/qscintilla-qt5/update

diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
index e7eac8a82f4..3764aaa44ca 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,18 +1,20 @@
 # Template file for 'qscintilla-qt5'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=qscintilla-qt5
-version=2.11.2
+version=2.11.6
 revision=1
-wrksrc="QScintilla_gpl-${version}"
+wrksrc="QScintilla-${version}"
 build_wrksrc=Qt4Qt5
 build_style=qmake
 hostmakedepends="qt5-qmake"
 makedepends="qt5-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"
+#maintainer="Pierre Allegraud <pierre.allegraud@crans.org>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-3.0-or-later"
 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-${version}.tar.gz"
+checksum=e7346057db47d2fb384467fafccfcb13aa0741373c5d593bc72b55b2f0dd20a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="qt5-devel"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
deleted file mode 100644
index 4c5ed097b26..00000000000
--- a/srcpkgs/qscintilla-qt5/update
+++ /dev/null
@@ -1,3 +0,0 @@
-site="https://www.riverbankcomputing.com/software/qscintilla/download"
-pkgname=QScintilla_gpl
-ignore="*dev*"

From daea7806bced883f3dfcd79132a090b2731ac751 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:48:25 +0100
Subject: [PATCH 07/17] New package: python3-PyQt5-Qsci-2.11.6

---
 srcpkgs/python3-PyQt5-Qsci/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-PyQt5-Qsci/template

diff --git a/srcpkgs/python3-PyQt5-Qsci/template b/srcpkgs/python3-PyQt5-Qsci/template
new file mode 100644
index 00000000000..0383b72501c
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-Qsci/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-PyQt5-Qsci'
+pkgname=python3-PyQt5-Qsci
+version=2.11.6
+revision=1
+wrksrc="QScintilla-${version}"
+build_wrksrc=Python
+build_style=qmake
+hostmakedepends="qt5-qmake qscintilla-qt5"
+makedepends="python3-devel qscintilla-qt5-devel-${version}_1
+ python3-PyQt5-devel qt5-devel python3-sip-devel"
+short_desc="QScintilla Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"
+checksum=e7346057db47d2fb384467fafccfcb13aa0741373c5d593bc72b55b2f0dd20a7
+
+do_configure() {
+	export QMAKEFEATURES=${wrksrc}/Qt4Qt5/features/
+	python3 configure.py --pyqt=PyQt5
+}

From 9801fe682abc31b86b72832877d43f166f91549e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 20 Dec 2020 16:34:43 +0100
Subject: [PATCH 08/17] python3-PyQt5-Qsci: aarch & arm temporary disabled

---
 srcpkgs/python3-PyQt5-Qsci/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/python3-PyQt5-Qsci/template b/srcpkgs/python3-PyQt5-Qsci/template
index 0383b72501c..e291b88277f 100644
--- a/srcpkgs/python3-PyQt5-Qsci/template
+++ b/srcpkgs/python3-PyQt5-Qsci/template
@@ -2,6 +2,8 @@
 pkgname=python3-PyQt5-Qsci
 version=2.11.6
 revision=1
+# aarch & arm temporary disabled
+archs="~aarch* ~armv*"
 wrksrc="QScintilla-${version}"
 build_wrksrc=Python
 build_style=qmake

From 338af0a6a0b179f0d385dcf42f8aa1b17b3cb209 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:33:58 +0100
Subject: [PATCH 09/17] grass: update to 7.8.5.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 64 +++++++++++++++++++++++++++++-------------
 4 files changed, 61 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/grass/INSTALL
 create mode 100644 srcpkgs/grass/REMOVE
 create mode 100644 srcpkgs/grass/shlibs

diff --git a/srcpkgs/grass/INSTALL b/srcpkgs/grass/INSTALL
new file mode 100644
index 00000000000..f10f31ce260
--- /dev/null
+++ b/srcpkgs/grass/INSTALL
@@ -0,0 +1,5 @@
+case "$ACTION" in
+post)
+	ldconfig
+	;;
+esac
diff --git a/srcpkgs/grass/REMOVE b/srcpkgs/grass/REMOVE
new file mode 100644
index 00000000000..f10f31ce260
--- /dev/null
+++ b/srcpkgs/grass/REMOVE
@@ -0,0 +1,5 @@
+case "$ACTION" in
+post)
+	ldconfig
+	;;
+esac
diff --git a/srcpkgs/grass/shlibs b/srcpkgs/grass/shlibs
new file mode 100644
index 00000000000..85eadb0e88b
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.5_1
+libgrass_dbmiclient.7.8.so grass-7.8.5_1
+libgrass_gis.7.8.so grass-7.8.5_1
+libgrass_gproj.7.8.so grass-7.8.5_1
+libgrass_imagery.7.8.so grass-7.8.5_1
+libgrass_raster.7.8.so grass-7.8.5_1
+libgrass_vector.7.8.so grass-7.8.5_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..20d2e4f4434 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,54 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# Modified by Nyx70 <n.y.x@bluewin.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.5
+revision=1
+_binver=${version%.*}
+_binver=${_binver//./}
 build_style=gnu-configure
-configure_args="--prefix=\${DESTDIR}/usr/share --bindir=\${DESTDIR}/usr/bin
- --with-freetype-includes=${XBPS_CROSS_BASE}/usr/include/freetype2"
-hostmakedepends="flex libgdal-tools pkg-config python-numpy tar"
-makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel
- fftw-devel cairo-devel glu-devel wxPython-devel"
-depends="python-numpy wxPython"
-short_desc="Geographic Resources Analysis Support System - GIS"
-maintainer="Alex Jarosch <research@alexj.at>"
+configure_args="--prefix=\${DESTDIR}/usr/lib --bindir=\${DESTDIR}/usr/bin
+ --with-freetype-includes=${XBPS_CROSS_BASE}/usr/include/freetype2
+ $(vopt_with bzip2 bzlib)
+ $(vopt_with geos)
+ $(vopt_with mysql) $(vopt_if mysql --with-mysql-includes=/usr/include/mysql)
+ $(vopt_with nls)
+ $(vopt_with pthread)
+ $(vopt_with postgres)"
+hostmakedepends="flex libgdal-tools pkg-config python-numpy python3-six tar
+ $(vopt_if nls gettext)"
+makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel fftw-devel
+ cairo-devel glu-devel wxPython-devel libzstd-devel bzip2-devel
+ $(vopt_if bzip2 bzip2-devel)
+ $(vopt_if geos geos-devel)
+ $(vopt_if mysql libmysqlclient-devel)
+ $(vopt_if nls gettext-devel)
+ $(vopt_if postgres postgresql-libs-devel)"
+depends="python-numpy wxPython libgdal>=3.2.0_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="GPL-2.0-or-later"
 homepage="https://grass.osgeo.org/"
-distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
-checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+distfiles="https://github.com/OSGeo/grass/archive/${version}.tar.gz"
+checksum=a359bb665524ecccb643335d70f5436b1c84ffb6a0e428b78dffebacd983ff37
 nocross="tries to execute target binaries"
 
+shlib_provides="libgrass_dbmibase.${version%.*}.so libgrass_dbmiclient.${version%.*}.so
+ libgrass_gis.${version%.*}.so libgrass_gproj.${version%.*}.so libgrass_imagery.${version%.*}.so
+ libgrass_raster.${version%.*}.so libgrass_vector.${version%.*}.so"
+
+build_options="geos mysql nls pthread postgres"
+build_options_default="geos pthread postgres"
+
 post_install() {
-	# move grass76 libraries from /usr/share to /usr/lib
-	vmkdir usr/lib
-	mv ${DESTDIR}/usr/share/grass* ${DESTDIR}/usr/lib
 	# fixes a todo in GISBASE
-	sed -i ${DESTDIR}/usr/bin/grass${_binver} \
-		-e "105s;\(gisbase =\).*;\1 \"/usr/lib/grass-${version}\";"
+	vsed -i ${DESTDIR}/usr/bin/grass${_binver} -e "s:${DESTDIR}::"
+	# ld.so.conf
+	mkdir -p ${DESTDIR}/etc/ld.so.conf.d
+	echo "/usr/lib/grass${_binver}/lib" >${DESTDIR}/etc/ld.so.conf.d/grass${_binver}.conf
+	# profiles
+	mkdir -p ${DESTDIR}/etc/profile.d
+	echo 'export PATH="/usr/lib/grass'${_binver}'/bin:$PATH"' >${DESTDIR}/etc/profile.d/grass${_binver}.sh
 }

From 5d6e6665435ce6ae3fb53d38c3c027d54e1f2f51 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 13:09:28 +0100
Subject: [PATCH 10/17] grass: musl patch added

---
 srcpkgs/grass/patches/musl-build-fix.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 srcpkgs/grass/patches/musl-build-fix.patch

diff --git a/srcpkgs/grass/patches/musl-build-fix.patch b/srcpkgs/grass/patches/musl-build-fix.patch
new file mode 100644
index 00000000000..e8177836574
--- /dev/null
+++ b/srcpkgs/grass/patches/musl-build-fix.patch
@@ -0,0 +1,12 @@
+error: unknown type name 'int64_t' patch for musl
+
+--- include/gis.h	2020-10-05 08:39:31.000000000 +0200
++++ include/gis.h	2020-12-10 08:21:58.788027542 +0100
+@@ -23,6 +23,7 @@
+ /* System include files */
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <stdint.h>
+ 
+ /* Grass and local include files */
+ #include <grass/config.h>

From 36d98fcc331307c6a493ea9d7dc33c8407baeddc Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:51:28 +0100
Subject: [PATCH 11/17] New package: python3-OWSLib-0.20.0

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

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
new file mode 100644
index 00000000000..ff2410852a1
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,24 @@
+# Template file for 'python3-OWSLib'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+#   license=BSD -> BSD-3-Clause
+pkgname=python3-OWSLib
+version=0.20.0
+revision=1
+wrksrc=OWSLib-${version}
+build_style=python3-module
+hostmakedepends="python3-devel python3-setuptools"
+short_desc="OWSLib Python3 modules"
+maintainer="Bo Son <boson@gmx.at>"
+license="BSD-3-Clause"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+do_check() {
+	# skip tests for now. too many missing packages in void-linux
+	:
+}
+
+post_install() {
+	vlicense LICENSE
+}

From 37e666e3d6b3f4dd1963fc1ca7623444b1c40c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 20 Jan 2021 18:54:07 +0100
Subject: [PATCH 12/17] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 6791ac70b9d..fa893767d3b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3971,3 +3971,4 @@ libkmldom.so.1 libkml-1.3.0_1
 libkmlengine.so.1 libkml-1.3.0_1
 libkmlregionator.so.1 libkml-1.3.0_1
 libkmlxsd.so.1 libkml-1.3.0_1
+libspatialite.so.7 libspatialite-5.0.0_1

From b7444f581314868142515180b0c0de9ae740289a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 20 Jan 2021 19:01:51 +0100
Subject: [PATCH 13/17] common/shlibs: add libspatialindex-1.9.3 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index fa893767d3b..f1e502821a6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3972,3 +3972,4 @@ libkmlengine.so.1 libkml-1.3.0_1
 libkmlregionator.so.1 libkml-1.3.0_1
 libkmlxsd.so.1 libkml-1.3.0_1
 libspatialite.so.7 libspatialite-5.0.0_1
+libspatialindex.so.6 libspatialindex-1.9.3_1

From 4614064e6bef84fea96196cde82c90216d516108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 20 Jan 2021 18:57:59 +0100
Subject: [PATCH 14/17] common/shlibs: add grass-7.8.5 shlibs

needed by qgis
---
 common/shlibs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index f1e502821a6..e4c20b7357a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3973,3 +3973,10 @@ libkmlregionator.so.1 libkml-1.3.0_1
 libkmlxsd.so.1 libkml-1.3.0_1
 libspatialite.so.7 libspatialite-5.0.0_1
 libspatialindex.so.6 libspatialindex-1.9.3_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1    
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1

From 561b03770ca32dfd7b4445ca2534ef9d3009288e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Sun, 17 Jan 2021 08:19:09 +0100
Subject: [PATCH 15/17] New package: qgis-3.18.0

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 49 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 srcpkgs/qgis/shlibs
 create mode 100644 srcpkgs/qgis/template

diff --git a/srcpkgs/qgis/shlibs b/srcpkgs/qgis/shlibs
new file mode 100644
index 00000000000..10937bc1722
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.3 qgis-3.16.3_1
+libqgis_app.so.3.16.3 qgis-3.16.3_1
+libqgis_core.so.3.16.3 qgis-3.16.3_1
+libqgis_gui.so.3.16.3 qgis-3.16.3_1
+libqgis_native.so.3.16.3 qgis-3.16.3_1
+libqgisgrass7.so.3.16.3 qgis-3.16.3_1
+libqgispython.so.3.16.3 qgis-3.16.3_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..dbaaeca16c0
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,49 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.18.0
+revision=1
+archs="x86_64*"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF
+ -DGRASS_PREFIX7=/usr/lib/grass78
+ $(vopt_if server -DWITH_SERVER=ON)"
+hostmakedepends="pkg-config flex bison python3 protobuf25"
+makedepends="gsl-devel hdf5-devel protobuf25-devel
+ ocl-icd-devel opencl-clhpp
+ exiv2-devel expat-devel
+ libxml2-devel libzip-devel netcdf-devel
+ qt5-devel qt5-declarative-devel qt5-location-devel
+ qt5-serialport-devel qt5-webkit-devel
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite
+ qt5-plugin-tds qwt-devel
+ qscintilla-qt5-devel python3-PyQt5-Qsci python3-sip-PyQt5
+ qca-qt5-devel qca-qt5-ossl qtkeychain-qt5-devel
+ python3-devel python3-PyQt5-devel python3-PyQt5-devel-tools
+ geos-devel grass libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-devel
+ $(vopt_if server fcgi-devel)"
+# geos-devel grass>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+depends="python3-PyQt5 python3-PyQt5-Qsci python3-PyQt5-sql python3-PyQt5-svg
+ python3-Jinja2 python3-OWSLib python3-Pygments
+ qt5-plugin-sqlite python3-dateutil python3-requests python3-yaml
+ python3-Pillow python3-gdal python3-psycopg2 python3-pytz qca-qt5-ossl
+ grass>=7.8.0 grass<7.9.0"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+#maintainer="Bo Son <boson@gmx.at>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=0be091b2b8067a268213ada46aea62f035694764331f88f304a58e32ff3a3187
+
+build_options="server"
+#build_options_default="server"
+
+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/
+}

From 16cbe095f1b6de967d14a306ac6ed29d979d2806 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sat, 6 Mar 2021 14:37:48 +0100
Subject: [PATCH 16/17] qgis: sip patch

---
 srcpkgs/qgis/patches/FindSIP_v6.patch | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/qgis/patches/FindSIP_v6.patch

diff --git a/srcpkgs/qgis/patches/FindSIP_v6.patch b/srcpkgs/qgis/patches/FindSIP_v6.patch
new file mode 100644
index 00000000000..cd52f24d48c
--- /dev/null
+++ b/srcpkgs/qgis/patches/FindSIP_v6.patch
@@ -0,0 +1,26 @@
+temporary SIP patch
+
+use sip4 binary 
+
+https://github.com/qgis/QGIS/issues/38911
+
+--- cmake/FindSIP.py	2021-01-15 13:09:03.000000000 +0100
++++ cmake/FindSIP.py	2021-01-20 08:14:26.116694514 +0100
+@@ -53,8 +53,16 @@
+     print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
+ 
+     import shutil
+-    print("sip_bin:%s" % shutil.which("sip5"))
++
++    # temporary sip6 / sip4 patch
++    # -> use sip4 sip binary
++    if sipbuild.version.SIP_VERSION >= 0x60000:
++        sip_bin = shutil.which("sip") 
++    else:
++        sip_bin = shutil.which("sip5")
++    print("sip_bin:%s" % sip_bin)
+ 
+     from distutils.sysconfig import get_python_lib
+     python_modules_dir = get_python_lib(plat_specific=1)
+     print("default_sip_dir:%s" % python_modules_dir)
++

From 68031c101b43eaca66f52de52d8330647faf5a55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Mon, 22 Feb 2021 08:14:20 +0100
Subject: [PATCH 17/17] common/shlibs: add libprotobuf-lite.so.25

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

diff --git a/common/shlibs b/common/shlibs
index e4c20b7357a..5fa6e567f6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3980,3 +3980,4 @@ libgrass_dbmiclient.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1    
 libgrass_dbmibase.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
+libprotobuf-lite.so.25 libprotobuf25-lite-3.14.0_1