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

Github messages for voidlinux
 help / color / mirror / Atom feed

From: Nyx70 <Nyx70@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
Date: Thu, 21 Jan 2021 05:14:49 +0100	[thread overview]
Message-ID: <20210121041449.A86HFVdrAqrVbbkTe_eTBPRA77UcTKEOjtHeR_Gh1FA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27041@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1306 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.16.x 
**Help wanted**


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

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

From 7f4b12ca6732d8096864d35019d16d9e3c71e117 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/24] 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 6e45ef5140bf5483d523d8354b07a51784f719f6 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/24] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index e98f088266b..83d000036ca 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4045,3 +4045,9 @@ libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
 libpamtest.so.0 pam_wrapper-1.1.3_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 ed57f546d812c04f28c6a069b9462c69eb038c23 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/24] 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 3a78d7ac5f88e0bab35539c508b2d66257ffc75e 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/24] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 15 ++++++++-------
 srcpkgs/proj/update   |  1 -
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/proj/shlibs
 delete mode 100644 srcpkgs/proj/update

diff --git a/srcpkgs/proj/shlibs b/srcpkgs/proj/shlibs
new file mode 100644
index 00000000000..3890e887d63
--- /dev/null
+++ b/srcpkgs/proj/shlibs
@@ -0,0 +1 @@
+libproj.so.19 proj-7.2.0_1
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index 51c4638234b..f17b9f8fe2c 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,17 +1,19 @@
 # Template file for 'proj'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=proj
-version=6.3.2
+version=7.2.0
 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="John <me@johnnynator.dev>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
 license="MIT"
-homepage="https://proj4.org"
+homepage="https://proj.org"
 distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=cb776a70f40c35579ae4ba04fb4a388c1d1ce025a1df6171350dc19f25b80311
+checksum=2957798e5fe295ff96a2af1889d0428e486363d210889422f76dd744f7885763
 
 post_install() {
 	vlicense COPYING
@@ -22,7 +24,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 12f5fab3d9f5a90787718452e74790d870667c5b Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Fri, 1 Jan 2021 17:45:22 +0100
Subject: [PATCH 05/24] proj: update to 7.2.1.

---
 srcpkgs/proj/shlibs   | 2 +-
 srcpkgs/proj/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/proj/shlibs b/srcpkgs/proj/shlibs
index 3890e887d63..a61a9c20bc9 100644
--- a/srcpkgs/proj/shlibs
+++ b/srcpkgs/proj/shlibs
@@ -1 +1 @@
-libproj.so.19 proj-7.2.0_1
+libproj.so.19 proj-7.2.1_1
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index f17b9f8fe2c..002a12c89e6 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,7 +1,7 @@
 # Template file for 'proj'
 # Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=proj
-version=7.2.0
+version=7.2.1
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -13,7 +13,7 @@ maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
 license="MIT"
 homepage="https://proj.org"
 distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=2957798e5fe295ff96a2af1889d0428e486363d210889422f76dd744f7885763
+checksum=b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14
 
 post_install() {
 	vlicense COPYING

From c408d72bc272132135182b59c41aeb2325392472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 20 Jan 2021 15:53:49 +0100
Subject: [PATCH 06/24] common/shlibs: update for proj-7.2.1

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

diff --git a/common/shlibs b/common/shlibs
index 83d000036ca..0b970c12e6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3085,7 +3085,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

From 1a055c14c671fe401626611b39a3348b57d77ac3 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 07/24] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 76 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 3 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/shlibs b/srcpkgs/libgdal/shlibs
new file mode 100644
index 00000000000..62062587b2c
--- /dev/null
+++ b/srcpkgs/libgdal/shlibs
@@ -0,0 +1 @@
+libgdal.so.28 libgdal-3.2.0_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 2bb083d3f5e..00ea65b99ee 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,27 +1,69 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+#   python3-gdal module
+#   --with-expat / --with-spatialite added (OSM support)
 pkgname=libgdal
 version=3.0.4
 revision=7
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 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="Jürgen Buchmüller <pullmoll@t-online.de>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
+subpackages="python3-gdal libgdal-devel libgdal-tools"
+
+build_options="kml postgresql"
+build_options_default="kml postgresql"
 
 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 +88,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 fb0adbdcda5c875a618347479d2fa82824e31995 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 5 Jan 2021 12:27:20 +0100
Subject: [PATCH 08/24] libgdal: update to 3.2.1.

---
 srcpkgs/libgdal/shlibs   |  2 +-
 srcpkgs/libgdal/template | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/libgdal/shlibs b/srcpkgs/libgdal/shlibs
index 62062587b2c..814d5434346 100644
--- a/srcpkgs/libgdal/shlibs
+++ b/srcpkgs/libgdal/shlibs
@@ -1 +1 @@
-libgdal.so.28 libgdal-3.2.0_1
+libgdal.so.28 libgdal-3.2.1_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 00ea65b99ee..d180f650a45 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -5,10 +5,12 @@
 #   python3-gdal module
 #   --with-expat / --with-spatialite added (OSM support)
 pkgname=libgdal
-version=3.0.4
-revision=7
+version=3.2.1
+revision=1
+# aarch & arm temporary disabled
+archs="~aarch* ~armv*"
 wrksrc="gdal-${version}"
-build_wrksrc="gdal"
+#build_wrksrc="gdal"
 build_style=gnu-configure
 configure_args="
  --with-expat=yes
@@ -35,8 +37,8 @@ short_desc="Geospatial Data Abstraction Library"
 maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
-checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
+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"

From 40d0c9edbaba5e15b74c1c67d6e43e37b9242d60 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:18:19 +0100
Subject: [PATCH 09/24] common/shlibs: update for libgdal-3.2.1

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

diff --git a/common/shlibs b/common/shlibs
index 0b970c12e6f..a908b7d2034 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2460,7 +2460,7 @@ libu2f-host.so.0 libu2f-host-1.0.0_1
 libu2f-server.so.0 libu2f-server-1.0.1_2
 libsqlcipher.so.0 sqlcipher-3.3.1_1
 libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.0_1
+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

From 7b3509fa294303af1e8a53d27efb6a13d78d6547 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 10/24] qscintilla-qt5: update to 2.11.5.

