Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [WIP] New package: qgis-3.16.x 
@ 2020-12-09  4:34 Nyx70
  2020-12-09  4:38 ` [PR PATCH] [Updated] " Nyx70
                   ` (62 more replies)
  0 siblings, 63 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-09  4:34 UTC (permalink / raw)
  To: ml

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

There is a new 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 / WIP


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

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

From 70b03a07a52eeff73054229700fe5e4bb3e0a172 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/19] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9e7ffe7faacef6c9697fd28ed3e2503edac0da38 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/19] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 61c326f5ddb5a96ea4037153497c2691c6e7730e 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 03/19] libgdal: postgresql and kml support

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..8477eb00fdd 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,31 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
-wrksrc="gdal-${version}"
+version=3.2.0
+revision=1
+wrksrc="gdal-${version}/gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From b463bc82ab308b7aef8a1b56f854e9e2fb93292e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:24:05 +0100
Subject: [PATCH 04/19] libgdal: makedepends fixed

ocl-icd-devel re-added
---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 8477eb00fdd..e942690ae2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
  $(vopt_if kml libkml-devel)"
 short_desc="Geospatial Data Abstraction Library"
 #maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From dca092ab85347cd1b284953c7544ac90f7297ad7 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 05/19] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 970210a548aa3032a59e49d2663fa2e91f096862 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 06/19] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 11 ++++++-----
 srcpkgs/proj/update   |  1 -
 3 files changed, 7 insertions(+), 6 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..f01bbaa5a38 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"
 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"
 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 90e0ef9639854bf5d6265afc3036da713c55c061 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 07/19] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 901650903effcee9b93b924738dd82ed704dcf45 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 08/19] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..90de654898d
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,32 @@
+# Template file for 'libspatialite'
+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 tri-license"
+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"
+
+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 89471e9d7168a815ee4cb4eaecc5c6727cca2484 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 09/19] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 00a753772318cdf2443d39f4753e9afe67dadda0 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 10/19] grass: update to 7.8.4.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 62 ++++++++++++++++++++++++++++--------------
 4 files changed, 59 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..aef5e63ed6a 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,52 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.4
+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>=libgdal-3.1.3_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 79640af38588230247ffc2efbc2d98a22c460d4e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 11/19] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 445075237bcfe81a01da3bcfbee28df135e5a3c0 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:40:23 +0100
Subject: [PATCH 12/19] New package: txt2tags-2.6

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
new file mode 100644
index 00000000000..4217b5e3320
--- /dev/null
+++ b/srcpkgs/txt2tags/template
@@ -0,0 +1,38 @@
+# Template file for 'txt2tags'
+pkgname=txt2tags
+version=2.6
+revision=1
+archs="noarch"
+depends="python"
+short_desc="Python2 document generator"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-2.0-or-later"
+homepage="https://txt2tags.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
+
+do_install() {
+	# bin
+	vbin txt2tags
+	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
+	# man
+	vman doc/English/manpage.man txt2tags.1
+}
+
+# hooks/post-install/01-remove-localized-manpages.sh
+#
+#txt2tags-man_de_package() {
+#	depends="${sourcepkg}>=${version}_${revision}"
+#	short_desc+=" - German man page"
+#	pkg_install() {
+#		vman $wrksrc/doc/German/manpage-de.man txt2tags.de.1
+#	}
+#}
+#
+#txt2tags-man_fr_package() {
+#	depends="${sourcepkg}>=${version}_${revision}"
+#	short_desc+=" - French man page"
+#	pkg_install() {
+#		vman $wrksrc/doc/French/manpage-fr.man txt2tags.fr.1
+#	}
+#}

From adce92dc1b807b5bb72f0cc3f428d591450da22e 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 13/19] 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 5e5a60a5acea6d9c42a60488c501cccb27d41041 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 14/19] 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 635fe2757d6ee050094d413801aa7a3ad2060b82 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 15/19] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 17 +++++++++++++++++
 1 file changed, 17 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..a8c96bee3e9
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-OWSLib'
+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"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+post_install() {
+	vlicense LICENSE
+}

From 0740288c69357e33659faa617b3a991a59c0b464 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 16/19] New package: python3-osgeo-3.2.0

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

diff --git a/srcpkgs/python3-osgeo/template b/srcpkgs/python3-osgeo/template
new file mode 100644
index 00000000000..e1d0cd1486c
--- /dev/null
+++ b/srcpkgs/python3-osgeo/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-osgeo'
+pkgname=python3-osgeo
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 756379a178007f1207d961820b96505ee60cde89 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 17/19] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..f4d844c72f5
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,42 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+hostmakedepends="pkg-config flex bison python3 txt2tags 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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-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-osgeo 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>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 269a48a72dd7b7016402d1a3a1f125a9b59f7bb1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 18/19] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From d58f4ca1ebc7fc5466c68b40af1ff22fd1916484 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 19/19] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
@ 2020-12-09  4:38 ` Nyx70
  2020-12-09  5:09 ` Nyx70
                   ` (61 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-09  4:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 70b03a07a52eeff73054229700fe5e4bb3e0a172 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/19] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9e7ffe7faacef6c9697fd28ed3e2503edac0da38 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/19] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 61c326f5ddb5a96ea4037153497c2691c6e7730e 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 03/19] libgdal: postgresql and kml support

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..8477eb00fdd 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,31 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
-wrksrc="gdal-${version}"
+version=3.2.0
+revision=1
+wrksrc="gdal-${version}/gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From b463bc82ab308b7aef8a1b56f854e9e2fb93292e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:24:05 +0100
Subject: [PATCH 04/19] libgdal: makedepends fixed

ocl-icd-devel re-added
---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 8477eb00fdd..e942690ae2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
  $(vopt_if kml libkml-devel)"
 short_desc="Geospatial Data Abstraction Library"
 #maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From dca092ab85347cd1b284953c7544ac90f7297ad7 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 05/19] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 970210a548aa3032a59e49d2663fa2e91f096862 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 06/19] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 11 ++++++-----
 srcpkgs/proj/update   |  1 -
 3 files changed, 7 insertions(+), 6 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..f01bbaa5a38 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"
 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"
 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 90e0ef9639854bf5d6265afc3036da713c55c061 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 07/19] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 901650903effcee9b93b924738dd82ed704dcf45 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 08/19] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..90de654898d
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,32 @@
+# Template file for 'libspatialite'
+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 tri-license"
+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"
+
+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 89471e9d7168a815ee4cb4eaecc5c6727cca2484 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 09/19] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 00a753772318cdf2443d39f4753e9afe67dadda0 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 10/19] grass: update to 7.8.4.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 62 ++++++++++++++++++++++++++++--------------
 4 files changed, 59 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..aef5e63ed6a 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,52 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.4
+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>=libgdal-3.1.3_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 79640af38588230247ffc2efbc2d98a22c460d4e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 11/19] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From f315f1fb3e0e68b77d24b358ecb51fc9195a2e6d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:40:23 +0100
Subject: [PATCH 12/19] New package: txt2tags-2.6

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
new file mode 100644
index 00000000000..b41cd7df7e5
--- /dev/null
+++ b/srcpkgs/txt2tags/template
@@ -0,0 +1,19 @@
+# Template file for 'txt2tags'
+pkgname=txt2tags
+version=2.6
+revision=1
+depends="python"
+short_desc="Python2 document generator"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-2.0-or-later"
+homepage="https://txt2tags.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
+
+do_install() {
+	# bin
+	vbin txt2tags
+	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
+	# man
+	vman doc/English/manpage.man txt2tags.1
+}

From c8fb12008494b3c7edab4e48e1864d89bc085a94 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 13/19] 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 12a2e3ccbce59212175f62483ae1691f33abb1da 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 14/19] 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 9e605430b75a32ec6092bf5e912722d085464997 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 15/19] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 17 +++++++++++++++++
 1 file changed, 17 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..a8c96bee3e9
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-OWSLib'
+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"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+post_install() {
+	vlicense LICENSE
+}

From abb8f39a4f5d58210ca8804e4a6c740a2d84dcb8 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 16/19] New package: python3-osgeo-3.2.0

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

diff --git a/srcpkgs/python3-osgeo/template b/srcpkgs/python3-osgeo/template
new file mode 100644
index 00000000000..e1d0cd1486c
--- /dev/null
+++ b/srcpkgs/python3-osgeo/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-osgeo'
+pkgname=python3-osgeo
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 710e38a324bd87ad6b3af4578518037a7c41796b Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 17/19] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..f4d844c72f5
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,42 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+hostmakedepends="pkg-config flex bison python3 txt2tags 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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-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-osgeo 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>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 9fb09212c82cee7548595e0bc4d9725d3b6d0f93 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 18/19] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From f16a8b16ab9de119ac7797ab8a9827d498e6760f Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 19/19] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
  2020-12-09  4:38 ` [PR PATCH] [Updated] " Nyx70
@ 2020-12-09  5:09 ` Nyx70
  2020-12-09  5:21 ` Nyx70
                   ` (60 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-09  5:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 70b03a07a52eeff73054229700fe5e4bb3e0a172 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/20] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9e7ffe7faacef6c9697fd28ed3e2503edac0da38 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/20] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 61c326f5ddb5a96ea4037153497c2691c6e7730e 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 03/20] libgdal: postgresql and kml support

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..8477eb00fdd 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,31 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
-wrksrc="gdal-${version}"
+version=3.2.0
+revision=1
+wrksrc="gdal-${version}/gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From b463bc82ab308b7aef8a1b56f854e9e2fb93292e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:24:05 +0100
Subject: [PATCH 04/20] libgdal: makedepends fixed

ocl-icd-devel re-added
---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 8477eb00fdd..e942690ae2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
  $(vopt_if kml libkml-devel)"
 short_desc="Geospatial Data Abstraction Library"
 #maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From f43e9f9b356e583df97965b8458390c040f5a120 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:08:57 +0100
Subject: [PATCH 05/20] libgdal: wrksrc fixed

---
 srcpkgs/libgdal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index e942690ae2a..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -4,7 +4,8 @@
 pkgname=libgdal
 version=3.2.0
 revision=1
-wrksrc="gdal-${version}/gdal"
+wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
  $(vopt_with postgresql pg)"

From e876f6daee9554e748dcf5139671b5dbbb84d8de 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 06/20] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 08ababb6c8fd4ae50848e279e979538bc6303586 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 07/20] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 11 ++++++-----
 srcpkgs/proj/update   |  1 -
 3 files changed, 7 insertions(+), 6 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..f01bbaa5a38 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"
 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"
 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 d5cb696aaa21f8748d2602df2dae6fc9af982940 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/20] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 d263b4f2c33be829c055230d05e0d3c2d5cc5f04 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/20] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..90de654898d
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,32 @@
+# Template file for 'libspatialite'
+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 tri-license"
+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"
+
+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 b38e039da8e294404268a8e25a6586b3de53b33c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/20] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 8f6fb71647e5b3d2c06cff2137b97efd2b882198 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 11/20] grass: update to 7.8.4.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 62 ++++++++++++++++++++++++++++--------------
 4 files changed, 59 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..aef5e63ed6a 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,52 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.4
+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>=libgdal-3.1.3_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 2ce6ba6038c954b4091e9d59cc2c8bff0774b0e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/20] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From fc2a4f6be215bf306af188fb4a2c8225d6ef2668 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:40:23 +0100
Subject: [PATCH 13/20] New package: txt2tags-2.6

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
new file mode 100644
index 00000000000..b41cd7df7e5
--- /dev/null
+++ b/srcpkgs/txt2tags/template
@@ -0,0 +1,19 @@
+# Template file for 'txt2tags'
+pkgname=txt2tags
+version=2.6
+revision=1
+depends="python"
+short_desc="Python2 document generator"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-2.0-or-later"
+homepage="https://txt2tags.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
+
+do_install() {
+	# bin
+	vbin txt2tags
+	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
+	# man
+	vman doc/English/manpage.man txt2tags.1
+}

From 31494a8c58a33c9fe6b48be91ff6da7b49babfca 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 14/20] 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 480caebc819a89a54935d0bab83ecfd17f479a74 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 15/20] 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 7f212fd7793e3758a98a2c63015982ad55a62232 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 16/20] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 17 +++++++++++++++++
 1 file changed, 17 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..a8c96bee3e9
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-OWSLib'
+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"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+post_install() {
+	vlicense LICENSE
+}

From ae9458a7db9e1b20f6a514b2c218eb0c06836cee Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 17/20] New package: python3-osgeo-3.2.0

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

diff --git a/srcpkgs/python3-osgeo/template b/srcpkgs/python3-osgeo/template
new file mode 100644
index 00000000000..e1d0cd1486c
--- /dev/null
+++ b/srcpkgs/python3-osgeo/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-osgeo'
+pkgname=python3-osgeo
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 073990be30116d64db25a17a4dd46783360fd4ab Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 18/20] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..f4d844c72f5
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,42 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+hostmakedepends="pkg-config flex bison python3 txt2tags 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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-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-osgeo 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>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 f009843dac626d4b6abb6961db194aa45a0364e2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 19/20] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 99d1f729a34d06283c93a700a17239e9e7949f74 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 20/20] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x 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
                   ` (59 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-09  5:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 70b03a07a52eeff73054229700fe5e4bb3e0a172 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/21] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9e7ffe7faacef6c9697fd28ed3e2503edac0da38 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/21] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 61c326f5ddb5a96ea4037153497c2691c6e7730e 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 03/21] libgdal: postgresql and kml support

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..8477eb00fdd 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,31 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
-wrksrc="gdal-${version}"
+version=3.2.0
+revision=1
+wrksrc="gdal-${version}/gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From b463bc82ab308b7aef8a1b56f854e9e2fb93292e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:24:05 +0100
Subject: [PATCH 04/21] libgdal: makedepends fixed

ocl-icd-devel re-added
---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 8477eb00fdd..e942690ae2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
  $(vopt_if kml libkml-devel)"
 short_desc="Geospatial Data Abstraction Library"
 #maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From f43e9f9b356e583df97965b8458390c040f5a120 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:08:57 +0100
Subject: [PATCH 05/21] libgdal: wrksrc fixed

