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
                   ` (81 more replies)
  0 siblings, 82 replies; 83+ 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] 83+ messages in thread

end of thread, other threads:[~2021-04-05 13:27 UTC | newest]

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

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