---
 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..7d88a42da7f 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.5
 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=9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b
 
 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 efa3dcc3cfa82574539ae8a868b5b2deb0423a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Mon, 18 Jan 2021 15:27:30 +0100
Subject: [PATCH 11/24] qscintilla-qt5: update to 2.11.6

---
 srcpkgs/qscintilla-qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
index 7d88a42da7f..3764aaa44ca 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qscintilla-qt5'
 # Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=qscintilla-qt5
-version=2.11.5
+version=2.11.6
 revision=1
 wrksrc="QScintilla-${version}"
 build_wrksrc=Qt4Qt5
@@ -14,7 +14,7 @@ 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-${version}.tar.gz"
-checksum=9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b
+checksum=e7346057db47d2fb384467fafccfcb13aa0741373c5d593bc72b55b2f0dd20a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="qt5-devel"

From 836da5142b69b180cf3acb08e7d2b255195901fe 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 12/24] New package: python3-PyQt5-Qsci-2.11.5

---
 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..d7446bc0627
--- /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.5
+revision=1
+wrksrc="QScintilla-${version}"
+build_wrksrc=Python
+build_style=qmake
+hostmakedepends="qt5-qmake"
+makedepends="python3-devel qscintilla-qt5-devel>=${version} qscintilla-qt5-devel<=${version}
+ 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=9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b
+
+do_configure() {
+	export QMAKEFEATURES=${wrksrc}/Qt4Qt5/features/
+	python3 configure.py --pyqt=PyQt5
+}

From ee7aac651daabb90781db38cf1a96fc871d05eb7 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 20 Dec 2020 15:10:00 +0100
Subject: [PATCH 13/24] python3-PyQt5-Qsci: makedepends fixed

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