---
 srcpkgs/libgdal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index e942690ae2a..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -4,7 +4,8 @@
 pkgname=libgdal
 version=3.2.0
 revision=1
-wrksrc="gdal-${version}/gdal"
+wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
  $(vopt_with postgresql pg)"

From e876f6daee9554e748dcf5139671b5dbbb84d8de 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 06/21] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 08ababb6c8fd4ae50848e279e979538bc6303586 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 07/21] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 11 ++++++-----
 srcpkgs/proj/update   |  1 -
 3 files changed, 7 insertions(+), 6 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..f01bbaa5a38 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"
 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"
 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 d5cb696aaa21f8748d2602df2dae6fc9af982940 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/21] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 d263b4f2c33be829c055230d05e0d3c2d5cc5f04 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/21] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..90de654898d
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,32 @@
+# Template file for 'libspatialite'
+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 tri-license"
+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"
+
+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 b38e039da8e294404268a8e25a6586b3de53b33c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/21] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 8f6fb71647e5b3d2c06cff2137b97efd2b882198 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 11/21] grass: update to 7.8.4.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 62 ++++++++++++++++++++++++++++--------------
 4 files changed, 59 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..aef5e63ed6a 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,52 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.4
+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>=libgdal-3.1.3_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 2ce6ba6038c954b4091e9d59cc2c8bff0774b0e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/21] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From fc2a4f6be215bf306af188fb4a2c8225d6ef2668 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:40:23 +0100
Subject: [PATCH 13/21] New package: txt2tags-2.6

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
new file mode 100644
index 00000000000..b41cd7df7e5
--- /dev/null
+++ b/srcpkgs/txt2tags/template
@@ -0,0 +1,19 @@
+# Template file for 'txt2tags'
+pkgname=txt2tags
+version=2.6
+revision=1
+depends="python"
+short_desc="Python2 document generator"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-2.0-or-later"
+homepage="https://txt2tags.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
+
+do_install() {
+	# bin
+	vbin txt2tags
+	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
+	# man
+	vman doc/English/manpage.man txt2tags.1
+}

From 31494a8c58a33c9fe6b48be91ff6da7b49babfca 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 14/21] 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 480caebc819a89a54935d0bab83ecfd17f479a74 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 15/21] 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 7f212fd7793e3758a98a2c63015982ad55a62232 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 16/21] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 17 +++++++++++++++++
 1 file changed, 17 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..a8c96bee3e9
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-OWSLib'
+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"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+post_install() {
+	vlicense LICENSE
+}

From ae9458a7db9e1b20f6a514b2c218eb0c06836cee Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 17/21] New package: python3-osgeo-3.2.0

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

diff --git a/srcpkgs/python3-osgeo/template b/srcpkgs/python3-osgeo/template
new file mode 100644
index 00000000000..e1d0cd1486c
--- /dev/null
+++ b/srcpkgs/python3-osgeo/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-osgeo'
+pkgname=python3-osgeo
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 073990be30116d64db25a17a4dd46783360fd4ab Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 18/21] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..f4d844c72f5
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,42 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+hostmakedepends="pkg-config flex bison python3 txt2tags 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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-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-osgeo 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>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 f009843dac626d4b6abb6961db194aa45a0364e2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 19/21] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 99d1f729a34d06283c93a700a17239e9e7949f74 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 20/21] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 3b1483732b3d0f39ebaa65ecd25176d30fe9770c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:21:35 +0100
Subject: [PATCH 21/21] python3-OWSLib: license changed

---
 srcpkgs/python3-OWSLib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
index a8c96bee3e9..d9c36a6a2b4 100644
--- a/srcpkgs/python3-OWSLib/template
+++ b/srcpkgs/python3-OWSLib/template
@@ -1,4 +1,6 @@
 # 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
@@ -7,7 +9,7 @@ build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 short_desc="OWSLib Python3 modules"
 maintainer="Bo Son <boson@gmx.at>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://geopython.github.io/OWSLib"
 distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
 checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (2 preceding siblings ...)
  2020-12-09  5:21 ` Nyx70
@ 2020-12-09  5:27 ` Nyx70
  2020-12-09 11:08 ` Nyx70
                   ` (58 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-09  5:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 70b03a07a52eeff73054229700fe5e4bb3e0a172 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/22] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9e7ffe7faacef6c9697fd28ed3e2503edac0da38 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/22] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 61c326f5ddb5a96ea4037153497c2691c6e7730e 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 03/22] libgdal: postgresql and kml support

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..8477eb00fdd 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,31 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
-wrksrc="gdal-${version}"
+version=3.2.0
+revision=1
+wrksrc="gdal-${version}/gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From b463bc82ab308b7aef8a1b56f854e9e2fb93292e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:24:05 +0100
Subject: [PATCH 04/22] libgdal: makedepends fixed

ocl-icd-devel re-added
---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 8477eb00fdd..e942690ae2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
  $(vopt_if kml libkml-devel)"
 short_desc="Geospatial Data Abstraction Library"
 #maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From f43e9f9b356e583df97965b8458390c040f5a120 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:08:57 +0100
Subject: [PATCH 05/22] libgdal: wrksrc fixed

---
 srcpkgs/libgdal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index e942690ae2a..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -4,7 +4,8 @@
 pkgname=libgdal
 version=3.2.0
 revision=1
-wrksrc="gdal-${version}/gdal"
+wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
  $(vopt_with postgresql pg)"

From e876f6daee9554e748dcf5139671b5dbbb84d8de 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 06/22] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 08ababb6c8fd4ae50848e279e979538bc6303586 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 07/22] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 11 ++++++-----
 srcpkgs/proj/update   |  1 -
 3 files changed, 7 insertions(+), 6 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..f01bbaa5a38 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"
 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"
 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 d5cb696aaa21f8748d2602df2dae6fc9af982940 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/22] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 d263b4f2c33be829c055230d05e0d3c2d5cc5f04 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/22] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..90de654898d
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,32 @@
+# Template file for 'libspatialite'
+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 tri-license"
+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"
+
+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 b38e039da8e294404268a8e25a6586b3de53b33c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/22] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 8f6fb71647e5b3d2c06cff2137b97efd2b882198 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 11/22] grass: update to 7.8.4.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 62 ++++++++++++++++++++++++++++--------------
 4 files changed, 59 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..aef5e63ed6a 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,52 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.4
+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>=libgdal-3.1.3_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 2ce6ba6038c954b4091e9d59cc2c8bff0774b0e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/22] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From fc2a4f6be215bf306af188fb4a2c8225d6ef2668 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:40:23 +0100
Subject: [PATCH 13/22] New package: txt2tags-2.6

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
new file mode 100644
index 00000000000..b41cd7df7e5
--- /dev/null
+++ b/srcpkgs/txt2tags/template
@@ -0,0 +1,19 @@
+# Template file for 'txt2tags'
+pkgname=txt2tags
+version=2.6
+revision=1
+depends="python"
+short_desc="Python2 document generator"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-2.0-or-later"
+homepage="https://txt2tags.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
+
+do_install() {
+	# bin
+	vbin txt2tags
+	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
+	# man
+	vman doc/English/manpage.man txt2tags.1
+}

From 31494a8c58a33c9fe6b48be91ff6da7b49babfca 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 14/22] 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 480caebc819a89a54935d0bab83ecfd17f479a74 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 15/22] 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 7f212fd7793e3758a98a2c63015982ad55a62232 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 16/22] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 17 +++++++++++++++++
 1 file changed, 17 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..a8c96bee3e9
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-OWSLib'
+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"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+post_install() {
+	vlicense LICENSE
+}

From ae9458a7db9e1b20f6a514b2c218eb0c06836cee Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 17/22] New package: python3-osgeo-3.2.0

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

diff --git a/srcpkgs/python3-osgeo/template b/srcpkgs/python3-osgeo/template
new file mode 100644
index 00000000000..e1d0cd1486c
--- /dev/null
+++ b/srcpkgs/python3-osgeo/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-osgeo'
+pkgname=python3-osgeo
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 073990be30116d64db25a17a4dd46783360fd4ab Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 18/22] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..f4d844c72f5
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,42 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+hostmakedepends="pkg-config flex bison python3 txt2tags 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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-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-osgeo 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>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 f009843dac626d4b6abb6961db194aa45a0364e2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 19/22] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 99d1f729a34d06283c93a700a17239e9e7949f74 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 20/22] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 3b1483732b3d0f39ebaa65ecd25176d30fe9770c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:21:35 +0100
Subject: [PATCH 21/22] python3-OWSLib: license changed

---
 srcpkgs/python3-OWSLib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
index a8c96bee3e9..d9c36a6a2b4 100644
--- a/srcpkgs/python3-OWSLib/template
+++ b/srcpkgs/python3-OWSLib/template
@@ -1,4 +1,6 @@
 # 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
@@ -7,7 +9,7 @@ build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 short_desc="OWSLib Python3 modules"
 maintainer="Bo Son <boson@gmx.at>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://geopython.github.io/OWSLib"
 distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
 checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66

From 29a89cb4cb1df3512583ebb6ca27072f75291913 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:27:15 +0100
Subject: [PATCH 22/22] libspatialite: license changed

---
 srcpkgs/libspatialite/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 90de654898d..787ae797248 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -1,4 +1,6 @@
 # Template file for 'libspatialite'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+#   license changed
 pkgname=libspatialite
 version=5.0.0
 revision=1
@@ -9,7 +11,7 @@ makedepends="sqlite-devel minizip-devel zlib-devel proj-devel freexl-devel geos-
 depends="sqlite"
 short_desc="Geospatial extension for SQLite"
 maintainer="Bo Son <boson@gmx.at>"
-license="MPL tri-license"
+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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (3 preceding siblings ...)
  2020-12-09  5:27 ` Nyx70
@ 2020-12-09 11:08 ` Nyx70
  2020-12-09 14:46 ` Nyx70
                   ` (57 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-09 11:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 70b03a07a52eeff73054229700fe5e4bb3e0a172 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/23] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9e7ffe7faacef6c9697fd28ed3e2503edac0da38 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/23] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 61c326f5ddb5a96ea4037153497c2691c6e7730e 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 03/23] libgdal: postgresql and kml support

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..8477eb00fdd 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,31 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
-wrksrc="gdal-${version}"
+version=3.2.0
+revision=1
+wrksrc="gdal-${version}/gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From b463bc82ab308b7aef8a1b56f854e9e2fb93292e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:24:05 +0100
Subject: [PATCH 04/23] libgdal: makedepends fixed

ocl-icd-devel re-added
---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 8477eb00fdd..e942690ae2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
  $(vopt_if kml libkml-devel)"
 short_desc="Geospatial Data Abstraction Library"
 #maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From f43e9f9b356e583df97965b8458390c040f5a120 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:08:57 +0100
Subject: [PATCH 05/23] libgdal: wrksrc fixed

---
 srcpkgs/libgdal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index e942690ae2a..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -4,7 +4,8 @@
 pkgname=libgdal
 version=3.2.0
 revision=1
-wrksrc="gdal-${version}/gdal"
+wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
  $(vopt_with postgresql pg)"

From e876f6daee9554e748dcf5139671b5dbbb84d8de 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 06/23] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 08ababb6c8fd4ae50848e279e979538bc6303586 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 07/23] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 11 ++++++-----
 srcpkgs/proj/update   |  1 -
 3 files changed, 7 insertions(+), 6 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..f01bbaa5a38 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"
 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"
 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 d5cb696aaa21f8748d2602df2dae6fc9af982940 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/23] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 d263b4f2c33be829c055230d05e0d3c2d5cc5f04 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/23] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..90de654898d
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,32 @@
+# Template file for 'libspatialite'
+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 tri-license"
+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"
+
+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 b38e039da8e294404268a8e25a6586b3de53b33c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/23] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 8f6fb71647e5b3d2c06cff2137b97efd2b882198 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 11/23] grass: update to 7.8.4.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 62 ++++++++++++++++++++++++++++--------------
 4 files changed, 59 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..aef5e63ed6a 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,52 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.4
+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>=libgdal-3.1.3_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 2ce6ba6038c954b4091e9d59cc2c8bff0774b0e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/23] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From fc2a4f6be215bf306af188fb4a2c8225d6ef2668 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:40:23 +0100
Subject: [PATCH 13/23] New package: txt2tags-2.6

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
new file mode 100644
index 00000000000..b41cd7df7e5
--- /dev/null
+++ b/srcpkgs/txt2tags/template
@@ -0,0 +1,19 @@
+# Template file for 'txt2tags'
+pkgname=txt2tags
+version=2.6
+revision=1
+depends="python"
+short_desc="Python2 document generator"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-2.0-or-later"
+homepage="https://txt2tags.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
+
+do_install() {
+	# bin
+	vbin txt2tags
+	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
+	# man
+	vman doc/English/manpage.man txt2tags.1
+}

From 31494a8c58a33c9fe6b48be91ff6da7b49babfca 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 14/23] 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 480caebc819a89a54935d0bab83ecfd17f479a74 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 15/23] 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 7f212fd7793e3758a98a2c63015982ad55a62232 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 16/23] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 17 +++++++++++++++++
 1 file changed, 17 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..a8c96bee3e9
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-OWSLib'
+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"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+post_install() {
+	vlicense LICENSE
+}

From ae9458a7db9e1b20f6a514b2c218eb0c06836cee Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 17/23] New package: python3-osgeo-3.2.0

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

diff --git a/srcpkgs/python3-osgeo/template b/srcpkgs/python3-osgeo/template
new file mode 100644
index 00000000000..e1d0cd1486c
--- /dev/null
+++ b/srcpkgs/python3-osgeo/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-osgeo'
+pkgname=python3-osgeo
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 073990be30116d64db25a17a4dd46783360fd4ab Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 18/23] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..f4d844c72f5
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,42 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+hostmakedepends="pkg-config flex bison python3 txt2tags 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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-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-osgeo 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>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 f009843dac626d4b6abb6961db194aa45a0364e2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 19/23] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 99d1f729a34d06283c93a700a17239e9e7949f74 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 20/23] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 3b1483732b3d0f39ebaa65ecd25176d30fe9770c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:21:35 +0100
Subject: [PATCH 21/23] python3-OWSLib: license changed