diff --git a/srcpkgs/python3-PyQt5-Qsci/template b/srcpkgs/python3-PyQt5-Qsci/template
index d7446bc0627..467232cf553 100644
--- a/srcpkgs/python3-PyQt5-Qsci/template
+++ b/srcpkgs/python3-PyQt5-Qsci/template
@@ -6,7 +6,7 @@ wrksrc="QScintilla-${version}"
 build_wrksrc=Python
 build_style=qmake
 hostmakedepends="qt5-qmake"
-makedepends="python3-devel qscintilla-qt5-devel>=${version} qscintilla-qt5-devel<=${version}
+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>"

From 63792f102dae328b6e6f1914db1d50adb6083fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Mon, 18 Jan 2021 15:32:21 +0100
Subject: [PATCH 14/24] python3-PyQt5-Qsci: update to 2.11.6

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

diff --git a/srcpkgs/python3-PyQt5-Qsci/template b/srcpkgs/python3-PyQt5-Qsci/template
index 467232cf553..4b59a375fbe 100644
--- a/srcpkgs/python3-PyQt5-Qsci/template
+++ b/srcpkgs/python3-PyQt5-Qsci/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-PyQt5-Qsci'
 pkgname=python3-PyQt5-Qsci
-version=2.11.5
+version=2.11.6
 revision=1
 wrksrc="QScintilla-${version}"
 build_wrksrc=Python
@@ -13,7 +13,7 @@ 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=9361e26fd7fb7b5819a7eb92c5c1880a18de9bd3ed9dd2eb008e57388696716b
+checksum=e7346057db47d2fb384467fafccfcb13aa0741373c5d593bc72b55b2f0dd20a7
 
 do_configure() {
 	export QMAKEFEATURES=${wrksrc}/Qt4Qt5/features/

From c464134ff61e740587af2d5031455a0bb6611a1e 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 15/24] 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 4b59a375fbe..8eb6e2d04e1 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 73abe6310015ec08f7a538a25e266056f025de2e 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 16/24] 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 d308c96dd4a7ef52394d0362564bab41b260b3ee 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 17/24] 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 1383a15dab7ba9fb188eba8e33b0c1aa7794e600 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 18/24] 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 d9551417b93a24043b45785020267cc4e4cebc8b 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 19/24] 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 a908b7d2034..16da5739948 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4051,3 +4051,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 d29a08a4e71c26ccb2280b11faf10851c8dff547 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 20/24] 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 16da5739948..3f21cbc84f3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4052,3 +4052,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 28f4cdbac6f6f26c5e1a4d2bc7b2e28aad81db29 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 21/24] 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 3f21cbc84f3..ae11a0030b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4053,3 +4053,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 7a29fc004860427b60ce28173340689d444f0c85 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 22/24] New package: qgis-3.16.2