---
 srcpkgs/python3-OWSLib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
index a8c96bee3e9..d9c36a6a2b4 100644
--- a/srcpkgs/python3-OWSLib/template
+++ b/srcpkgs/python3-OWSLib/template
@@ -1,4 +1,6 @@
 # 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
@@ -7,7 +9,7 @@ build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 short_desc="OWSLib Python3 modules"
 maintainer="Bo Son <boson@gmx.at>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://geopython.github.io/OWSLib"
 distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
 checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66

From 29a89cb4cb1df3512583ebb6ca27072f75291913 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:27:15 +0100
Subject: [PATCH 22/23] libspatialite: license changed

---
 srcpkgs/libspatialite/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 90de654898d..787ae797248 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -1,4 +1,6 @@
 # Template file for 'libspatialite'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+#   license changed
 pkgname=libspatialite
 version=5.0.0
 revision=1
@@ -9,7 +11,7 @@ makedepends="sqlite-devel minizip-devel zlib-devel proj-devel freexl-devel geos-
 depends="sqlite"
 short_desc="Geospatial extension for SQLite"
 maintainer="Bo Son <boson@gmx.at>"
-license="MPL tri-license"
+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

From 1f88c28590d9c3de95cd3c25870654dc4247d70e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 12:07:16 +0100
Subject: [PATCH 23/23] proj: configure_args fixed

-DPROJ_TESTS=OFF with -DBUILD_TESTING=OFF replaced
---
 srcpkgs/proj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index f01bbaa5a38..3a6569178e6 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -4,7 +4,7 @@ pkgname=proj
 version=7.2.0
 revision=1
 build_style=cmake
-configure_args="-DPROJ_TESTS=OFF"
+configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="python3"
 makedepends="sqlite-devel tiff-devel libcurl-devel"
 short_desc="Cartographic Projections Library"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (4 preceding siblings ...)
  2020-12-09 11:08 ` Nyx70
@ 2020-12-09 14:46 ` Nyx70
  2020-12-09 16:42 ` Nyx70
                   ` (56 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-09 14:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 70b03a07a52eeff73054229700fe5e4bb3e0a172 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/26] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9e7ffe7faacef6c9697fd28ed3e2503edac0da38 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/26] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 61c326f5ddb5a96ea4037153497c2691c6e7730e 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 03/26] libgdal: postgresql and kml support

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..8477eb00fdd 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,31 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
-wrksrc="gdal-${version}"
+version=3.2.0
+revision=1
+wrksrc="gdal-${version}/gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From b463bc82ab308b7aef8a1b56f854e9e2fb93292e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:24:05 +0100
Subject: [PATCH 04/26] libgdal: makedepends fixed

ocl-icd-devel re-added
---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 8477eb00fdd..e942690ae2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
  $(vopt_if kml libkml-devel)"
 short_desc="Geospatial Data Abstraction Library"
 #maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From f43e9f9b356e583df97965b8458390c040f5a120 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:08:57 +0100
Subject: [PATCH 05/26] libgdal: wrksrc fixed

---
 srcpkgs/libgdal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index e942690ae2a..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -4,7 +4,8 @@
 pkgname=libgdal
 version=3.2.0
 revision=1
-wrksrc="gdal-${version}/gdal"
+wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
  $(vopt_with postgresql pg)"

From e876f6daee9554e748dcf5139671b5dbbb84d8de 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 06/26] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 08ababb6c8fd4ae50848e279e979538bc6303586 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 07/26] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 11 ++++++-----
 srcpkgs/proj/update   |  1 -
 3 files changed, 7 insertions(+), 6 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..f01bbaa5a38 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"
 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"
 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 d5cb696aaa21f8748d2602df2dae6fc9af982940 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/26] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 d263b4f2c33be829c055230d05e0d3c2d5cc5f04 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/26] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..90de654898d
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,32 @@
+# Template file for 'libspatialite'
+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 tri-license"
+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"
+
+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 b38e039da8e294404268a8e25a6586b3de53b33c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/26] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 8f6fb71647e5b3d2c06cff2137b97efd2b882198 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 11/26] grass: update to 7.8.4.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 62 ++++++++++++++++++++++++++++--------------
 4 files changed, 59 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..aef5e63ed6a 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,52 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.4
+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>=libgdal-3.1.3_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 2ce6ba6038c954b4091e9d59cc2c8bff0774b0e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/26] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From fc2a4f6be215bf306af188fb4a2c8225d6ef2668 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:40:23 +0100
Subject: [PATCH 13/26] New package: txt2tags-2.6

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
new file mode 100644
index 00000000000..b41cd7df7e5
--- /dev/null
+++ b/srcpkgs/txt2tags/template
@@ -0,0 +1,19 @@
+# Template file for 'txt2tags'
+pkgname=txt2tags
+version=2.6
+revision=1
+depends="python"
+short_desc="Python2 document generator"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-2.0-or-later"
+homepage="https://txt2tags.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
+
+do_install() {
+	# bin
+	vbin txt2tags
+	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
+	# man
+	vman doc/English/manpage.man txt2tags.1
+}

From 31494a8c58a33c9fe6b48be91ff6da7b49babfca 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 14/26] 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 480caebc819a89a54935d0bab83ecfd17f479a74 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 15/26] 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 7f212fd7793e3758a98a2c63015982ad55a62232 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 16/26] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 17 +++++++++++++++++
 1 file changed, 17 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..a8c96bee3e9
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-OWSLib'
+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"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+post_install() {
+	vlicense LICENSE
+}

From ae9458a7db9e1b20f6a514b2c218eb0c06836cee Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 17/26] New package: python3-osgeo-3.2.0

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

diff --git a/srcpkgs/python3-osgeo/template b/srcpkgs/python3-osgeo/template
new file mode 100644
index 00000000000..e1d0cd1486c
--- /dev/null
+++ b/srcpkgs/python3-osgeo/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-osgeo'
+pkgname=python3-osgeo
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 073990be30116d64db25a17a4dd46783360fd4ab Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 18/26] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..f4d844c72f5
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,42 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+hostmakedepends="pkg-config flex bison python3 txt2tags 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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-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-osgeo 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>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 f009843dac626d4b6abb6961db194aa45a0364e2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 19/26] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 99d1f729a34d06283c93a700a17239e9e7949f74 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 20/26] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 3b1483732b3d0f39ebaa65ecd25176d30fe9770c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:21:35 +0100
Subject: [PATCH 21/26] python3-OWSLib: license changed

---
 srcpkgs/python3-OWSLib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
index a8c96bee3e9..d9c36a6a2b4 100644
--- a/srcpkgs/python3-OWSLib/template
+++ b/srcpkgs/python3-OWSLib/template
@@ -1,4 +1,6 @@
 # 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
@@ -7,7 +9,7 @@ build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 short_desc="OWSLib Python3 modules"
 maintainer="Bo Son <boson@gmx.at>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://geopython.github.io/OWSLib"
 distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
 checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66

From 29a89cb4cb1df3512583ebb6ca27072f75291913 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:27:15 +0100
Subject: [PATCH 22/26] libspatialite: license changed

---
 srcpkgs/libspatialite/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 90de654898d..787ae797248 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -1,4 +1,6 @@
 # Template file for 'libspatialite'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+#   license changed
 pkgname=libspatialite
 version=5.0.0
 revision=1
@@ -9,7 +11,7 @@ makedepends="sqlite-devel minizip-devel zlib-devel proj-devel freexl-devel geos-
 depends="sqlite"
 short_desc="Geospatial extension for SQLite"
 maintainer="Bo Son <boson@gmx.at>"
-license="MPL tri-license"
+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

From 1f88c28590d9c3de95cd3c25870654dc4247d70e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 12:07:16 +0100
Subject: [PATCH 23/26] proj: configure_args fixed

-DPROJ_TESTS=OFF with -DBUILD_TESTING=OFF replaced
---
 srcpkgs/proj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index f01bbaa5a38..3a6569178e6 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -4,7 +4,7 @@ pkgname=proj
 version=7.2.0
 revision=1
 build_style=cmake
-configure_args="-DPROJ_TESTS=OFF"
+configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="python3"
 makedepends="sqlite-devel tiff-devel libcurl-devel"
 short_desc="Cartographic Projections Library"

From 82b9319fb47c476cb9ee1f882612c64f436aec41 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 13:11:58 +0100
Subject: [PATCH 24/26] grass: depends fixed

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

diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index aef5e63ed6a..82afecc3ec3 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,5 +1,6 @@
 # Template file for 'grass'
 # Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# Modified by Nyx70 <n.y.x@bluewin.ch>
 pkgname=grass
 version=7.8.4
 revision=1
@@ -23,10 +24,11 @@ makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel fftw-devel
  $(vopt_if mysql libmysqlclient-devel)
  $(vopt_if nls gettext-devel)
  $(vopt_if postgres postgresql-libs-devel)"
-depends="python-numpy wxPython libgdal>=libgdal-3.1.3_1"
+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="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://github.com/OSGeo/grass/archive/${version}.tar.gz"

From 14a3922f5714609fb61348af244dc8f9e37d8733 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 15:41:03 +0100
Subject: [PATCH 25/26] qgis: hostmakedepends edited

unused txt2tags removed
---
 srcpkgs/qgis/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index f4d844c72f5..23b1054b412 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,4 +1,5 @@
 # Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
 pkgname=qgis
 version=3.16.1
 revision=1
@@ -6,7 +7,7 @@ archs="x86_64"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
-hostmakedepends="pkg-config flex bison python3 txt2tags protobuf24"
+hostmakedepends="pkg-config flex bison python3 protobuf24"
 makedepends="gsl-devel hdf5-devel protobuf24-devel
  ocl-icd-devel opencl-clhpp
  exiv2-devel expat-devel
@@ -27,7 +28,8 @@ depends="python3-PyQt5 python3-PyQt5-Qsci python3-PyQt5-sql python3-PyQt5-svg
  python3-Pillow python3-osgeo 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="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"

From ed9ecd434de76614d1cf62ba43e9b3341ae58dc4 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 15:46:17 +0100
Subject: [PATCH 26/26] txt2tags: removed

---
 srcpkgs/txt2tags/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/txt2tags/template

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
deleted file mode 100644
index b41cd7df7e5..00000000000
--- a/srcpkgs/txt2tags/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'txt2tags'
-pkgname=txt2tags
-version=2.6
-revision=1
-depends="python"
-short_desc="Python2 document generator"
-maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
-license="GPL-2.0-or-later"
-homepage="https://txt2tags.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
-
-do_install() {
-	# bin
-	vbin txt2tags
-	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
-	# man
-	vman doc/English/manpage.man txt2tags.1
-}

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (5 preceding siblings ...)
  2020-12-09 14:46 ` Nyx70
@ 2020-12-09 16:42 ` Nyx70
  2020-12-10  8:51 ` Nyx70
                   ` (55 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-09 16:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 70b03a07a52eeff73054229700fe5e4bb3e0a172 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/26] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9e7ffe7faacef6c9697fd28ed3e2503edac0da38 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/26] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 61c326f5ddb5a96ea4037153497c2691c6e7730e 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 03/26] libgdal: postgresql and kml support

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 28 ++++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..8477eb00fdd 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,31 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
-wrksrc="gdal-${version}"
+version=3.2.0
+revision=1
+wrksrc="gdal-${version}/gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From b463bc82ab308b7aef8a1b56f854e9e2fb93292e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:24:05 +0100
Subject: [PATCH 04/26] libgdal: makedepends fixed

ocl-icd-devel re-added
---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 8477eb00fdd..e942690ae2a 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -12,7 +12,7 @@ hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
 makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
  libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
  libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel $(vopt_if postgresql postgresql-libs-devel)
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
  $(vopt_if kml libkml-devel)"
 short_desc="Geospatial Data Abstraction Library"
 #maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"

From f43e9f9b356e583df97965b8458390c040f5a120 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:08:57 +0100
Subject: [PATCH 05/26] libgdal: wrksrc fixed

---
 srcpkgs/libgdal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index e942690ae2a..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -4,7 +4,8 @@
 pkgname=libgdal
 version=3.2.0
 revision=1
-wrksrc="gdal-${version}/gdal"
+wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
  $(vopt_with postgresql pg)"

From e876f6daee9554e748dcf5139671b5dbbb84d8de 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 06/26] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 08ababb6c8fd4ae50848e279e979538bc6303586 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 07/26] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 11 ++++++-----
 srcpkgs/proj/update   |  1 -
 3 files changed, 7 insertions(+), 6 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..f01bbaa5a38 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"
 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"
 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 d5cb696aaa21f8748d2602df2dae6fc9af982940 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/26] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 d263b4f2c33be829c055230d05e0d3c2d5cc5f04 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/26] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..90de654898d
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,32 @@
+# Template file for 'libspatialite'
+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 tri-license"
+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"
+
+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 b38e039da8e294404268a8e25a6586b3de53b33c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/26] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 8f6fb71647e5b3d2c06cff2137b97efd2b882198 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 11/26] grass: update to 7.8.4.

---
 srcpkgs/grass/INSTALL  |  5 ++++
 srcpkgs/grass/REMOVE   |  5 ++++
 srcpkgs/grass/shlibs   |  7 +++++
 srcpkgs/grass/template | 62 ++++++++++++++++++++++++++++--------------
 4 files changed, 59 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..aef5e63ed6a 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,52 @@
 # Template file for 'grass'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
 pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.4
+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>=libgdal-3.1.3_1"
+short_desc="Geographic Resources Analysis Support System"
+#maintainer="Alex Jarosch <research@alexj.at>"
+maintainer="Monkey-7-12 <monkeyseven@fblog.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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 2ce6ba6038c954b4091e9d59cc2c8bff0774b0e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/26] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From fc2a4f6be215bf306af188fb4a2c8225d6ef2668 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:40:23 +0100
Subject: [PATCH 13/26] New package: txt2tags-2.6

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

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
new file mode 100644
index 00000000000..b41cd7df7e5
--- /dev/null
+++ b/srcpkgs/txt2tags/template
@@ -0,0 +1,19 @@
+# Template file for 'txt2tags'
+pkgname=txt2tags
+version=2.6
+revision=1
+depends="python"
+short_desc="Python2 document generator"
+maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-2.0-or-later"
+homepage="https://txt2tags.org/"
+distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
+checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
+
+do_install() {
+	# bin
+	vbin txt2tags
+	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
+	# man
+	vman doc/English/manpage.man txt2tags.1
+}

From 31494a8c58a33c9fe6b48be91ff6da7b49babfca 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 14/26] 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 480caebc819a89a54935d0bab83ecfd17f479a74 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 15/26] 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 7f212fd7793e3758a98a2c63015982ad55a62232 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 16/26] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 17 +++++++++++++++++
 1 file changed, 17 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..a8c96bee3e9
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-OWSLib'
+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"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+post_install() {
+	vlicense LICENSE
+}

From ae9458a7db9e1b20f6a514b2c218eb0c06836cee Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 17/26] New package: python3-osgeo-3.2.0

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

diff --git a/srcpkgs/python3-osgeo/template b/srcpkgs/python3-osgeo/template
new file mode 100644
index 00000000000..e1d0cd1486c
--- /dev/null
+++ b/srcpkgs/python3-osgeo/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-osgeo'
+pkgname=python3-osgeo
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 073990be30116d64db25a17a4dd46783360fd4ab Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 18/26] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..f4d844c72f5
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,42 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+hostmakedepends="pkg-config flex bison python3 txt2tags 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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ libspatialite libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-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-osgeo 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>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 f009843dac626d4b6abb6961db194aa45a0364e2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 19/26] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 99d1f729a34d06283c93a700a17239e9e7949f74 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 20/26] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 3b1483732b3d0f39ebaa65ecd25176d30fe9770c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:21:35 +0100
Subject: [PATCH 21/26] python3-OWSLib: license changed

---
 srcpkgs/python3-OWSLib/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
index a8c96bee3e9..d9c36a6a2b4 100644
--- a/srcpkgs/python3-OWSLib/template
+++ b/srcpkgs/python3-OWSLib/template
@@ -1,4 +1,6 @@
 # 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
@@ -7,7 +9,7 @@ build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
 short_desc="OWSLib Python3 modules"
 maintainer="Bo Son <boson@gmx.at>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="https://geopython.github.io/OWSLib"
 distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
 checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66

From 29a89cb4cb1df3512583ebb6ca27072f75291913 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 06:27:15 +0100
Subject: [PATCH 22/26] libspatialite: license changed

---
 srcpkgs/libspatialite/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 90de654898d..787ae797248 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -1,4 +1,6 @@
 # Template file for 'libspatialite'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+#   license changed
 pkgname=libspatialite
 version=5.0.0
 revision=1
@@ -9,7 +11,7 @@ makedepends="sqlite-devel minizip-devel zlib-devel proj-devel freexl-devel geos-
 depends="sqlite"
 short_desc="Geospatial extension for SQLite"
 maintainer="Bo Son <boson@gmx.at>"
-license="MPL tri-license"
+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

From 1f88c28590d9c3de95cd3c25870654dc4247d70e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 12:07:16 +0100
Subject: [PATCH 23/26] proj: configure_args fixed

-DPROJ_TESTS=OFF with -DBUILD_TESTING=OFF replaced
---
 srcpkgs/proj/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index f01bbaa5a38..3a6569178e6 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -4,7 +4,7 @@ pkgname=proj
 version=7.2.0
 revision=1
 build_style=cmake
-configure_args="-DPROJ_TESTS=OFF"
+configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="python3"
 makedepends="sqlite-devel tiff-devel libcurl-devel"
 short_desc="Cartographic Projections Library"

From 82b9319fb47c476cb9ee1f882612c64f436aec41 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 13:11:58 +0100
Subject: [PATCH 24/26] grass: depends fixed

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

diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index aef5e63ed6a..82afecc3ec3 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,5 +1,6 @@
 # Template file for 'grass'
 # Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# Modified by Nyx70 <n.y.x@bluewin.ch>
 pkgname=grass
 version=7.8.4
 revision=1
@@ -23,10 +24,11 @@ makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel fftw-devel
  $(vopt_if mysql libmysqlclient-devel)
  $(vopt_if nls gettext-devel)
  $(vopt_if postgres postgresql-libs-devel)"
-depends="python-numpy wxPython libgdal>=libgdal-3.1.3_1"
+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="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://github.com/OSGeo/grass/archive/${version}.tar.gz"

From 65e54bf2eb474570cb1698a5a6546948cfff8074 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 15:41:03 +0100
Subject: [PATCH 25/26] qgis: hostmakedepends/makedepends edited

unused txt2tags removed
grass-version temporarily removed
---
 srcpkgs/qgis/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index f4d844c72f5..e97f6893eb4 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -1,4 +1,5 @@
 # Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
 pkgname=qgis
 version=3.16.1
 revision=1
@@ -6,7 +7,7 @@ archs="x86_64"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
-hostmakedepends="pkg-config flex bison python3 txt2tags protobuf24"
+hostmakedepends="pkg-config flex bison python3 protobuf24"
 makedepends="gsl-devel hdf5-devel protobuf24-devel
  ocl-icd-devel opencl-clhpp
  exiv2-devel expat-devel
@@ -18,16 +19,18 @@ makedepends="gsl-devel hdf5-devel protobuf24-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>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+ geos-devel grass libgdal-devel proj-devel
  libspatialite libspatialindex-devel libspatialite-devel
  postgresql-libs-devel sqlite-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-osgeo 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="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"

From 64e70bdf4615a760183ab1beecd709176febec2d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 15:46:17 +0100
Subject: [PATCH 26/26] txt2tags: removed

---
 srcpkgs/txt2tags/template | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 srcpkgs/txt2tags/template

diff --git a/srcpkgs/txt2tags/template b/srcpkgs/txt2tags/template
deleted file mode 100644
index b41cd7df7e5..00000000000
--- a/srcpkgs/txt2tags/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'txt2tags'
-pkgname=txt2tags
-version=2.6
-revision=1
-depends="python"
-short_desc="Python2 document generator"
-maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
-license="GPL-2.0-or-later"
-homepage="https://txt2tags.org/"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz"
-checksum=c87b911ac5cc97dd2fdb6067601cf4fbd0094a065f6b7a593142fa75e3a924c1
-
-do_install() {
-	# bin
-	vbin txt2tags
-	vsed -i $DESTDIR/usr/bin/txt2tags -e '1c #!/usr/bin/env python2'
-	# man
-	vman doc/English/manpage.man txt2tags.1
-}

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (6 preceding siblings ...)
  2020-12-09 16:42 ` Nyx70
@ 2020-12-10  8:51 ` Nyx70
  2020-12-10  8:54 ` Nyx70
                   ` (54 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-10  8:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From b63a9fadda56b3d832c5d5eda69084129d05af7b 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/19] 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                | 23 +++++++++++++++++++++++
 4 files changed, 47 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..f0775cfc16b
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,23 @@
+# 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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 61acf3ff7cc303e16a40af55bfba9a831249ac63 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/19] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 50e2c3e3217e2b9f2aee2f5fb8ec8ce6bb96aa55 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 03/19] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From ca09879acc7d5d04b037b05b83be4f25f2ac3c66 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 04/19] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 aea02fc523a5e45b369abb3aa363fd413e762da3 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 05/19] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 a11657d5d9e36b2e61d9ecab7a68e2e58de4826a Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 06/19] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 79806cd225cf91a4a3bedb8dca76c7f1da90c2f4 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 07/19] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 6cb1cae481bc1e06cca2197fe2f7676e7b7072b3 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 08/19] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 909dfe9ae571cf9a2e6c65329816258da31780c6 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/19] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 702bd51428578265f6b948de4ffd0d9db94c2ad2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 10/19] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From cfb4e3028b0fdbc7aaf871d631dfa7d464fef3d7 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 11/19] 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 3001c8d213824ab646d814216fe83b1f7ad942c0 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/19] 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 84e6bd7c91870168add6d636d36050351a23dcd2 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 13/19] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 31c63ca833cc9fe1159adbf05e9107b329b69e76 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 14/19] New package: python3-gdal-3.2.0

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

diff --git a/srcpkgs/python3-gdal/template b/srcpkgs/python3-gdal/template
new file mode 100644
index 00000000000..57e89d7ae3f
--- /dev/null
+++ b/srcpkgs/python3-gdal/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-gdal'
+pkgname=python3-gdal
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 0d8c985d222d7c7249a451759a81cc66c764ea22 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 15/19] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 4d91cfffd3104117b7154fc39635bd78317f5643 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 16/19] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 1b517ca717ca741294afbac682820bbecce2f780 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 17/19] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From d16aa9cf32129ff5eb099a4bd29d32aefe343ddc Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 18/19] 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 9a816373ea574120ebeaa96be1d02019ea2e136c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 19/19] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (7 preceding siblings ...)
  2020-12-10  8:51 ` Nyx70
@ 2020-12-10  8:54 ` Nyx70
  2020-12-10  8:55 ` Nyx70
                   ` (53 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-10  8:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From fcf13813d559a268de5d12edf7c494a765f6c6dc 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/19] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 1520adf542da0467a0bbd3e53388ef3bfd060d03 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/19] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 cf33766680681cf56cd15830b16e05832a640700 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 03/19] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From 245e5e2013216bc6ee38f2b769a11a8a0093f441 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 04/19] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 0c56f166cf776b4b152f6cfac58eb6b1be2aaa80 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 05/19] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 c4a9fc10077d7752e4c0cbbd35a8a6a6517a4a0f Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 06/19] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 a4ddf2375eebbfeddc68b6d6f85215ab6e3d91c0 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 07/19] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 ac361fd4a5c5138b9fd2f9339eb4f5dda21c8757 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 08/19] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 1dd9e93d140488824123dd5c13a5099008393a36 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/19] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 22e39002ce2dae8c0203793f2c2e41f3ea4258e3 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 10/19] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 5ab9af684127a711d39c0e6abe178d783573a459 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 11/19] 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 08de9b8a2dd9a417bc8e0391e42fce887efc0372 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/19] 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 2b6ef092c4c5bf93bdcc44355e75498c3fd7a7ac 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 13/19] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 0f37edf2b1f561a86afdcf008575d6ed1cf307d3 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 14/19] New package: python3-gdal-3.2.0

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

diff --git a/srcpkgs/python3-gdal/template b/srcpkgs/python3-gdal/template
new file mode 100644
index 00000000000..57e89d7ae3f
--- /dev/null
+++ b/srcpkgs/python3-gdal/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-gdal'
+pkgname=python3-gdal
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 247383fed97626ccb0806243e9e2e2458db61655 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 15/19] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 e914237f1f60ed7e252c6c9a1b1f018338ee3440 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 16/19] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 6371cdcf029d619b7ead5ffa35355f9410188c7d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 17/19] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From b50f6595da5b73d454e2326b3b93bb8f69350c96 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 18/19] 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 61e591f5583d960d1c366947f78a7e688edc4f0d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 19/19] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (8 preceding siblings ...)
  2020-12-10  8:54 ` Nyx70
@ 2020-12-10  8:55 ` Nyx70
  2020-12-13 16:01 ` Nyx70
                   ` (52 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-10  8:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From e7b9de96edaf297e556a9751294dcd767082a2c3 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/19] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From aa2c587d652758c4c1dee47340463e52e17d6c8a Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 02/19] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 2c62bcccd8ee4d3000153e91d8e6ba747f111254 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 03/19] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From d744715e202fc2be087128a02ad53d98b7ee43b9 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 04/19] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 61a302937bb9b01aae0b9077fb056696b5900906 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 05/19] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 f6ecc88b7c3fce4422232813d8f22c1461b001e6 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 06/19] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 eda784f17ebdb9a40187343bcd94eff0a0d6a5fd Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 07/19] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 6c69d6933bbc3b4228a17cf45b006a8029889e9a Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 08/19] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 19ae1d16473836e47c941491aae7b13e71b34a89 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/19] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 ff39ae21f9b5016e15782572bd0d820283862015 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 10/19] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From eacc2816d7739585e6640a4a99b3aaf8e81438ba 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 11/19] 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 42d6b5059f446338818346dad4e54c51e2547a30 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/19] 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 91bed2f6e51b886189bc66d8c39cf8b484d6c521 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 13/19] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From b1172a2d04a3af65f1fd15d22875288d07e8c8dc Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:52:45 +0100
Subject: [PATCH 14/19] New package: python3-gdal-3.2.0

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

diff --git a/srcpkgs/python3-gdal/template b/srcpkgs/python3-gdal/template
new file mode 100644
index 00000000000..57e89d7ae3f
--- /dev/null
+++ b/srcpkgs/python3-gdal/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-gdal'
+pkgname=python3-gdal
+version=3.2.0
+revision=1
+wrksrc=GDAL-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-numpy libgdal-devel>=${version} python3-devel"
+depends="libgdal>=${version} python3-numpy"
+short_desc="GDAL Python3 bindings"
+maintainer="Bo Son <boson@gmx.at>"
+license="GPL-3.0-or-later"
+homepage="https://pypi.org/project/GDAL/"
+distfiles="${PYPI_SITE}/G/GDAL/GDAL-${version}.tar.gz"
+checksum=2b758fbe60f7ec5c38400d72630df633765e46b5f3f54bcb3115eaea0d531a36

From 231dc424df212d7c7e6fb91066e6f75b59b0fe3e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 15/19] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 2a9c1e276d325854f1a1028be69879006de7aa25 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 16/19] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 5c390ffef6e9707d96b6d0a8648bbdf2baad97a1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 17/19] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 7c27a540322cc64ebc74b08a82aa92c8dcc9a3cf Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 18/19] 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 e365a7a1be562b72be275d87ffc24e29c082630a Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 19/19] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (9 preceding siblings ...)
  2020-12-10  8:55 ` Nyx70
@ 2020-12-13 16:01 ` Nyx70
  2020-12-13 16:03 ` Nyx70
                   ` (51 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-13 16:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From e7b9de96edaf297e556a9751294dcd767082a2c3 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/20] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 3063ab7416b47c4a6ef29aa462f5b927df3cf0d7 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/20] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 8dbdad0a7625546a4bb3ea883b7ab2e04cf142b4 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/20] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 3ba07ad0ca2..59108d0b9e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,3 +4000,10 @@ libnotcurses.so.2 notcurses-2.0.4_1
 libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