---
 srcpkgs/qgis/shlibs   |  7 ++++++
 srcpkgs/qgis/template | 51 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 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..b5401b3bc6d
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.2 qgis-3.16.2_1
+libqgis_app.so.3.16.2 qgis-3.16.2_1
+libqgis_core.so.3.16.2 qgis-3.16.2_1
+libqgis_gui.so.3.16.2 qgis-3.16.2_1
+libqgis_native.so.3.16.2 qgis-3.16.2_1
+libqgisgrass7.so.3.16.2 qgis-3.16.2_1
+libqgispython.so.3.16.2 qgis-3.16.2_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..884a8867ba4
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,51 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.2
+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 protobuf24"
+makedepends="gsl-devel hdf5-devel protobuf24-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
+ 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=5a4886a298647dcb7864f765cd5c7403e14cfa9f0392c34b3234cec90569c6ac
+
+build_options="server"
+#build_options_default="server"
+
+do_install() {
+	cd ${wrksrc}/build
+	make DESTDIR="$DESTDIR" 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 3c7c80e7040dce85fb013ae5a37fe69c5cae6016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 20 Jan 2021 09:55:10 +0100
Subject: [PATCH 23/24] qgis: update to 3.16.3.

---
 srcpkgs/qgis/shlibs   | 14 +++++++-------
 srcpkgs/qgis/template |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/qgis/shlibs b/srcpkgs/qgis/shlibs
index b5401b3bc6d..10937bc1722 100644
--- a/srcpkgs/qgis/shlibs
+++ b/srcpkgs/qgis/shlibs
@@ -1,7 +1,7 @@
-libqgis_analysis.so.3.16.2 qgis-3.16.2_1
-libqgis_app.so.3.16.2 qgis-3.16.2_1
-libqgis_core.so.3.16.2 qgis-3.16.2_1
-libqgis_gui.so.3.16.2 qgis-3.16.2_1
-libqgis_native.so.3.16.2 qgis-3.16.2_1
-libqgisgrass7.so.3.16.2 qgis-3.16.2_1
-libqgispython.so.3.16.2 qgis-3.16.2_1
+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
index 884a8867ba4..b7f0ef608a3 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,7 +1,7 @@
 # Template file for 'qgis'
 # Modified by Nyx70 <n.y.x@bluewin.ch>
 pkgname=qgis
-version=3.16.2
+version=3.16.3
 revision=1
 archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
@@ -9,8 +9,8 @@ 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 protobuf24"
-makedepends="gsl-devel hdf5-devel protobuf24-devel
+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
@@ -37,7 +37,7 @@ 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=5a4886a298647dcb7864f765cd5c7403e14cfa9f0392c34b3234cec90569c6ac
+checksum=3b869b0a7d0037d6254e0b0b00cff4e24f9bce9b764acd547d0646da91de4c72
 
 build_options="server"
 #build_options_default="server"

From 7818540ef58f86a886eef97a6e8719c9b4f7eeca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Wed, 20 Jan 2021 09:59:01 +0100
Subject: [PATCH 24/24] qgis: sip patch

sip patch - after void has remove sip5
use sip4 for build...
---
 srcpkgs/qgis/patches/FindSIP_v6.patch | 26 ++++++++++++++++++++++++++
 srcpkgs/qgis/template                 | 25 +++++++++++++++++++++++++
 2 files changed, 51 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)
++
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index b7f0ef608a3..02e311c9490 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -9,6 +9,7 @@ build_style=cmake
 configure_args="-DENABLE_TESTS=OFF
  -DGRASS_PREFIX7=/usr/lib/grass78
  $(vopt_if server -DWITH_SERVER=ON)"
+#i sip python3-sip-devel
 hostmakedepends="pkg-config flex bison python3 protobuf25"
 makedepends="gsl-devel hdf5-devel protobuf25-devel
  ocl-icd-devel opencl-clhpp
@@ -42,6 +43,30 @@ checksum=3b869b0a7d0037d6254e0b0b00cff4e24f9bce9b764acd547d0646da91de4c72
 build_options="server"
 #build_options_default="server"
 