+# qgis ...
+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 a17e7ea067e7e96852c3650d6ede68f1f4da9d40 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 04/20] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From 05e0ccebdc5ad68258f0141f905b766086714ada Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/20] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..a2973b58d25 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 4180a1371a23986e0be1e4d733549eaf5e01fa1e 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 06/20] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 59108d0b9e2..9d7bdb85ae5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 2ed2ba10fb4946fd9d82bd5d64009dea03a283ab 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 07/20] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 88df4465fe0c94852478ae9ddb5952f62455414a Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/20] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9d7bdb85ae5..d13c193a4fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 5f98b97d41a07459cadd4f14d0053a076dac9bf4 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/20] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 862418b1894e924f797d4fd2ec5d141a59425f41 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/20] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index d13c193a4fb..564dfe86753 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From adb09f81c9abba95de5eccd712f2851042fe7587 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 11/20] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 978e6bcec4b96825c535e2c67c09d7e345401626 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/20] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 564dfe86753..731898f26a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 344dcde32847e3b78df6fa594fbf0161bcc79949 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 13/20] 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 69227075cc2788080f1789f1e4f8ce2497cebc54 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 14/20] 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 22721e6560fe4a7d7a7aa3891d61f39b481378ca 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 15/20] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 53c3b550c3a062de9e379a179be50072550db1e0 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 16/20] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 91a64f34be68b8251f0ff0852a9dada58daf7b27 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 17/20] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 731898f26a1..11f3cc698e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4016,3 +4016,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 3853043508d1f58e24ca90cccd3372dac98e626e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 18/20] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 11f3cc698e2..58e64c3f35d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,6 +4001,8 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 770970bfc1d93a6f0ba8c1b1e286622648329258 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 19/20] 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 c667f178781c99b1cf7f08a05a7b253a198744d3 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 20/20] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (10 preceding siblings ...)
  2020-12-13 16:01 ` Nyx70
@ 2020-12-13 16:03 ` Nyx70
  2020-12-13 16:07 ` Nyx70
                   ` (50 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-13 16:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 0c91afcfb689ceac8176c3ea848049f5eea69936 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/20] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From a1eb510ed0382a59ecd480270b2cbe533fef7574 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/20] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From d8a675cc41e729e0fa9b34541a09b8177cce2ea1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/20] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 33bcda7378e..70d026395b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,3 +4001,10 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
+# qgis ...
+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 f6c43c57cb2d0cc0be5acbea4a8a28f0c2e83d57 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 04/20] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From 9ede03b961339c7ba79134a71e6ed318c8511ff1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/20] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..a2973b58d25 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 12d99e02d791a56b29c7b11a719358435e00da36 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 06/20] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 70d026395b8..7725ef10a70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 948ca5d21f614dbc305d76a611eddd62eefd91ab 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 07/20] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 24cb7b58eac5ef31dca337874f6d1503a659a3a8 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/20] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 7725ef10a70..546148086de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 cbfc90e96357f236662e48ebad281476bcf91aeb Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/20] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 c0558d8a1943aad809dce8ee8a9e5c4bbaa25f0e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/20] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 546148086de..e1d1dfcfc2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4008,3 +4008,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 845c4868fb79d06742b24975001173728c48d253 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 11/20] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 3fccf592615aab6903a9e359896b636d7394d3a2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/20] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index e1d1dfcfc2e..fcb038a71c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4010,3 +4010,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 3592c96c1feb5f9231017938ac51e384deaac032 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 13/20] 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 2fbbb5f1942c70ac5b0f59dbfae2d815ffece781 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 14/20] 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 2021574ec91daace858dd40c35a7950d1b8f1e4e 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 15/20] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From c8ef970628dc5b3942d6b88925216ae275ce0a35 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 16/20] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 bab9619e5e667f765aaf963c4e368ab57e783d82 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 17/20] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index fcb038a71c5..1680281c1a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4017,3 +4017,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 5d9d77ff80fb13acdc4a1d582e09a879c0f77782 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 18/20] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 1680281c1a1..8235418077d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4002,6 +4002,8 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 618e112dfdf2ebcffe3d7163a8cd6165af2f09d1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 19/20] 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 4265024ecf9d9d07b15911538a1b1284d6c93df5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 20/20] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (11 preceding siblings ...)
  2020-12-13 16:03 ` Nyx70
@ 2020-12-13 16:07 ` Nyx70
  2020-12-14  5:31 ` Nyx70
                   ` (49 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-13 16:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 0c91afcfb689ceac8176c3ea848049f5eea69936 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/20] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From a1eb510ed0382a59ecd480270b2cbe533fef7574 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/20] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From d8a675cc41e729e0fa9b34541a09b8177cce2ea1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/20] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 33bcda7378e..70d026395b8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4001,3 +4001,10 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
+# qgis ...
+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 f6c43c57cb2d0cc0be5acbea4a8a28f0c2e83d57 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 04/20] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From a3d622d6353d481de6e8e16d5ffcf8369a16d333 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/20] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 41fdc999bb543021cfb891157756fa53cf7fa773 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 06/20] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 70d026395b8..7725ef10a70 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 5963497131d5637282dc39fecbf3963d1a56f863 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 07/20] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 cf3a91de527537b44ba5394f674569a846f91396 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/20] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 7725ef10a70..546148086de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 820da619fbf1e4fa93b6d0786382252e161d30b5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/20] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 7b7b6af93d25652c2b072eede054f64fbf3a3c2d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/20] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 546148086de..e1d1dfcfc2e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4008,3 +4008,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From ba5a8bac0b4696f49e49550f06d12084069949d4 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 11/20] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 c1b10726c9d52b447f63e89679059d28da39f687 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/20] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index e1d1dfcfc2e..fcb038a71c5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4010,3 +4010,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From f9352da98da055781bea1afaac38a17e141939f2 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 13/20] 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 5a07aa809415e1bd6499afc11d9803f32aa70cdf 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 14/20] 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 8a3bb54af66ded61f53ebfe7ed41ba64fdef7e90 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 15/20] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 6766d125b7cce8f58acb9e9c5e13b3314181e0fe Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 16/20] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 a8e321c95ad89f7305d3b02ce91cc78ad58552b3 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 17/20] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index fcb038a71c5..1680281c1a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4017,3 +4017,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 4c8c65e7c388e64bbed58a6b21a929a117cd1376 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 18/20] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 1680281c1a1..8235418077d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4002,6 +4002,8 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 8aea3acdc3eed1f9fc4825368c8e352d44dafb2c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 19/20] 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 b90df7d9d53c9f1a9b9a2705eb7642a725fa72a6 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 20/20] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (12 preceding siblings ...)
  2020-12-13 16:07 ` Nyx70
@ 2020-12-14  5:31 ` Nyx70
  2020-12-14  5:42 ` Nyx70
                   ` (48 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-14  5:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 8b66eb6a4df5a065efae0d850359d3a53b556ea3 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/21] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From ad8875a3cc751c72e00939de0d90c14bd5b17d0d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/21] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From caba6452ff55c7e7c0f77e54d1bb9f8fe3bafd33 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/21] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index aa8640f4d2d..3c0cfb39f77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4002,3 +4002,10 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
+# qgis ...
+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 766c8ac2272e62fc6ce22ac917454f60d9b9968b 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 04/21] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From a536aed52e9448dd4ce275cada14a5e2f571dec6 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/21] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 19b5d3e4cac50a362e3f09a1bd59b6c480126e0a 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 06/21] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 3c0cfb39f77..ae78a4ae5e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 47e20aa12d1e52510f95f0c82ce7179818945c01 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 07/21] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 3b7e712880ac2558b1f18fde04ee7d5c9d9cb042 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/21] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index ae78a4ae5e9..9138d20558d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 ef6dbd1da0ff6edddedd10ae474f3dfb51b9e2ff Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/21] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 76ec3b162f1a7151149c72b9e3cd84572a58e85c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/21] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 9138d20558d..c12a006c5db 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From e5b6fc2ae2de9b968b26c81022daec1184177915 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 11/21] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 7a40ed6d32fe846f93645990525f4b07e0a6bca0 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/21] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index c12a006c5db..ed0f34860a4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4011,3 +4011,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 3cd3289276a2d53fc63f2362b1d0708a2f65eead 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 13/21] 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 af1ac94102828cc8f8e7adf21b962c0a91d0adb3 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 14/21] 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 93e7fce3a19171a0cec63e3dde32355f9986668d 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 15/21] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 86e6c3b41a18a1a864e922d7bf956c832dec0b08 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 16/21] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 b4eecd1d28d4625e3ab3e5387a70110c562bfccc Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 17/21] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index ed0f34860a4..bf4db70c6f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4018,3 +4018,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From e2f2eaaf019c00e2709106fce846f7727a2967e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 18/21] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index bf4db70c6f6..ed0a2c47009 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4003,6 +4003,8 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 601b97512f985d3e734637e3f78ebc438dd8a549 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 19/21] 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 6f5c5178dda4c739c20a87878302b4c5627170e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 20/21] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

From c080798d0b5ca4f414a72f02bcc69c8792973ee9 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Mon, 14 Dec 2020 06:30:58 +0100
Subject: [PATCH 21/21] [WIP] libspatialite: CROSS_BUILD geos-devel fix

---
 srcpkgs/libspatialite/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 787ae797248..6d3d74faf02 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -6,8 +6,8 @@ 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"
+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>"
@@ -18,6 +18,20 @@ checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
 
 CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 
+if [ "$CROSS_BUILD" ]; then
+	# FIXME aarch64* & armv7l*
+	# checking for geos-config... no
+	# configure: error: could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.
+	# => ERROR: libspatialite-5.0.0_1: do_configure: '${configure_script} ${configure_args}' exited with 1
+	# => ERROR:   in do_configure() at common/build-style/gnu-configure.sh:7
+	# Error: Process completed with exit code 1.
+	#
+	# geos-devel only in makedepends dont work ! ???
+	# added in hostmakedepends...
+	hostmakedepends+=" libtool geos-devel"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (13 preceding siblings ...)
  2020-12-14  5:31 ` Nyx70
@ 2020-12-14  5:42 ` Nyx70
  2020-12-15  4:47 ` Nyx70
                   ` (47 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-14  5:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 8b66eb6a4df5a065efae0d850359d3a53b556ea3 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/20] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From ad8875a3cc751c72e00939de0d90c14bd5b17d0d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/20] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From caba6452ff55c7e7c0f77e54d1bb9f8fe3bafd33 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/20] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index aa8640f4d2d..3c0cfb39f77 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4002,3 +4002,10 @@ libnotcurses++.so.2 notcurses-2.0.4_1
 libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
+# qgis ...
+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 766c8ac2272e62fc6ce22ac917454f60d9b9968b 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 04/20] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From a536aed52e9448dd4ce275cada14a5e2f571dec6 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/20] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 19b5d3e4cac50a362e3f09a1bd59b6c480126e0a 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 06/20] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 3c0cfb39f77..ae78a4ae5e9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2472,7 +2472,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.0_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 47e20aa12d1e52510f95f0c82ce7179818945c01 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 07/20] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 3b7e712880ac2558b1f18fde04ee7d5c9d9cb042 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/20] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index ae78a4ae5e9..9138d20558d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3096,7 +3096,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.0_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 ef6dbd1da0ff6edddedd10ae474f3dfb51b9e2ff Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/20] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 76ec3b162f1a7151149c72b9e3cd84572a58e85c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 10/20] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 9138d20558d..c12a006c5db 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4009,3 +4009,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From e5b6fc2ae2de9b968b26c81022daec1184177915 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 11/20] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 7a40ed6d32fe846f93645990525f4b07e0a6bca0 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 12/20] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index c12a006c5db..ed0f34860a4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4011,3 +4011,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 3cd3289276a2d53fc63f2362b1d0708a2f65eead 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 13/20] 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 af1ac94102828cc8f8e7adf21b962c0a91d0adb3 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 14/20] 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 93e7fce3a19171a0cec63e3dde32355f9986668d 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 15/20] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 86e6c3b41a18a1a864e922d7bf956c832dec0b08 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 16/20] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 b4eecd1d28d4625e3ab3e5387a70110c562bfccc Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 17/20] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index ed0f34860a4..bf4db70c6f6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4018,3 +4018,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From e2f2eaaf019c00e2709106fce846f7727a2967e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 18/20] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index bf4db70c6f6..ed0a2c47009 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4003,6 +4003,8 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 601b97512f985d3e734637e3f78ebc438dd8a549 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 19/20] 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 6f5c5178dda4c739c20a87878302b4c5627170e5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 20/20] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (14 preceding siblings ...)
  2020-12-14  5:42 ` Nyx70
@ 2020-12-15  4:47 ` Nyx70
  2020-12-15  4:54 ` Nyx70
                   ` (46 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-15  4:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 5d40d80bb34d0b216a8e1ae76961240a624c25be 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/21] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 7a0590b1f4592405565632956d156e3e5ded1878 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/21] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From ee12ff1e5101c3ecd18c2518ebc6fe55a2566ff1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/21] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..1a5807bf1b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3998,3 +3998,10 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
+# qgis ...
+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 47f1522f690a349a17db8bb611dd98eb527591e2 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 04/21] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From dfe67a09ef8ed4d986fa0f3686b365a06d2620ae Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/21] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 46852fbd0b966fe18cbeb877a6b754867ba789f6 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 06/21] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 1a5807bf1b9..1d4aa2303e6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2467,7 +2467,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.0_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 c155163059d93e9544708626a6ed4e6d78f27fff 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 07/21] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 f6cb41c36cc1b0cf257399b3d91abd4e7b78b07d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/21] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 1d4aa2303e6..54a40246d08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3091,7 +3091,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.0_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 9690c6d8c47a71796e199a5c76b31cf2f48d8482 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/21] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 bb1c44eeb8858eaa413ac4e48d8dc6a25d5f2f15 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:45:36 +0100
Subject: [PATCH 10/21] libspatialite: CROSS_BUILD geos-devel fix...

---
 srcpkgs/libspatialite/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 787ae797248..6d3d74faf02 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -6,8 +6,8 @@ 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"
+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>"
@@ -18,6 +18,20 @@ checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
 
 CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 
+if [ "$CROSS_BUILD" ]; then
+	# FIXME aarch64* & armv7l*
+	# checking for geos-config... no
+	# configure: error: could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.
+	# => ERROR: libspatialite-5.0.0_1: do_configure: '${configure_script} ${configure_args}' exited with 1
+	# => ERROR:   in do_configure() at common/build-style/gnu-configure.sh:7
+	# Error: Process completed with exit code 1.
+	#
+	# geos-devel only in makedepends dont work ! ???
+	# added in hostmakedepends...
+	hostmakedepends+=" libtool geos-devel"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

From 012f9624734c7b5f4473dd92632140adf5ebe9e4 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 11/21] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 54a40246d08..5115614abc6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4005,3 +4005,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From bf487f3312f562ffc2a5f8320e44e01fa0004709 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 12/21] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 c3d8acbdd8d722a8fd7bc8a684eab88c90190f5d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 13/21] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 5115614abc6..609312fc543 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 3a83e797f789c47a65464415bd05ddcbcc87ef75 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 14/21] 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 c55013b20fd5f7a7009aeba8c5ef497ef210449a 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 15/21] 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 6bcb55198a1d3ccc4837722859d23382cfd7a5a4 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 16/21] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 4538be5eed22fd3c62356437de728efb39e78383 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 17/21] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 be43179ed47c1f1930d0da7ee9951a5c499a01c4 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 18/21] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 609312fc543..ca6cc139619 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4014,3 +4014,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 86662d8e63edf734ec1dbd06be28a25dc41f620f Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 19/21] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index ca6cc139619..19adb2f9418 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3999,6 +3999,8 @@ libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

From 72476ceaaa147b6509eb76e6dbbb9fca788731a8 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:48:03 +0100
Subject: [PATCH 20/21] 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 0c1aaec0030b729e3941e964d18d8fedb45de581 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 10 Dec 2020 09:50:36 +0100
Subject: [PATCH 21/21] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (15 preceding siblings ...)
  2020-12-15  4:47 ` Nyx70
@ 2020-12-15  4:54 ` Nyx70
  2020-12-15  7:27 ` Nyx70
                   ` (45 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-15  4:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 5d40d80bb34d0b216a8e1ae76961240a624c25be 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/20] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 7a0590b1f4592405565632956d156e3e5ded1878 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/20] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From ee12ff1e5101c3ecd18c2518ebc6fe55a2566ff1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/20] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..1a5807bf1b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3998,3 +3998,10 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
+# qgis ...
+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 47f1522f690a349a17db8bb611dd98eb527591e2 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 04/20] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From dfe67a09ef8ed4d986fa0f3686b365a06d2620ae Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/20] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 46852fbd0b966fe18cbeb877a6b754867ba789f6 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 06/20] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 1a5807bf1b9..1d4aa2303e6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2467,7 +2467,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.0_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 c155163059d93e9544708626a6ed4e6d78f27fff 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 07/20] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 f6cb41c36cc1b0cf257399b3d91abd4e7b78b07d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/20] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 1d4aa2303e6..54a40246d08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3091,7 +3091,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.0_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 9690c6d8c47a71796e199a5c76b31cf2f48d8482 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/20] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 bb1c44eeb8858eaa413ac4e48d8dc6a25d5f2f15 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:45:36 +0100
Subject: [PATCH 10/20] libspatialite: CROSS_BUILD geos-devel fix...

---
 srcpkgs/libspatialite/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 787ae797248..6d3d74faf02 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -6,8 +6,8 @@ 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"
+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>"
@@ -18,6 +18,20 @@ checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
 
 CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 
+if [ "$CROSS_BUILD" ]; then
+	# FIXME aarch64* & armv7l*
+	# checking for geos-config... no
+	# configure: error: could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.
+	# => ERROR: libspatialite-5.0.0_1: do_configure: '${configure_script} ${configure_args}' exited with 1
+	# => ERROR:   in do_configure() at common/build-style/gnu-configure.sh:7
+	# Error: Process completed with exit code 1.
+	#
+	# geos-devel only in makedepends dont work ! ???
+	# added in hostmakedepends...
+	hostmakedepends+=" libtool geos-devel"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

From 012f9624734c7b5f4473dd92632140adf5ebe9e4 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 11/20] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 54a40246d08..5115614abc6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4005,3 +4005,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From bf487f3312f562ffc2a5f8320e44e01fa0004709 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 12/20] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 c3d8acbdd8d722a8fd7bc8a684eab88c90190f5d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 13/20] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 5115614abc6..609312fc543 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 3a83e797f789c47a65464415bd05ddcbcc87ef75 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 14/20] 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 c55013b20fd5f7a7009aeba8c5ef497ef210449a 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 15/20] 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 6bcb55198a1d3ccc4837722859d23382cfd7a5a4 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 16/20] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 4538be5eed22fd3c62356437de728efb39e78383 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 17/20] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 be2084d43667da046dbbe633e45d3ed507d2060d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:52:20 +0100
Subject: [PATCH 18/20] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

From 44cc5bd6885e86b7434fc4e6e5a8d031f418ad0e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 19/20] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 609312fc543..ca6cc139619 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4014,3 +4014,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From a014d0c9b2393ed13072b5f67c5b3ec17a153404 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 20/20] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index ca6cc139619..19adb2f9418 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3999,6 +3999,8 @@ libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (16 preceding siblings ...)
  2020-12-15  4:54 ` Nyx70
@ 2020-12-15  7:27 ` Nyx70
  2020-12-17 11:53 ` Nyx70
                   ` (44 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-15  7:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From 5d40d80bb34d0b216a8e1ae76961240a624c25be 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/21] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 7a0590b1f4592405565632956d156e3e5ded1878 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/21] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From ee12ff1e5101c3ecd18c2518ebc6fe55a2566ff1 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/21] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..1a5807bf1b9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3998,3 +3998,10 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
+# qgis ...
+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 47f1522f690a349a17db8bb611dd98eb527591e2 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 04/21] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From dfe67a09ef8ed4d986fa0f3686b365a06d2620ae Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/21] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 46852fbd0b966fe18cbeb877a6b754867ba789f6 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 06/21] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 1a5807bf1b9..1d4aa2303e6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2467,7 +2467,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.0_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 c155163059d93e9544708626a6ed4e6d78f27fff 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 07/21] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 f6cb41c36cc1b0cf257399b3d91abd4e7b78b07d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/21] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 1d4aa2303e6..54a40246d08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3091,7 +3091,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.0_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 9690c6d8c47a71796e199a5c76b31cf2f48d8482 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/21] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 bb1c44eeb8858eaa413ac4e48d8dc6a25d5f2f15 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:45:36 +0100
Subject: [PATCH 10/21] libspatialite: CROSS_BUILD geos-devel fix...

---
 srcpkgs/libspatialite/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 787ae797248..6d3d74faf02 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -6,8 +6,8 @@ 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"
+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>"
@@ -18,6 +18,20 @@ checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
 
 CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 
+if [ "$CROSS_BUILD" ]; then
+	# FIXME aarch64* & armv7l*
+	# checking for geos-config... no
+	# configure: error: could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.
+	# => ERROR: libspatialite-5.0.0_1: do_configure: '${configure_script} ${configure_args}' exited with 1
+	# => ERROR:   in do_configure() at common/build-style/gnu-configure.sh:7
+	# Error: Process completed with exit code 1.
+	#
+	# geos-devel only in makedepends dont work ! ???
+	# added in hostmakedepends...
+	hostmakedepends+=" libtool geos-devel"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

From 181f8ad1fd146ca60b77a003b0d30ca0240dd8d3 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 08:27:31 +0100
Subject: [PATCH 11/21] libspatialite: check temporary disabled

---
 srcpkgs/libspatialite/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 6d3d74faf02..f11f0a76e5c 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -31,6 +31,14 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool geos-devel"
 fi
 
+do_check() {
+	# check temporary disabled
+	#   FAIL: check_sql_stmt
+	#   FAIL: check_sql_stmt_tiny
+	#   FAIL: check_sql_stmt_extension
+	# https://www.gaia-gis.it/fossil/libspatialite/tktview/3e46349bf2bfc58b3e3051d1ff7cab73eed19a88?plaintext
+	:
+}
 
 post_install() {
 	vlicense COPYING

From fc2dfa67004dafd1635ffc3e12e7ea6361f04e12 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 12/21] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 54a40246d08..5115614abc6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4005,3 +4005,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 3bcfd79b40974a3ad2dd4972c95193f3ffaa2ae3 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 13/21] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 18b98b99b8b9edc7e2e43720084e830354f9e513 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 14/21] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 5115614abc6..609312fc543 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4007,3 +4007,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From d17cab627f3cb14f3e9f124b612145dca2b760dc 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 15/21] 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 71b938c0e78e5ecf78472d6cdc6ea5c0d4a80503 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 16/21] 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 edd54b390b8364f4049be3139e62ac9358cc0594 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 17/21] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 2ebd62acff36158e33417de2a5b8f9ad8d431a48 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 18/21] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 b21715db7a2004f294e832caea40236b841f1ecf Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:52:20 +0100
Subject: [PATCH 19/21] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

From a2a694bd9c8c89784f9f1f1eae0599125e9643bb Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 20/21] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 609312fc543..ca6cc139619 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4014,3 +4014,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 49b723c19e2ebbf6ef201d3934b77ce5770f6950 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 21/21] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index ca6cc139619..19adb2f9418 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3999,6 +3999,8 @@ libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (17 preceding siblings ...)
  2020-12-15  7:27 ` Nyx70
@ 2020-12-17 11:53 ` Nyx70
  2020-12-17 12:10 ` Nyx70
                   ` (43 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-17 11:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 451 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 / WIP


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

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

From c3551de68cad88170c0aa834bc3a98acfe9b4dd4 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/25] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 47803bc58184a73508ea3ee37896192c084bc33c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/25] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From c29ed154c8fe27ad98d3b67da35991e91d8a627d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/25] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 01cc7e86e1f..4b8713b75ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3999,3 +3999,10 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
+# qgis ...
+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 ca07531445f7f8eb91571634fa021833c80892c4 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 04/25] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From bed4776daaa2be513504f5b4712c401bf3e65d27 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/25] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 313bd4abf775aa60aaa015742c4bf144f8313938 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 06/25] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 4b8713b75ec..139b5c49190 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2467,7 +2467,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.0_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 c949ea5d5260170274b33dec399aeac7b118dca1 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 07/25] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 3d118f09d8ce38cf1d08dc83caa6d9a7c0aa8485 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/25] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 139b5c49190..b0bbcc16fd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3091,7 +3091,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.0_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 c6bfaf6f59310370107933912af969a680024aa5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/25] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 8271b2ccc5ad76e913db3a2ee23db9ef83ca66c2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:45:36 +0100
Subject: [PATCH 10/25] libspatialite: CROSS_BUILD geos-devel fix...

---
 srcpkgs/libspatialite/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 787ae797248..6d3d74faf02 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -6,8 +6,8 @@ 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"
+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>"
@@ -18,6 +18,20 @@ checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
 
 CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 
+if [ "$CROSS_BUILD" ]; then
+	# FIXME aarch64* & armv7l*
+	# checking for geos-config... no
+	# configure: error: could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.
+	# => ERROR: libspatialite-5.0.0_1: do_configure: '${configure_script} ${configure_args}' exited with 1
+	# => ERROR:   in do_configure() at common/build-style/gnu-configure.sh:7
+	# Error: Process completed with exit code 1.
+	#
+	# geos-devel only in makedepends dont work ! ???
+	# added in hostmakedepends...
+	hostmakedepends+=" libtool geos-devel"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

From f34073769044bfd2678cf3caf510f7a7a2fb957c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 08:27:31 +0100
Subject: [PATCH 11/25] libspatialite: check temporary disabled

---
 srcpkgs/libspatialite/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 6d3d74faf02..f11f0a76e5c 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -31,6 +31,14 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool geos-devel"
 fi
 
+do_check() {
+	# check temporary disabled
+	#   FAIL: check_sql_stmt
+	#   FAIL: check_sql_stmt_tiny
+	#   FAIL: check_sql_stmt_extension
+	# https://www.gaia-gis.it/fossil/libspatialite/tktview/3e46349bf2bfc58b3e3051d1ff7cab73eed19a88?plaintext
+	:
+}
 
 post_install() {
 	vlicense COPYING

From 38efb3e13ca8165d5113b816df778011dedfa812 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 12/25] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index b0bbcc16fd7..770a89570ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4006,3 +4006,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From e4be1b2e4b0c34d7eecfeac172c73df7af1c6fe8 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 13/25] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 ce4c038697a83a437da442229acd1a07c0898d8a Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 14/25] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 770a89570ec..ac69272d66b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4008,3 +4008,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 9649dfb14e177c26f9d1fa4b3503ff5f331b85a7 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 15/25] 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 0c3816e89fa9a37a4ac31d8d77011518b9e8f263 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 16/25] 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 24a6a8b5ea66a6e163f813110317176487a762e2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 10:47:47 +0100
Subject: [PATCH 17/25] New package: python3-pyproj-3.0.0

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

diff --git a/srcpkgs/python3-pyproj/template b/srcpkgs/python3-pyproj/template
new file mode 100644
index 00000000000..aaae6299adc
--- /dev/null
+++ b/srcpkgs/python3-pyproj/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyproj'
+pkgname=python3-pyproj
+version=3.0.0
+revision=1
+wrksrc=pyproj-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel proj-devel"
+depends="proj"
+short_desc="Python3 interface to the PROJ library"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
+license="MIT"
+homepage="https://github.com/pyproj4/pyproj"
+distfiles="https://github.com/pyproj4/pyproj/archive/${version}.tar.gz"
+checksum=0c0d5eb70decd14df7137ac8c0aec546bd4e5286486dcbc3c4ae223c293e215e
+
+post_install() {
+	vlicense LICENSE
+}