+
+# QGIS works fine with PyQt5.15 and sip5 !!!
+# ------------------------------------------
+#
+# https://github.com/qgis/QGIS/issues/38911
+#
+#
+# https://github.com/void-linux/void-packages/commits/master?after=ec3d2e3389638d15ce5e9c0af38a8a301f96d779+174&branch=master
+#  sip: update to 6.0.0.
+#   https://github.com/void-linux/void-packages/commit/49e533fd77ac607cbbf6b3d9f8f39770a22b7461
+#  python3-PyQt5: depends on new sip
+#   https://github.com/void-linux/void-packages/commit/2787e6e18133cc0ce44e095d8a36863a28cd1cb4
+#  python3-sip-PyQt5: build with new sip
+#   https://github.com/void-linux/void-packages/commit/65924c695333fa46eeaed01a590e9d3b37997a98
+#
+# $ python3 cmake/FindSIP.py
+#  sip_version:060000
+#  sip_version_num:393216
+#  sip_version_str:6.0.0
+#  sip_bin:None <<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+#
+# sip4 needed by FindSIP_v6.patch
+makedepends+=" sip4 python3-sip-devel"
+
 do_install() {
 	cd ${wrksrc}/build
 	make DESTDIR="$DESTDIR" install

next prev parent reply	other threads:[~2021-01-21  4:14 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-09  4:34 [PR PATCH] " Nyx70
2020-12-09  4:38 ` [PR PATCH] [Updated] " Nyx70
2020-12-09  5:09 ` Nyx70
2020-12-09  5:21 ` Nyx70
2020-12-09  5:27 ` Nyx70
2020-12-09 11:08 ` Nyx70
2020-12-09 14:46 ` Nyx70
2020-12-09 16:42 ` Nyx70
2020-12-10  8:51 ` Nyx70
2020-12-10  8:54 ` Nyx70
2020-12-10  8:55 ` Nyx70
2020-12-13 16:01 ` Nyx70
2020-12-13 16:03 ` Nyx70
2020-12-13 16:07 ` Nyx70
2020-12-14  5:31 ` Nyx70
2020-12-14  5:42 ` Nyx70
2020-12-15  4:47 ` Nyx70
2020-12-15  4:54 ` Nyx70
2020-12-15  7:27 ` Nyx70
2020-12-17 11:53 ` Nyx70
2020-12-17 12:10 ` Nyx70
2020-12-20 13:44 ` Nyx70
2020-12-20 13:58 ` Nyx70
2020-12-20 14:11 ` Nyx70
2020-12-20 14:13 ` Nyx70
2020-12-20 14:44 ` Nyx70
2020-12-20 15:35 ` Nyx70
2020-12-22 13:05 ` Nyx70
2020-12-22 14:22 ` Nyx70
2020-12-22 14:52 ` Nyx70
2020-12-22 15:05 ` Nyx70
2020-12-22 15:10 ` Nyx70
2020-12-23 18:36 ` Nyx70
2020-12-24 17:30 ` Nyx70
2020-12-24 18:44 ` Nyx70
2020-12-25 13:58 ` Nyx70
2020-12-26  5:49 ` Nyx70
2020-12-26  5:54 ` Nyx70
2020-12-26  6:27 ` Nyx70
2020-12-27  6:24 ` Nyx70
2020-12-27  7:55 ` Nyx70
2020-12-27 10:49 ` Nyx70
2020-12-27 14:05 ` Nyx70
2020-12-27 15:37 ` Nyx70
2020-12-27 15:41 ` Nyx70
2020-12-27 15:45 ` Nyx70
2020-12-27 20:08 ` Nyx70
2020-12-28  5:51 ` Nyx70
2020-12-29  4:57 ` Nyx70
2020-12-29 11:01 ` Nyx70
2020-12-29 16:15 ` Nyx70
2021-01-01 21:32 ` Nyx70
2021-01-05 16:25 ` Nyx70
2021-01-07  6:31 ` Nyx70
2021-01-13 10:56 ` Nyx70
2021-01-20  7:42 ` Nyx70
2021-01-20  7:46 ` Nyx70
2021-01-20  8:30 ` Nyx70
2021-01-20  9:38 ` Nyx70
2021-01-20 10:46 ` Nyx70
2021-01-20 12:10 ` Nyx70
2021-01-20 13:59 ` Nyx70
2021-01-20 18:40 ` Nyx70
2021-01-21  4:14 ` Nyx70 [this message]
2021-01-31 21:56 ` ar-jan
2021-02-01 12:41 ` [PR PATCH] [Updated] " Nyx70
2021-02-03  4:40 ` Nyx70
2021-02-03  5:51 ` Nyx70
2021-02-22  8:24 ` Nyx70
2021-02-22  8:27 ` [PR PATCH] [Updated] [WIP] New package: qgis-3.x.x Nyx70
2021-03-03 19:50 ` Nyx70
2021-03-03 19:52 ` Nyx70
2021-03-03 19:54 ` Nyx70
2021-03-05  2:45 ` sgn
2021-03-06 13:39 ` [PR PATCH] [Updated] " Nyx70
2021-03-06 13:43 ` Nyx70
2021-03-06 13:48 ` Nyx70
2021-03-08  5:42 ` sgn
2021-03-08  5:52 ` [PR REVIEW] " sgn
2021-03-08  6:17 ` sgn
2021-03-08  6:47 ` sgn
2021-04-05 13:24 ` [PR PATCH] [Closed]: " Nyx70
2021-04-05 13:27 ` Nyx70

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210121041449.A86HFVdrAqrVbbkTe_eTBPRA77UcTKEOjtHeR_Gh1FA@z \
    --to=nyx70@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).