From a1376f7e5abf13cd042e60796d237942cd3a7f91 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 12:23:35 +0100
Subject: [PATCH 18/25] python3-pyproj: check temporary disabled

---
 srcpkgs/python3-pyproj/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/python3-pyproj/template b/srcpkgs/python3-pyproj/template
index aaae6299adc..130c93cab36 100644
--- a/srcpkgs/python3-pyproj/template
+++ b/srcpkgs/python3-pyproj/template
@@ -7,6 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel proj-devel"
 depends="proj"
+checkdepends="python3-pytest-cov python3-certifi python3-pandas"
 short_desc="Python3 interface to the PROJ library"
 maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="MIT"
@@ -14,6 +15,11 @@ homepage="https://github.com/pyproj4/pyproj"
 distfiles="https://github.com/pyproj4/pyproj/archive/${version}.tar.gz"
 checksum=0c0d5eb70decd14df7137ac8c0aec546bd4e5286486dcbc3c4ae223c293e215e
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 048d94090cc8f7eab12e50ea3c098870721c7071 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 19/25] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 3476c8d924eedd90acdf6ece37df4b45e693ca7c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 10:50:21 +0100
Subject: [PATCH 20/25] python3-OWSLib: [WIP] check temporary disabled

---
 srcpkgs/python3-OWSLib/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
index d9c36a6a2b4..1b7d5129700 100644
--- a/srcpkgs/python3-OWSLib/template
+++ b/srcpkgs/python3-OWSLib/template
@@ -7,6 +7,8 @@ revision=1
 wrksrc=OWSLib-${version}
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
+checkdepends="python3-pytest-cov python3-requests python3-dateutil python3-pytz
+ python3-yaml python3-pyproj python3-certifi"
 short_desc="OWSLib Python3 modules"
 maintainer="Bo Son <boson@gmx.at>"
 license="BSD-3-Clause"
@@ -14,6 +16,11 @@ homepage="https://geopython.github.io/OWSLib"
 distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
 checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 1d34504da761ead59a495d70d396586389648c53 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 21/25] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 616d2e926308dfc9118c5331391697e3fd003471 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:52:20 +0100
Subject: [PATCH 22/25] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

From f187c56073ec3df5fcbe31a254970d013e28510d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 12:24:32 +0100
Subject: [PATCH 23/25] qgis: check temporary disabled

---
 srcpkgs/qgis/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d00d77c4ed0..6de05af6f80 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -36,6 +36,11 @@ homepage="https://qgis.org"
 distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
 checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 do_install() {
 	cd ${wrksrc}/build
 	make DESTDIR="$DESTDIR" install

From d178a62466529c3624da1be270b77001e873cf88 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 24/25] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index ac69272d66b..a428cb3799e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4015,3 +4015,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 2f82c73b82ed2a46bc4aa3881c05dc0118dc581e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 25/25] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index a428cb3799e..b925e937b64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,6 +4000,8 @@ libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (18 preceding siblings ...)
  2020-12-17 11:53 ` Nyx70
@ 2020-12-17 12:10 ` Nyx70
  2020-12-20 13:44 ` Nyx70
                   ` (42 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-17 12:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 614 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 / WIP


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

TODO
- [ ] xbps-src check for libspatialite
- [ ] xbps-src check for python3-OWSLib
- [ ] xbps-src check for python3-pyproj
- [ ] libspatialite CROSS_BUILD

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

From c3551de68cad88170c0aa834bc3a98acfe9b4dd4 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/26] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 47803bc58184a73508ea3ee37896192c084bc33c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/26] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From c29ed154c8fe27ad98d3b67da35991e91d8a627d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/26] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 01cc7e86e1f..4b8713b75ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3999,3 +3999,10 @@ libevemu.so.3 evemu-2.7.0_1
 libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
+# qgis ...
+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 ca07531445f7f8eb91571634fa021833c80892c4 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 04/26] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From bed4776daaa2be513504f5b4712c401bf3e65d27 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/26] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 313bd4abf775aa60aaa015742c4bf144f8313938 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 06/26] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 4b8713b75ec..139b5c49190 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2467,7 +2467,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.0_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 c949ea5d5260170274b33dec399aeac7b118dca1 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 07/26] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 3d118f09d8ce38cf1d08dc83caa6d9a7c0aa8485 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 08/26] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 139b5c49190..b0bbcc16fd7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3091,7 +3091,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.0_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 c6bfaf6f59310370107933912af969a680024aa5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 09/26] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 8271b2ccc5ad76e913db3a2ee23db9ef83ca66c2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:45:36 +0100
Subject: [PATCH 10/26] libspatialite: CROSS_BUILD geos-devel fix...

---
 srcpkgs/libspatialite/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 787ae797248..6d3d74faf02 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -6,8 +6,8 @@ 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"
+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>"
@@ -18,6 +18,20 @@ checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
 
 CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 
+if [ "$CROSS_BUILD" ]; then
+	# FIXME aarch64* & armv7l*
+	# checking for geos-config... no
+	# configure: error: could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.
+	# => ERROR: libspatialite-5.0.0_1: do_configure: '${configure_script} ${configure_args}' exited with 1
+	# => ERROR:   in do_configure() at common/build-style/gnu-configure.sh:7
+	# Error: Process completed with exit code 1.
+	#
+	# geos-devel only in makedepends dont work ! ???
+	# added in hostmakedepends...
+	hostmakedepends+=" libtool geos-devel"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

From f34073769044bfd2678cf3caf510f7a7a2fb957c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 08:27:31 +0100
Subject: [PATCH 11/26] libspatialite: check temporary disabled

---
 srcpkgs/libspatialite/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 6d3d74faf02..f11f0a76e5c 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -31,6 +31,14 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool geos-devel"
 fi
 
+do_check() {
+	# check temporary disabled
+	#   FAIL: check_sql_stmt
+	#   FAIL: check_sql_stmt_tiny
+	#   FAIL: check_sql_stmt_extension
+	# https://www.gaia-gis.it/fossil/libspatialite/tktview/3e46349bf2bfc58b3e3051d1ff7cab73eed19a88?plaintext
+	:
+}
 
 post_install() {
 	vlicense COPYING

From 38efb3e13ca8165d5113b816df778011dedfa812 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 12/26] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index b0bbcc16fd7..770a89570ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4006,3 +4006,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From e4be1b2e4b0c34d7eecfeac172c73df7af1c6fe8 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 13/26] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 bb7190a8bfaca99b9f9846e2fa7df84d0ceb6b12 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 14/26] 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 3d92499a9c7b9b260a52db38ffc35a1f873d5916 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 15/26] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 770a89570ec..ac69272d66b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4008,3 +4008,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From 76e4c47226a65a6356ddb72a4ab15283fa4eea63 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 16/26] 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 a82ce266210e6eca8646c0e904f7231607d1d9bb 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 17/26] 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 b118ab3a423913d995782337dc6f841fc8faf79c Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 10:47:47 +0100
Subject: [PATCH 18/26] New package: python3-pyproj-3.0.0

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

diff --git a/srcpkgs/python3-pyproj/template b/srcpkgs/python3-pyproj/template
new file mode 100644
index 00000000000..aaae6299adc
--- /dev/null
+++ b/srcpkgs/python3-pyproj/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyproj'
+pkgname=python3-pyproj
+version=3.0.0
+revision=1
+wrksrc=pyproj-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel proj-devel"
+depends="proj"
+short_desc="Python3 interface to the PROJ library"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
+license="MIT"
+homepage="https://github.com/pyproj4/pyproj"
+distfiles="https://github.com/pyproj4/pyproj/archive/${version}.tar.gz"
+checksum=0c0d5eb70decd14df7137ac8c0aec546bd4e5286486dcbc3c4ae223c293e215e
+
+post_install() {
+	vlicense LICENSE
+}

From 0ec618018ca2689245d79e691bfb0d7d52451c13 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 12:23:35 +0100
Subject: [PATCH 19/26] python3-pyproj: check temporary disabled

---
 srcpkgs/python3-pyproj/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/python3-pyproj/template b/srcpkgs/python3-pyproj/template
index aaae6299adc..130c93cab36 100644
--- a/srcpkgs/python3-pyproj/template
+++ b/srcpkgs/python3-pyproj/template
@@ -7,6 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel proj-devel"
 depends="proj"
+checkdepends="python3-pytest-cov python3-certifi python3-pandas"
 short_desc="Python3 interface to the PROJ library"
 maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="MIT"
@@ -14,6 +15,11 @@ homepage="https://github.com/pyproj4/pyproj"
 distfiles="https://github.com/pyproj4/pyproj/archive/${version}.tar.gz"
 checksum=0c0d5eb70decd14df7137ac8c0aec546bd4e5286486dcbc3c4ae223c293e215e
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 2c69654bc505739f9ebf2b76f89a6e0e765291b0 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 20/26] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 1a63ff46facb60d647aa3ac8087ffd9732627d6a Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 10:50:21 +0100
Subject: [PATCH 21/26] python3-OWSLib: [WIP] check temporary disabled

---
 srcpkgs/python3-OWSLib/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
index d9c36a6a2b4..1b7d5129700 100644
--- a/srcpkgs/python3-OWSLib/template
+++ b/srcpkgs/python3-OWSLib/template
@@ -7,6 +7,8 @@ revision=1
 wrksrc=OWSLib-${version}
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
+checkdepends="python3-pytest-cov python3-requests python3-dateutil python3-pytz
+ python3-yaml python3-pyproj python3-certifi"
 short_desc="OWSLib Python3 modules"
 maintainer="Bo Son <boson@gmx.at>"
 license="BSD-3-Clause"
@@ -14,6 +16,11 @@ homepage="https://geopython.github.io/OWSLib"
 distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
 checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 40f721dae38e6061e277b4c7aa15763cc9862f3e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 22/26] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 beb135d280d56f701ae475e2ee7af78258cd614b Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:52:20 +0100
Subject: [PATCH 23/26] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

From e4c6a7e7e949b92e4df5bbf13e0e89d74c5bc53d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 12:24:32 +0100
Subject: [PATCH 24/26] qgis: check temporary disabled

---
 srcpkgs/qgis/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d00d77c4ed0..6de05af6f80 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -36,6 +36,11 @@ homepage="https://qgis.org"
 distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
 checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 do_install() {
 	cd ${wrksrc}/build
 	make DESTDIR="$DESTDIR" install

From b12c02e4349d1765fcfd4810534cbe4f03e69c69 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 25/26] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index ac69272d66b..a428cb3799e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4015,3 +4015,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 7d5ae5954d74d188599d97170113a1e06556b3f2 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 26/26] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index a428cb3799e..b925e937b64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4000,6 +4000,8 @@ libantilib.so.1 libantimicrox-3.1.2_1
 libinih.so.0 inih-52_1
 libpcaudio.so.0 pcaudiolib-1.1_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (19 preceding siblings ...)
  2020-12-17 12:10 ` Nyx70
@ 2020-12-20 13:44 ` Nyx70
  2020-12-20 13:58 ` Nyx70
                   ` (41 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-20 13:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 767 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 / WIP


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

TODO

- [x] New package: libkml
- [ ] New package: libspatialite
  - [ ] xbps-src check for libspatialite
  - [ ] libspatialite CROSS_BUILD
- [ ] xbps-src check for python3-OWSLib
- [ ] xbps-src check for python3-pyproj
- [ ] xbps-src check for qgis
- [ ] libgdal: aarch64
- [ ] libgdal: arm
- [ ] ...

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

From efe8ce045c4a6ddef7e3d072ee8434aeeffdb817 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/27] 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..87ce6bc7706
--- /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="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 3a1e9a9dab52674b8b13c91df828d704e6caa164 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:06:15 +0100
Subject: [PATCH 02/27] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From 274eacf567b8d98abf4f9f92ad12de23c7ef6986 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:09:43 +0100
Subject: [PATCH 03/27] common/shlibs: add libkml-1.3.0_1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index e1e2291d5f7..0d2c2256d06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,10 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+# qgis ...
+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 661055e1adbeb9e7b43956f049acb4b5595f5f74 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 04/27] libgdal: postgresql and kml support added

---
 srcpkgs/libgdal/shlibs   |  1 +
 srcpkgs/libgdal/template | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/libgdal/shlibs

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 c858c4264f1..d27c76c4a8f 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,23 +1,32 @@
 # Template file for 'libgdal'
+# Modified by Monkey-7-12 <monkeyseven@fblog.ch>
+# + libgdal with additional postgresql and kml support
 pkgname=libgdal
-version=3.0.4
-revision=6
+version=3.2.0
+revision=1
 wrksrc="gdal-${version}"
+build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
+configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+ $(vopt_with postgresql pg)"
 hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
+makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-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"
+ libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
+ proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
+ $(vopt_if kml libkml-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>"
 license="MIT"
 homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
+distfiles="https://github.com/OSGeo/gdal/archive/v${version}.tar.gz"
+checksum=132497c170936a3d5e387797640c371db631d30ba7beabd0b6dacaa3642fb43c
 subpackages="libgdal-devel libgdal-tools"
 
+build_options="postgresql kml"
+build_options_default="postgresql kml"
+
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" hdf5-devel"
 fi

From 51374d255fb113ad1991dba47d14696719034ff5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 16:10:37 +0100
Subject: [PATCH 05/27] libgdal: python3-gdal new build in libgdal

---
 srcpkgs/libgdal/template | 73 ++++++++++++++++++++++++++++++++++------
 srcpkgs/python3-gdal     |  1 +
 2 files changed, 63 insertions(+), 11 deletions(-)
 create mode 120000 srcpkgs/python3-gdal

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index d27c76c4a8f..bdc7b923225 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,36 +1,73 @@
 # 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.2.0
 revision=1
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes
+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 python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel boost-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel $(vopt_if postgresql postgresql-libs-devel)
- $(vopt_if kml libkml-devel)"
+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="Monkey-7-12 <monkeyseven@fblog.ch>"
+#maintainer="Monkey-7-12 <monkeyseven@fblog.ch>"
+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
-subpackages="libgdal-devel libgdal-tools"
+subpackages="python3-gdal libgdal-devel libgdal-tools"
 
-build_options="postgresql kml"
-build_options_default="postgresql kml"
+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 -C swig/python generate
+	#pushd swig/python > /dev/null
+	cd swig/python
+	${make_cmd} ${makejobs} PYTHON=python3 ${makejobs} ${make_build_args} ${make_build_target}
+#	popd > /dev/null
+}
+
+do_install() {
+	: ${make_cmd:=make}
+	${make_cmd} DESTDIR=${DESTDIR} install
+	# python modules
+	#pushd swig/python > /dev/null
+	cd swig/python
+	#${make_cmd} PYTHON=python3 DESTDIR=/destdir/python3-gdalx-$version/ install
+	${make_cmd} PYTHON=python3 DESTDIR=${DESTDIR}/ install
+}
+
 post_install() {
 	vinstall gdal.pc 644 usr/lib/pkgconfig
 	vlicense LICENSE.TXT
@@ -55,3 +92,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 8af0f1189fa96b588b3920435371430a4d5c5837 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 20 Dec 2020 14:33:12 +0100
Subject: [PATCH 06/27] libgdal: aarch & arm temporary disabled

---
 srcpkgs/libgdal/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index bdc7b923225..255f9b2459d 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -7,6 +7,8 @@
 pkgname=libgdal
 version=3.2.0
 revision=1
+# aarch & arm temporary disabled
+archs="~aarch* ~armv*"
 wrksrc="gdal-${version}"
 build_wrksrc="gdal"
 build_style=gnu-configure

From a3fd75914a2f3fd19b7c2c459e0ad2b5f65561d7 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 07/27] common/shlibs: update for libgdal-3.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 0d2c2256d06..9a90a04dc96 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2464,7 +2464,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.0_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 a085bac634433c1803f29ddfcaa1f6cdd35cd4cf 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 08/27] proj: update to 7.2.0.

---
 srcpkgs/proj/shlibs   |  1 +
 srcpkgs/proj/template | 13 +++++++------
 srcpkgs/proj/update   |  1 -
 3 files changed, 8 insertions(+), 7 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..3a6569178e6 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"
 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 c47926c20458bce080c573fab49c68b70af73c02 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 14:24:26 +0100
Subject: [PATCH 09/27] common/shlibs: update for proj-7.2.0

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

diff --git a/common/shlibs b/common/shlibs
index 9a90a04dc96..ba7c41ff9c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3089,7 +3089,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.0_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 fd8aa6375dda67bbaf39b37f4dbf3737126d66a7 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:21:31 +0100
Subject: [PATCH 10/27] New package: libspatialite-5.0.0

---
 srcpkgs/libspatialite-devel    |  1 +
 srcpkgs/libspatialite/shlibs   |  2 ++
 srcpkgs/libspatialite/template | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libspatialite-devel
 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/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..787ae797248
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,34 @@
+# 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"
+
+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 08e72c075e4447c84fafe730158df8983d916fa0 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:45:36 +0100
Subject: [PATCH 11/27] libspatialite: CROSS_BUILD geos-devel fix...

---
 srcpkgs/libspatialite/template | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 787ae797248..6d3d74faf02 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -6,8 +6,8 @@ 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"
+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>"
@@ -18,6 +18,20 @@ checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
 
 CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 
+if [ "$CROSS_BUILD" ]; then
+	# FIXME aarch64* & armv7l*
+	# checking for geos-config... no
+	# configure: error: could not find geos-config within the current path. You may need to try re-running configure with a --with-geosconfig parameter.
+	# => ERROR: libspatialite-5.0.0_1: do_configure: '${configure_script} ${configure_args}' exited with 1
+	# => ERROR:   in do_configure() at common/build-style/gnu-configure.sh:7
+	# Error: Process completed with exit code 1.
+	#
+	# geos-devel only in makedepends dont work ! ???
+	# added in hostmakedepends...
+	hostmakedepends+=" libtool geos-devel"
+fi
+
+
 post_install() {
 	vlicense COPYING
 }

From d3cd2c771f94d05442a5194c7e36911751140e4f Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 08:27:31 +0100
Subject: [PATCH 12/27] libspatialite: check temporary disabled

---
 srcpkgs/libspatialite/template | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
index 6d3d74faf02..f11f0a76e5c 100644
--- a/srcpkgs/libspatialite/template
+++ b/srcpkgs/libspatialite/template
@@ -31,6 +31,14 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool geos-devel"
 fi
 
+do_check() {
+	# check temporary disabled
+	#   FAIL: check_sql_stmt
+	#   FAIL: check_sql_stmt_tiny
+	#   FAIL: check_sql_stmt_extension
+	# https://www.gaia-gis.it/fossil/libspatialite/tktview/3e46349bf2bfc58b3e3051d1ff7cab73eed19a88?plaintext
+	:
+}
 
 post_install() {
 	vlicense COPYING

From db573755f8e05b23465996b343896dfc89cab350 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:22:17 +0100
Subject: [PATCH 13/27] common/shlibs: add libspatialite-5.0.0 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index ba7c41ff9c0..a49be5af487 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4056,3 +4056,5 @@ 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
+mod_spatialite.so.7 libspatialite-5.0.0_1

From 47333f62fdfc403cefa6744ff712a3662366d68a 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 14/27] grass: update to 7.8.4.

---
 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..ef2810ae84d
--- /dev/null
+++ b/srcpkgs/grass/shlibs
@@ -0,0 +1,7 @@
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..82afecc3ec3 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.4
+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=d9535afb5e43ecdcf9a6233f5a1fa83908b66456bdd06107e7320a51ee86cff9
 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 aba8c5611c0b8f00f64b41f3ec9dc8112df9a5eb 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 15/27] 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 339b8498e2a11d535bd66e62071458e875324ffe Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:34:53 +0100
Subject: [PATCH 16/27] common/shlibs: add grass-7.8.4 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index a49be5af487..6ad8432778e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4058,3 +4058,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
 mod_spatialite.so.7 libspatialite-5.0.0_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1

From ea5b6dc3d5686729beb2386b2b37b23f9ac1ca85 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 17/27] 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 fe0223fab605d47ca722aeab012951f0b891d5b9 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 18/27] 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 d437196c508cf360cf6e3fb2e7ad956fc07f53e7 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 10:47:47 +0100
Subject: [PATCH 19/27] New package: python3-pyproj-3.0.0

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

diff --git a/srcpkgs/python3-pyproj/template b/srcpkgs/python3-pyproj/template
new file mode 100644
index 00000000000..aaae6299adc
--- /dev/null
+++ b/srcpkgs/python3-pyproj/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyproj'
+pkgname=python3-pyproj
+version=3.0.0
+revision=1
+wrksrc=pyproj-${version}
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Cython"
+makedepends="python3-devel proj-devel"
+depends="proj"
+short_desc="Python3 interface to the PROJ library"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
+license="MIT"
+homepage="https://github.com/pyproj4/pyproj"
+distfiles="https://github.com/pyproj4/pyproj/archive/${version}.tar.gz"
+checksum=0c0d5eb70decd14df7137ac8c0aec546bd4e5286486dcbc3c4ae223c293e215e
+
+post_install() {
+	vlicense LICENSE
+}

From ea2ba28c8501dcc2f1d83422b11b8c45777ffe82 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 12:23:35 +0100
Subject: [PATCH 20/27] python3-pyproj: check temporary disabled

---
 srcpkgs/python3-pyproj/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/python3-pyproj/template b/srcpkgs/python3-pyproj/template
index aaae6299adc..130c93cab36 100644
--- a/srcpkgs/python3-pyproj/template
+++ b/srcpkgs/python3-pyproj/template
@@ -7,6 +7,7 @@ build_style=python3-module
 hostmakedepends="python3-setuptools python3-Cython"
 makedepends="python3-devel proj-devel"
 depends="proj"
+checkdepends="python3-pytest-cov python3-certifi python3-pandas"
 short_desc="Python3 interface to the PROJ library"
 maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="MIT"
@@ -14,6 +15,11 @@ homepage="https://github.com/pyproj4/pyproj"
 distfiles="https://github.com/pyproj4/pyproj/archive/${version}.tar.gz"
 checksum=0c0d5eb70decd14df7137ac8c0aec546bd4e5286486dcbc3c4ae223c293e215e
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 post_install() {
 	vlicense LICENSE
 }

From 9ba88a7844e66644d4c3eb0727d76b4ae1262d65 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 21/27] New package: python3-OWSLib-0.20.0

---
 srcpkgs/python3-OWSLib/template | 19 +++++++++++++++++++
 1 file changed, 19 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..d9c36a6a2b4
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,19 @@
+# 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
+
+post_install() {
+	vlicense LICENSE
+}

From 03bde4385813298ad01ad1a3765fd7ff11654554 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 10:50:21 +0100
Subject: [PATCH 22/27] python3-OWSLib: [WIP] check temporary disabled

---
 srcpkgs/python3-OWSLib/template | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/srcpkgs/python3-OWSLib/template b/srcpkgs/python3-OWSLib/template
index d9c36a6a2b4..1b7d5129700 100644
--- a/srcpkgs/python3-OWSLib/template
+++ b/srcpkgs/python3-OWSLib/template
@@ -7,6 +7,8 @@ revision=1
 wrksrc=OWSLib-${version}
 build_style=python3-module
 hostmakedepends="python3-devel python3-setuptools"
+checkdepends="python3-pytest-cov python3-requests python3-dateutil python3-pytz
+ python3-yaml python3-pyproj python3-certifi"
 short_desc="OWSLib Python3 modules"
 maintainer="Bo Son <boson@gmx.at>"
 license="BSD-3-Clause"
@@ -14,6 +16,11 @@ homepage="https://geopython.github.io/OWSLib"
 distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
 checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 post_install() {
 	vlicense LICENSE
 }

From c40a1cb1dde2be0c2abb6ef2f6bd4326a23286d8 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:02 +0100
Subject: [PATCH 23/27] New package: qgis-3.16.1

---
 srcpkgs/qgis/shlibs   |  7 +++++++
 srcpkgs/qgis/template | 45 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 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..2a26c752a69
--- /dev/null
+++ b/srcpkgs/qgis/shlibs
@@ -0,0 +1,7 @@
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..d95a267dde6
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,45 @@
+# Template file for 'qgis'
+# Modified by Nyx70 <n.y.x@bluewin.ch>
+pkgname=qgis
+version=3.16.1
+revision=1
+archs="x86_64"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"
+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"
+# 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=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
+
+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 6ea181200041dfa89f378ad9f109c43adbabbd58 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 15 Dec 2020 05:52:20 +0100
Subject: [PATCH 24/27] qgis: archs= fixed

---
 srcpkgs/qgis/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d95a267dde6..d00d77c4ed0 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -3,7 +3,7 @@
 pkgname=qgis
 version=3.16.1
 revision=1
-archs="x86_64"
+archs="x86_64*"
 wrksrc=QGIS-final-${version//./_}
 build_style=cmake
 configure_args="-D GRASS_PREFIX7=/usr/lib/grass78"

From 92e722a7d8b399c42a4ec12411dfc9cedf9be27b Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 17 Dec 2020 12:24:32 +0100
Subject: [PATCH 25/27] qgis: check temporary disabled

---
 srcpkgs/qgis/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index d00d77c4ed0..6de05af6f80 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -36,6 +36,11 @@ homepage="https://qgis.org"
 distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
 checksum=bc1fa8b7451aebd9ecaa8704cea421adcf2309a6b00048a20b8c307c3297d03e
 
+do_check() {
+	# check temporary disabled
+	:
+}
+
 do_install() {
 	cd ${wrksrc}/build
 	make DESTDIR="$DESTDIR" install

From e84a9af2009be87b522452fa469ec2efe0147830 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 17:11:52 +0100
Subject: [PATCH 26/27] common/shlibs: add qgis-3.16.1 shlibs

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

diff --git a/common/shlibs b/common/shlibs
index 6ad8432778e..9d203c755bb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4065,3 +4065,10 @@ libgrass_gproj.7.8.so grass-7.8.4_1
 libgrass_imagery.7.8.so grass-7.8.4_1
 libgrass_raster.7.8.so grass-7.8.4_1
 libgrass_vector.7.8.so grass-7.8.4_1
+libqgis_analysis.so.3.16.1 qgis-3.16.1_1
+libqgis_app.so.3.16.1 qgis-3.16.1_1
+libqgis_core.so.3.16.1 qgis-3.16.1_1
+libqgis_gui.so.3.16.1 qgis-3.16.1_1
+libqgis_native.so.3.16.1 qgis-3.16.1_1
+libqgisgrass7.so.3.16.1 qgis-3.16.1_1
+libqgispython.so.3.16.1 qgis-3.16.1_1

From 1a709382312795faf4e5eb33e8889cea5fdc92c4 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Wed, 9 Dec 2020 05:08:05 +0100
Subject: [PATCH 27/27] common/shlibs: updated

libprotobuf-lite.so.24 and libspatialindex.so.6 added
---
 common/shlibs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/shlibs b/common/shlibs
index 9d203c755bb..32a609f84fb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4050,6 +4050,8 @@ libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 # qgis ...
+libprotobuf-lite.so.24 libprotobuf24-lite-3.13.0.1_1
+libspatialindex.so.6 libspatialindex-1.9.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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] [WIP] New package: qgis-3.16.x 
  2020-12-09  4:34 [PR PATCH] [WIP] New package: qgis-3.16.x Nyx70
                   ` (20 preceding siblings ...)
  2020-12-20 13:44 ` Nyx70
@ 2020-12-20 13:58 ` Nyx70
  2020-12-20 14:11 ` Nyx70
                   ` (40 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Nyx70 @ 2020-12-20 13:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 767 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 / WIP


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

TODO

- [x] New package: libkml
- [ ] New package: libspatialite
  - [ ] xbps-src check for libspatialite
  - [ ] libspatialite CROSS_BUILD
- [ ] xbps-src check for python3-OWSLib
- [ ] xbps-src check for python3-pyproj
- [ ] xbps-src check for qgis
- [ ] libgdal: aarch64
- [ ] libgdal: arm
- [ ] ...

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

From efe8ce045c4a6ddef7e3d072ee8434aeeffdb817 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/27] 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