* [PR PATCH] [WIP] Qgis package
@ 2021-03-11 15:50 sgn
2021-03-13 15:13 ` [PR PATCH] [Updated] " sgn
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: sgn @ 2021-03-11 15:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1590 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qgis-package
https://github.com/void-linux/void-packages/pull/29398
[WIP] Qgis package
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Close #27041
A patch file from https://github.com/void-linux/void-packages/pull/29398.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-package-29398.patch --]
[-- Type: text/x-diff, Size: 39114 bytes --]
From 6bcbfee2a0ab8a590f9264353956317e67d727f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Mon, 22 Feb 2021 08:14:20 +0100
Subject: [PATCH 01/11] common/shlibs: add shlibs required by qgis
---
common/shlibs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 42f37d8a08b..69bf5f5ea39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3966,3 +3966,8 @@ libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
+libtree-sitter.so.0 tree-sitter-0.18.2_1
+libavro.so.23 libavro-1.10.1_1
+libonigmo.so.6 onigmo-6.2.0_1
+libprotobuf-lite.so.26 libprotobuf26-lite-3.15.3_1
+libspatialindex.so.6 libspatialindex-1.9.3_1
From 3a673a45f0f9e80015a9ea1fb21f4cf69fddef86 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 02/11] proj: update to 7.2.1.
---
common/shlibs | 2 +-
srcpkgs/proj/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 69bf5f5ea39..420847918d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3020,7 +3020,7 @@ libwithsctp.so.1 lksctp-tools-1.0.17_1
libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4
libunshield.so.0 libunshield-0.6_1
libMyGUIEngine.so.3.4.0 libmygui-3.4.0_1
-libproj.so.18 proj-6.3.0_1
+libproj.so.19 proj-7.2.1_1
libnlopt.so.0 nlopt-2.4.2_1
libeb.so.16 libeb-4.3.3_1
libchipcard.so.6 libchipcard-5.0.4_1
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index 51c4638234b..008cf089c0b 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,28 +1,27 @@
# Template file for 'proj'
pkgname=proj
-version=6.3.2
+version=7.2.1
revision=1
build_style=cmake
-configure_args="-DPROJ_TESTS=OFF"
+configure_args="-DBUILD_TESTING=ON"
hostmakedepends="python3"
-makedepends="sqlite-devel"
+makedepends="sqlite-devel tiff-devel libcurl-devel"
short_desc="Cartographic Projections Library"
-maintainer="John <me@johnnynator.dev>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
license="MIT"
-homepage="https://proj4.org"
+homepage="https://proj.org"
distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=cb776a70f40c35579ae4ba04fb4a388c1d1ce025a1df6171350dc19f25b80311
+checksum=b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14
post_install() {
vlicense COPYING
}
proj-devel_package() {
- depends="${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/share/man/man3
vmove usr/lib/cmake
vmove "usr/lib/*.so"
}
From 14557ad5d3f8b3b193c268af919c2c74a0a5f6b5 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 03/11] 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
---
common/shlibs | 6 ++++++
srcpkgs/libkml-devel | 1 +
srcpkgs/libkml/patches/NOUNCRYPT.patch | 17 +++++++++++++++
srcpkgs/libkml/template | 29 ++++++++++++++++++++++++++
4 files changed, 53 insertions(+)
create mode 120000 srcpkgs/libkml-devel
create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch
create mode 100644 srcpkgs/libkml/template
diff --git a/common/shlibs b/common/shlibs
index 420847918d0..3b5e49ef513 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3971,3 +3971,9 @@ libavro.so.23 libavro-1.10.1_1
libonigmo.so.6 onigmo-6.2.0_1
libprotobuf-lite.so.26 libprotobuf26-lite-3.15.3_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
+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-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/template b/srcpkgs/libkml/template
new file mode 100644
index 00000000000..77266d8919e
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,29 @@
+# Template file for 'libkml'
+pkgname=libkml
+version=1.3.0
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DBUILD_TESTING=ON"
+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="BSD-3-Clause"
+homepage="https://github.com/libkml/libkml"
+distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz"
+checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
+patch_args=-Np1
+
+post_install() {
+ vlicense LICENSE
+}
+
+libkml-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From 436b535e215772aee86bb3b3e9e9a10219c6287e Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 20 Dec 2020 14:49:30 +0100
Subject: [PATCH 04/11] New package: libspatialite-5.0.0
SpatiaLite is an open source library intended to extend the SQLite core
to support fully fledged Spatial SQL capabilities.
---
common/shlibs | 1 +
srcpkgs/libspatialite-devel | 1 +
.../patches/disable_check_sql.patch | 29 +++++++++++++++++++
srcpkgs/libspatialite/shlibs | 2 ++
srcpkgs/libspatialite/template | 29 +++++++++++++++++++
5 files changed, 62 insertions(+)
create mode 120000 srcpkgs/libspatialite-devel
create mode 100644 srcpkgs/libspatialite/patches/disable_check_sql.patch
create mode 100644 srcpkgs/libspatialite/shlibs
create mode 100644 srcpkgs/libspatialite/template
diff --git a/common/shlibs b/common/shlibs
index 3b5e49ef513..9188876b944 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libkmldom.so.1 libkml-1.3.0_1
libkmlengine.so.1 libkml-1.3.0_1
libkmlregionator.so.1 libkml-1.3.0_1
libkmlxsd.so.1 libkml-1.3.0_1
+libspatialite.so.7 libspatialite-5.0.0_1
diff --git a/srcpkgs/libspatialite-devel b/srcpkgs/libspatialite-devel
new file mode 120000
index 00000000000..588ba2ad7c0
--- /dev/null
+++ b/srcpkgs/libspatialite-devel
@@ -0,0 +1 @@
+libspatialite
\ No newline at end of file
diff --git a/srcpkgs/libspatialite/patches/disable_check_sql.patch b/srcpkgs/libspatialite/patches/disable_check_sql.patch
new file mode 100644
index 00000000000..e1f1a0857b6
--- /dev/null
+++ b/srcpkgs/libspatialite/patches/disable_check_sql.patch
@@ -0,0 +1,29 @@
+disable check_sql_stmt test
+
+https://www.gaia-gis.it/fossil/libspatialite/tktview/3e46349bf2bfc58b3e3051d1ff7cab73eed19a88?plaintext
+
+--- test/Makefile.am 2020-08-23 18:46:23.000000000 +0200
++++ test/Makefile.am 2020-12-22 14:45:10.206085515 +0100
+@@ -31,10 +31,6 @@
+ check_gaia_utf8 \
+ check_extension \
+ check_recover_geom \
+- check_sql_stmt \
+- check_sql_stmt_tiny \
+- check_sql_stmt_legacy \
+- check_sql_stmt_extension \
+ check_multithread \
+ check_virtualtable1 \
+ check_virtualtable2 \
+--- test/Makefile.in 2020-08-23 18:46:23.000000000 +0200
++++ test/Makefile.in 2020-12-22 14:41:06.416335737 +0100
+@@ -102,9 +102,6 @@
+ check_xls_load$(EXEEXT) check_math_funcs$(EXEEXT) \
+ check_gaia_util$(EXEEXT) check_gaia_utf8$(EXEEXT) \
+ check_extension$(EXEEXT) check_recover_geom$(EXEEXT) \
+- check_sql_stmt$(EXEEXT) check_sql_stmt_tiny$(EXEEXT) \
+- check_sql_stmt_legacy$(EXEEXT) \
+- check_sql_stmt_extension$(EXEEXT) check_multithread$(EXEEXT) \
+ check_virtualtable1$(EXEEXT) check_virtualtable2$(EXEEXT) \
+ check_virtualtable3$(EXEEXT) check_virtualtable4$(EXEEXT) \
+ check_virtualtable5$(EXEEXT) check_virtualtable6$(EXEEXT) \
diff --git a/srcpkgs/libspatialite/shlibs b/srcpkgs/libspatialite/shlibs
new file mode 100644
index 00000000000..eee57edae59
--- /dev/null
+++ b/srcpkgs/libspatialite/shlibs
@@ -0,0 +1,2 @@
+libspatialite.so.7 libspatialite-5.0.0_1
+mod_spatialite.so.7 libspatialite-5.0.0_1
diff --git a/srcpkgs/libspatialite/template b/srcpkgs/libspatialite/template
new file mode 100644
index 00000000000..ee8afc70b85
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,29 @@
+# Template file for 'libspatialite'
+pkgname=libspatialite
+version=5.0.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-geosconfig=$XBPS_CROSS_BASE/usr/bin/geos-config"
+hostmakedepends="pkg-config libxml2 libtool"
+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.1"
+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"
+
+libspatialite-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
+ }
+}
From de3650e5ac94770103bc40dfec7f8f45aaf81ed5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Fri, 27 Nov 2020 07:02:22 +0100
Subject: [PATCH 05/11] libgdal: update to 3.2.1.
- update to 3.2.1.
- --with-expat / --with-spatialite added (OSM support)
- postgresql and kml support added
- python3-gdal module added
---
common/shlibs | 2 +-
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 -------------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 -----------
srcpkgs/libgdal/template | 45 +++++++++++-----
srcpkgs/python3-gdal | 1 +
5 files changed, 33 insertions(+), 99 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
create mode 120000 srcpkgs/python3-gdal
diff --git a/common/shlibs b/common/shlibs
index 9188876b944..6ed3d43d73d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2461,7 +2461,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5
libu2f-server.so.0 libu2f-server-1.1.0_9
libsqlcipher.so.0 sqlcipher-4.3.0_3
libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.4_9
+libgdal.so.28 libgdal-3.2.1_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 3fe5d7fda9e..00000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig
-+++ frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- frmts/jpeg2000/jpeg2000dataset.cpp
-+++ frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 40d0b4ec529..00000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- frmts/jpeg2000/jpeg2000dataset.cpp
-+++ frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index f921ca3fffc..d317d63dd35 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,26 +1,32 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=9
+version=3.2.1
+revision=1
wrksrc="gdal-${version}"
build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+configure_args="--with-expat=yes --with-liblzma=yes --with-opencl=yes
+ --with-podofo=yes --with-spatialite=yes --with-sqlite3=yes
+ --with-webp=yes --with-zstd=yes --with-python=python3
+ $(vopt_if libkml) $(vopt_with postgresql pg)"
+make_install_args=PREFIX=/usr
+hostmakedepends="gettext pkg-config python3-numpy 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 libkml libkml-devel) $(vopt_if postgresql postgresql-libs-devel)"
short_desc="Geospatial Data Abstraction Library"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="MIT"
homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+distfiles="https://github.com/OSGeo/gdal/releases/download/v${version}/gdal-${version}.tar.gz"
+checksum=43d40ba940e3927e38f9e98062ff62f9fa993ceade82f26f16fab7e73edb572e
+# -tools must be the last subpackages
+subpackages="python3-gdal libgdal-devel libgdal-tools"
-if [ -z "$CROSS_BUILD" ]; then
- makedepends+=" hdf5-devel"
-fi
+build_options="libkml postgresql"
+build_options_default="libkml"
post_install() {
vinstall gdal.pc 644 usr/lib/pkgconfig
@@ -46,3 +52,14 @@ 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 "$py3_lib"
+ vmkdir usr/share/examples
+ cp -R swig/python/samples ${PKGDESTDIR}/usr/share/examples/${pkgname}
+ }
+}
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 7d9365ba3d0428519707f9680128bfa45368687b Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:45:30 +0100
Subject: [PATCH 06/11] qscintilla-qt5: update to 2.12.0.
---
.../patches/configure.py-objdir-support.patch | 42 -------------------
srcpkgs/qscintilla-qt5/template | 14 +++----
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 8 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
diff --git a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch b/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
deleted file mode 100644
index bca4b87dc88..00000000000
--- a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
-<scott@kitterman.com>
-patch the configure script for the Python bindings to support object dir
-builds
-Index: Python/configure.py
-===================================================================
---- Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ Python/configure.py 2014-07-05 10:02:02.306834375 -0400
-@@ -31,6 +31,8 @@
- import optparse
- import sys
-
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-+
-
- ###############################################################################
- # You shouldn't need to modify anything above this line.
-@@ -210,6 +212,8 @@
- "The QScintilla version number could not be determined by "
- "reading %s." % sciglobal)
-
-+ return # Debian: do not check for the installed version, we're good this way.
-+
- lib_dir = target_configuration.qsci_lib_dir
- if lib_dir is None:
- lib_dir = target_configuration.qt_lib_dir
-@@ -264,7 +268,12 @@
- the target configuration.
- """
-
-- return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
-+ if target_configuration.pyqt_package == 'PyQt5':
-+ return os.path.join(src_dir, 'sip/qscimod5.sip')
-+ else:
-+ return os.path.join(src_dir, 'sip/qscimod4.sip')
-+
-+ #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
-
- def get_sip_installs(self, target_configuration):
- """ Return a tuple of the installation directory of the module's .sip
-
diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
index 5bc6c853075..5542b3e28dc 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,18 +1,18 @@
# Template file for 'qscintilla-qt5'
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.0
revision=1
-wrksrc="QScintilla_gpl-${version}"
-build_wrksrc=Qt4Qt5
+wrksrc="QScintilla_src-${version}"
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
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="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-3.0-or-only"
homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
-distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"
-checksum=029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=2116181cce3076aa4897e36182532d0e6768081fb0cf6dcdd5be720519ab1434
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b26..1111fb16d9f 100644
--- a/srcpkgs/qscintilla-qt5/update
+++ b/srcpkgs/qscintilla-qt5/update
@@ -1,3 +1,2 @@
site="https://www.riverbankcomputing.com/software/qscintilla/download"
-pkgname=QScintilla_gpl
-ignore="*dev*"
+pattern='QScintilla_src-\K[\d.]+(?=.tar.gz)'
From 1a5717521e7128f82805f50f541203c3aaeb1a00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 11 Mar 2021 22:41:02 +0700
Subject: [PATCH 07/11] New package: python3-PyQt5-QScintilla-2.12.0
---
srcpkgs/python3-PyQt5-QScintilla/template | 37 +++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/python3-PyQt5-QScintilla/template
diff --git a/srcpkgs/python3-PyQt5-QScintilla/template b/srcpkgs/python3-PyQt5-QScintilla/template
new file mode 100644
index 00000000000..010a8f5169c
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-QScintilla/template
@@ -0,0 +1,37 @@
+# Template file for 'python3-PyQt5-QScintilla'
+pkgname=python3-PyQt5-QScintilla
+version=2.12.0
+revision=1
+wrksrc="QScintilla-${version}"
+build_helper=qmake
+hostmakedepends="qt5-qmake qscintilla-qt5 pkg-config python3-PyQt-builder
+ qt5-host-tools python3-PyQt5-devel"
+makedepends="python3-devel qscintilla-qt5-devel python3-PyQt5-devel qt5-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="$PYPI_SITE/Q/QScintilla/QScintilla-${version}.tar.gz"
+checksum=08f9cf2c35af130730231502a550ced2fce45d22b768a43bd49b0334267aa585
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
+
+do_configure() {
+ mkdir -p build
+ sip-build --no-make \
+ --api-dir /usr/share/qt5/qsci/api/python \
+ --build-dir build
+
+ if [ "$CROSS_BUILD" ]; then
+ # -I/usr/include/python$py3_ver is set by sip-build :(
+ find build -name Makefile |
+ xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
+ fi
+}
+
+do_build() {
+ make -C build ${makejobs}
+}
+
+do_install() {
+ make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+}
From ff6eb16d758303a420be499a6d30514e9fbe963e 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 08/11] grass: update to 7.8.5.
---
common/shlibs | 8 ++-
srcpkgs/grass-devel | 1 +
srcpkgs/grass/patches/fix-config.patch | 18 +++++
srcpkgs/grass/patches/musl-build-fix.patch | 12 ++++
srcpkgs/grass/template | 82 ++++++++++++++++------
5 files changed, 99 insertions(+), 22 deletions(-)
create mode 120000 srcpkgs/grass-devel
create mode 100644 srcpkgs/grass/patches/fix-config.patch
create mode 100644 srcpkgs/grass/patches/musl-build-fix.patch
diff --git a/common/shlibs b/common/shlibs
index 6ed3d43d73d..1b2f4b12673 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3966,7 +3966,6 @@ libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
-libtree-sitter.so.0 tree-sitter-0.18.2_1
libavro.so.23 libavro-1.10.1_1
libonigmo.so.6 onigmo-6.2.0_1
libprotobuf-lite.so.26 libprotobuf26-lite-3.15.3_1
@@ -3978,3 +3977,10 @@ 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
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass-devel b/srcpkgs/grass-devel
new file mode 120000
index 00000000000..0b83126164d
--- /dev/null
+++ b/srcpkgs/grass-devel
@@ -0,0 +1 @@
+grass
\ No newline at end of file
diff --git a/srcpkgs/grass/patches/fix-config.patch b/srcpkgs/grass/patches/fix-config.patch
new file mode 100644
index 00000000000..0d4a4e406e3
--- /dev/null
+++ b/srcpkgs/grass/patches/fix-config.patch
@@ -0,0 +1,18 @@
+Index: grass.pc.in
+===================================================================
+--- grass.pc.in.orig
++++ grass.pc.in
+@@ -4,11 +4,11 @@
+
+ prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+ exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
++libdir=/usr/lib
+ includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
+
+ Name: GRASS
+ Description: GRASS GIS
+ Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
++Libs: -L/usr/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
+ Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
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>
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a811..afacf6ef8a1 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,70 @@
# Template file for 'grass'
pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.5
+revision=1
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"
+build_helper=cmake-wxWidgets-gtk3
+configure_args="--prefix=/usr/libexec
+ --with-nls --with-bzlib --with-pthread --with-python
+ --with-wxwidgets=$WX_CONFIG
+ $(vopt_with geos) $(vopt_with mysql) $(vopt_with postgres)"
+hostmakedepends="flex libgdal-tools pkg-config python3-numpy python3-six tar
+ gettext"
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>"
+ fftw-devel cairo-devel glu-devel wxPython4
+ libzstd-devel bzip2-devel $(vopt_if geos geos-devel)
+ $(vopt_if mysql libmariadbclient-devel)
+ $(vopt_if postgres postgresql-libs-devel)"
+depends="python3-numpy wxPython4"
+short_desc="Geographic Resources Analysis Support System"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
-distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
-checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+distfiles="https://github.com/OSGeo/grass/archive/${version}.tar.gz"
+checksum=a359bb665524ecccb643335d70f5436b1c84ffb6a0e428b78dffebacd983ff37
nocross="tries to execute target binaries"
+CPPFLAGS=" -I${XBPS_CROSS_BASE}/usr/include/freetype2"
+CPPFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/mysql"
-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}\";"
+build_options="geos mysql postgres"
+build_options_default="geos postgres"
+
+do_install() {
+ local _file
+ local _libexec=/usr/libexec/grass-$version
+ make INST_DIR=${DESTDIR}${_libexec} \
+ UNIX_BIN=${DESTDIR}/usr/bin \
+ install
+ for _file in AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL \
+ REQUIREMENTS.html config.status \
+ contributors.csv contributors_extra.csv \
+ demolocation/PERMANENT/.tmp/ \
+ translation_status.json translators.csv
+ do
+ rm -rf ${DESTDIR}${_libexec}/${_file}
+ done
+ rm -rf ${DESTDIR}/usr/lib
+ mv ${DESTDIR}${_libexec}/lib ${DESTDIR}/usr
+ vsed -i ${DESTDIR}/usr/bin/grass* -e "s:${DESTDIR}::"
+ vmkdir usr/share
+ mv ${DESTDIR}${_libexec}/locale ${DESTDIR}/usr/share
+ mv ${DESTDIR}${_libexec}/docs/man ${DESTDIR}/usr/share
+}
+
+grass-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ local _file
+ vmove usr/libexec/grass-$version/include
+ vmove usr/libexec/grass-$version/tools
+ vmove "usr/lib/*.a"
+ for _file in $DESTDIR/usr/lib/libgrass_*.so; do
+ case "$_file" in
+ *${version%.*}.so) ;;
+ *) mv "$_file" "${PKGDESTDIR}/usr/lib" ;;
+ esac
+ done
+ vinstall grass.pc 644 usr/share/pkgconfig
+ }
}
From 40c8f5d311ebfd0b1248a1a432ff76ea8358dd1a 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 09/11] New package: python3-OWSLib-0.20.0
---
srcpkgs/python3-OWSLib/template | 22 ++++++++++++++++++++++
1 file changed, 22 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..f016b3854bc
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,22 @@
+# 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-3-Clause"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+do_check() {
+ # skip tests for now. too many missing packages in void-linux
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From a3f114c1fba6c9b2825e111c99344fe013596c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Sun, 17 Jan 2021 08:19:09 +0100
Subject: [PATCH 10/11] New package: qgis-3.18.0
---
srcpkgs/qgis/patches/FindSIP_v6.patch | 26 +++++++++++++++++
srcpkgs/qgis/template | 41 +++++++++++++++++++++++++++
2 files changed, 67 insertions(+)
create mode 100644 srcpkgs/qgis/patches/FindSIP_v6.patch
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/patches/FindSIP_v6.patch b/srcpkgs/qgis/patches/FindSIP_v6.patch
new file mode 100644
index 00000000000..cd52f24d48c
--- /dev/null
+++ b/srcpkgs/qgis/patches/FindSIP_v6.patch
@@ -0,0 +1,26 @@
+temporary SIP patch
+
+use sip4 binary
+
+https://github.com/qgis/QGIS/issues/38911
+
+--- cmake/FindSIP.py 2021-01-15 13:09:03.000000000 +0100
++++ cmake/FindSIP.py 2021-01-20 08:14:26.116694514 +0100
+@@ -53,8 +53,16 @@
+ print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
+
+ import shutil
+- print("sip_bin:%s" % shutil.which("sip5"))
++
++ # temporary sip6 / sip4 patch
++ # -> use sip4 sip binary
++ if sipbuild.version.SIP_VERSION >= 0x60000:
++ sip_bin = shutil.which("sip")
++ else:
++ sip_bin = shutil.which("sip5")
++ print("sip_bin:%s" % sip_bin)
+
+ from distutils.sysconfig import get_python_lib
+ python_modules_dir = get_python_lib(plat_specific=1)
+ print("default_sip_dir:%s" % python_modules_dir)
++
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 00000000000..8609bf0ea53
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,41 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.18.0
+revision=1
+# archs="x86_64*"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF
+ -DGRASS_PREFIX7=/usr/libexec/grass78
+ $(vopt_if server -DWITH_SERVER=ON)"
+hostmakedepends="pkg-config flex bison python3 protobuf25"
+makedepends="gsl-devel hdf5-devel protobuf25-devel ocl-icd-devel opencl-clhpp
+ exiv2-devel expat-devel libxml2-devel libzip-devel netcdf-devel
+ qt5-devel qt5-declarative-devel qt5-location-devel qt5-serialport-devel
+ qt5-webkit-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
+ qt5-plugin-sqlite qt5-plugin-tds qwt-devel qscintilla-qt5-devel
+ python3-PyQt5-QScintilla python3-sip-PyQt5 qca-qt5-devel qca-qt5-ossl
+ qtkeychain-qt5-devel python3-devel python3-PyQt5-devel
+ python3-PyQt5-devel-tools geos-devel grass-devel libgdal-devel
+ proj-devel libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-devel $(vopt_if server fcgi-devel)"
+# geos-devel grass>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+depends="python3-PyQt5 python3-PyQt5-QScintilla 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"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=0be091b2b8067a268213ada46aea62f035694764331f88f304a58e32ff3a3187
+
+build_options="server"
+#build_options_default="server"
+
+xpost_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 9028a7cacea8ff2418b61f499e3a9c9eab611459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 11 Mar 2021 22:48:59 +0700
Subject: [PATCH 11/11] fixup! New package: qgis-3.18.0
---
srcpkgs/qgis/patches/FindSIP_v6.patch | 26 --------------------------
srcpkgs/qgis/template | 4 ++--
2 files changed, 2 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/qgis/patches/FindSIP_v6.patch
diff --git a/srcpkgs/qgis/patches/FindSIP_v6.patch b/srcpkgs/qgis/patches/FindSIP_v6.patch
deleted file mode 100644
index cd52f24d48c..00000000000
--- a/srcpkgs/qgis/patches/FindSIP_v6.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-temporary SIP patch
-
-use sip4 binary
-
-https://github.com/qgis/QGIS/issues/38911
-
---- cmake/FindSIP.py 2021-01-15 13:09:03.000000000 +0100
-+++ cmake/FindSIP.py 2021-01-20 08:14:26.116694514 +0100
-@@ -53,8 +53,16 @@
- print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
-
- import shutil
-- print("sip_bin:%s" % shutil.which("sip5"))
-+
-+ # temporary sip6 / sip4 patch
-+ # -> use sip4 sip binary
-+ if sipbuild.version.SIP_VERSION >= 0x60000:
-+ sip_bin = shutil.which("sip")
-+ else:
-+ sip_bin = shutil.which("sip5")
-+ print("sip_bin:%s" % sip_bin)
-
- from distutils.sysconfig import get_python_lib
- python_modules_dir = get_python_lib(plat_specific=1)
- print("default_sip_dir:%s" % python_modules_dir)
-+
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
index 8609bf0ea53..cf5458f4470 100644
--- a/srcpkgs/qgis/template
+++ b/srcpkgs/qgis/template
@@ -8,8 +8,8 @@ build_style=cmake
configure_args="-DENABLE_TESTS=OFF
-DGRASS_PREFIX7=/usr/libexec/grass78
$(vopt_if server -DWITH_SERVER=ON)"
-hostmakedepends="pkg-config flex bison python3 protobuf25"
-makedepends="gsl-devel hdf5-devel protobuf25-devel ocl-icd-devel opencl-clhpp
+hostmakedepends="pkg-config flex bison python3 protobuf"
+makedepends="gsl-devel hdf5-devel protobuf-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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
@ 2021-03-13 15:13 ` sgn
2021-04-05 13:43 ` nezos
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2021-03-13 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1595 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages qgis-package
https://github.com/void-linux/void-packages/pull/29398
[WIP] Qgis package
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Close #27041
A patch file from https://github.com/void-linux/void-packages/pull/29398.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-package-29398.patch --]
[-- Type: text/x-diff, Size: 36409 bytes --]
From 3cb3e51b62aec39f59e4705f13e8147dbaebe336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Mon, 22 Feb 2021 08:14:20 +0100
Subject: [PATCH 01/10] common/shlibs: add shlibs required by qgis
---
common/shlibs | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/common/shlibs b/common/shlibs
index 86567af2ad0f..899c733e38d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3966,3 +3966,8 @@ libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
+libtree-sitter.so.0 tree-sitter-0.18.2_1
+libavro.so.23 libavro-1.10.1_1
+libonigmo.so.6 onigmo-6.2.0_1
+libprotobuf-lite.so.26 libprotobuf26-lite-3.15.3_1
+libspatialindex.so.6 libspatialindex-1.9.3_1
From 71d7dfecbdab5b7595bdcebd63b4c55d960e10be 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 02/10] proj: update to 7.2.1.
---
common/shlibs | 2 +-
srcpkgs/proj/template | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 899c733e38d0..5091442a84e3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3020,7 +3020,7 @@ libwithsctp.so.1 lksctp-tools-1.0.17_1
libnss_ldap.so.2 nss-pam-ldapd-0.9.7_4
libunshield.so.0 libunshield-0.6_1
libMyGUIEngine.so.3.4.0 libmygui-3.4.0_1
-libproj.so.18 proj-6.3.0_1
+libproj.so.19 proj-7.2.1_1
libnlopt.so.0 nlopt-2.4.2_1
libeb.so.16 libeb-4.3.3_1
libchipcard.so.6 libchipcard-5.0.4_1
diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template
index 51c4638234bd..008cf089c0bf 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,28 +1,27 @@
# Template file for 'proj'
pkgname=proj
-version=6.3.2
+version=7.2.1
revision=1
build_style=cmake
-configure_args="-DPROJ_TESTS=OFF"
+configure_args="-DBUILD_TESTING=ON"
hostmakedepends="python3"
-makedepends="sqlite-devel"
+makedepends="sqlite-devel tiff-devel libcurl-devel"
short_desc="Cartographic Projections Library"
-maintainer="John <me@johnnynator.dev>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
license="MIT"
-homepage="https://proj4.org"
+homepage="https://proj.org"
distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=cb776a70f40c35579ae4ba04fb4a388c1d1ce025a1df6171350dc19f25b80311
+checksum=b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14
post_install() {
vlicense COPYING
}
proj-devel_package() {
- depends="${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/share/man/man3
vmove usr/lib/cmake
vmove "usr/lib/*.so"
}
From 3bf4f73370301f634a068266904b1c6a4e62fdf3 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 03/10] 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
---
common/shlibs | 6 ++++++
srcpkgs/libkml-devel | 1 +
srcpkgs/libkml/patches/NOUNCRYPT.patch | 17 +++++++++++++++
srcpkgs/libkml/template | 29 ++++++++++++++++++++++++++
4 files changed, 53 insertions(+)
create mode 120000 srcpkgs/libkml-devel
create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch
create mode 100644 srcpkgs/libkml/template
diff --git a/common/shlibs b/common/shlibs
index 5091442a84e3..7262b0769ff8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3971,3 +3971,9 @@ libavro.so.23 libavro-1.10.1_1
libonigmo.so.6 onigmo-6.2.0_1
libprotobuf-lite.so.26 libprotobuf26-lite-3.15.3_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
+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-devel b/srcpkgs/libkml-devel
new file mode 120000
index 000000000000..cf12be102f42
--- /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 000000000000..5b7e016c0e02
--- /dev/null
+++ b/srcpkgs/libkml/patches/NOUNCRYPT.patch
@@ -0,0 +1,17 @@
+minizip/crypt.h was removed from the packet minizip-1.2.11_2.
+
+with "#define NOUNCRYPT" libkml can be built without "crypt.h"
+https://github.com/void-linux/void-packages/commit/952ac913cf
+https://github.com/madler/zlib/pull/229
+
+--- a/src/kml/base/contrib/minizip/unzip.c 2015-12-21 18:23:05.000000000 +0100
++++ b/src/kml/base/contrib/minizip/unzip.c 2020-11-26 15:45:55.033835816 +0100
+@@ -42,7 +42,7 @@
+ #include <zlib.h> //RR
+ #include "unzip.h"
+ #include "iomem_simple.h"
+-#undef NOUNCRYPT
++#define NOUNCRYPT
+
+ #ifdef STDC
+ # include <stddef.h>
diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
new file mode 100644
index 000000000000..77266d8919ea
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,29 @@
+# Template file for 'libkml'
+pkgname=libkml
+version=1.3.0
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DBUILD_TESTING=ON"
+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="BSD-3-Clause"
+homepage="https://github.com/libkml/libkml"
+distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz"
+checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
+patch_args=-Np1
+
+post_install() {
+ vlicense LICENSE
+}
+
+libkml-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From 9df03353a3a704b3df30e30dbe3eb12e30f5ccc5 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 20 Dec 2020 14:49:30 +0100
Subject: [PATCH 04/10] New package: libspatialite-5.0.0
SpatiaLite is an open source library intended to extend the SQLite core
to support fully fledged Spatial SQL capabilities.
---
common/shlibs | 1 +
srcpkgs/libspatialite-devel | 1 +
.../patches/disable_check_sql.patch | 29 +++++++++++++++++++
srcpkgs/libspatialite/shlibs | 2 ++
srcpkgs/libspatialite/template | 29 +++++++++++++++++++
5 files changed, 62 insertions(+)
create mode 120000 srcpkgs/libspatialite-devel
create mode 100644 srcpkgs/libspatialite/patches/disable_check_sql.patch
create mode 100644 srcpkgs/libspatialite/shlibs
create mode 100644 srcpkgs/libspatialite/template
diff --git a/common/shlibs b/common/shlibs
index 7262b0769ff8..e2057404d04f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libkmldom.so.1 libkml-1.3.0_1
libkmlengine.so.1 libkml-1.3.0_1
libkmlregionator.so.1 libkml-1.3.0_1
libkmlxsd.so.1 libkml-1.3.0_1
+libspatialite.so.7 libspatialite-5.0.0_1
diff --git a/srcpkgs/libspatialite-devel b/srcpkgs/libspatialite-devel
new file mode 120000
index 000000000000..588ba2ad7c00
--- /dev/null
+++ b/srcpkgs/libspatialite-devel
@@ -0,0 +1 @@
+libspatialite
\ No newline at end of file
diff --git a/srcpkgs/libspatialite/patches/disable_check_sql.patch b/srcpkgs/libspatialite/patches/disable_check_sql.patch
new file mode 100644
index 000000000000..e1f1a0857b69
--- /dev/null
+++ b/srcpkgs/libspatialite/patches/disable_check_sql.patch
@@ -0,0 +1,29 @@
+disable check_sql_stmt test
+
+https://www.gaia-gis.it/fossil/libspatialite/tktview/3e46349bf2bfc58b3e3051d1ff7cab73eed19a88?plaintext
+
+--- test/Makefile.am 2020-08-23 18:46:23.000000000 +0200
++++ test/Makefile.am 2020-12-22 14:45:10.206085515 +0100
+@@ -31,10 +31,6 @@
+ check_gaia_utf8 \
+ check_extension \
+ check_recover_geom \
+- check_sql_stmt \
+- check_sql_stmt_tiny \
+- check_sql_stmt_legacy \
+- check_sql_stmt_extension \
+ check_multithread \
+ check_virtualtable1 \
+ check_virtualtable2 \
+--- test/Makefile.in 2020-08-23 18:46:23.000000000 +0200
++++ test/Makefile.in 2020-12-22 14:41:06.416335737 +0100
+@@ -102,9 +102,6 @@
+ check_xls_load$(EXEEXT) check_math_funcs$(EXEEXT) \
+ check_gaia_util$(EXEEXT) check_gaia_utf8$(EXEEXT) \
+ check_extension$(EXEEXT) check_recover_geom$(EXEEXT) \
+- check_sql_stmt$(EXEEXT) check_sql_stmt_tiny$(EXEEXT) \
+- check_sql_stmt_legacy$(EXEEXT) \
+- check_sql_stmt_extension$(EXEEXT) check_multithread$(EXEEXT) \
+ check_virtualtable1$(EXEEXT) check_virtualtable2$(EXEEXT) \
+ check_virtualtable3$(EXEEXT) check_virtualtable4$(EXEEXT) \
+ check_virtualtable5$(EXEEXT) check_virtualtable6$(EXEEXT) \
diff --git a/srcpkgs/libspatialite/shlibs b/srcpkgs/libspatialite/shlibs
new file mode 100644
index 000000000000..eee57edae597
--- /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 000000000000..ee8afc70b851
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,29 @@
+# Template file for 'libspatialite'
+pkgname=libspatialite
+version=5.0.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-geosconfig=$XBPS_CROSS_BASE/usr/bin/geos-config"
+hostmakedepends="pkg-config libxml2 libtool"
+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.1"
+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"
+
+libspatialite-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
+ }
+}
From f34a234b08afd61356e09560efecad8fa1c78423 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Fri, 27 Nov 2020 07:02:22 +0100
Subject: [PATCH 05/10] libgdal: update to 3.2.1.
- update to 3.2.1.
- --with-expat / --with-spatialite added (OSM support)
- postgresql and kml support added
- python3-gdal module added
---
common/shlibs | 2 +-
...e16e27c5fc4c491debe50bf2b7f3e94ed334.patch | 53 --------------
...c4893e6d14d488dfed25745d79f11bee45b9.patch | 31 ---------
srcpkgs/libgdal/template | 69 +++++++++++++++----
srcpkgs/python3-gdal | 1 +
5 files changed, 57 insertions(+), 99 deletions(-)
delete mode 100644 srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
delete mode 100644 srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
create mode 120000 srcpkgs/python3-gdal
diff --git a/common/shlibs b/common/shlibs
index e2057404d04f..e8b87d0cc043 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2461,7 +2461,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5
libu2f-server.so.0 libu2f-server-1.1.0_9
libsqlcipher.so.0 sqlcipher-4.3.0_3
libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.4_9
+libgdal.so.28 libgdal-3.2.1_1
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch b/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
deleted file mode 100644
index 3fe5d7fda9eb..000000000000
--- a/srcpkgs/libgdal/patches/9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 9ef8e16e27c5fc4c491debe50bf2b7f3e94ed334 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- frmts/jpeg2000/jpeg2000_vsil_io.cpp.orig
-+++ frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,24 @@
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- frmts/jpeg2000/jpeg2000dataset.cpp
-+++ frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch b/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
deleted file mode 100644
index 40d0b4ec529b..000000000000
--- a/srcpkgs/libgdal/patches/ab72c4893e6d14d488dfed25745d79f11bee45b9.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ab72c4893e6d14d488dfed25745d79f11bee45b9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- frmts/jpeg2000/jpeg2000dataset.cpp
-+++ frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index f921ca3fffc6..d0c9ccc87102 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,30 +1,60 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=9
+version=3.2.1
+revision=1
wrksrc="gdal-${version}"
build_style=gnu-configure
-configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
-hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
-makedepends="freexl-devel geos-devel jasper-devel json-c-devel
- libcurl-devel libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
- libwebp-devel libxml2-devel libzstd-devel netcdf-devel opencl2-headers pcre2-devel
- proj-devel sqlite-devel ocl-icd-devel"
+configure_args="--with-expat=yes --with-liblzma=yes --with-opencl=yes
+ --with-podofo=yes --with-spatialite=yes --with-sqlite3=yes
+ --with-webp=yes --with-zstd=yes --with-libjson-c=${XBPS_CROSS_BASE}/usr
+ $(vopt_if libkml) $(vopt_with postgresql pg)"
+hostmakedepends="gettext pkg-config python3-numpy 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 libkml libkml-devel) $(vopt_if postgresql postgresql-libs-devel)"
short_desc="Geospatial Data Abstraction Library"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="MIT"
homepage="http://www.gdal.org/"
-distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
-checksum=5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277
-subpackages="libgdal-devel libgdal-tools"
+distfiles="https://github.com/OSGeo/gdal/releases/download/v${version}/gdal-${version}.tar.gz"
+checksum=43d40ba940e3927e38f9e98062ff62f9fa993ceade82f26f16fab7e73edb572e
+# -tools must be the last subpackages
+subpackages="python3-gdal libgdal-devel libgdal-tools"
-if [ -z "$CROSS_BUILD" ]; then
- makedepends+=" hdf5-devel"
-fi
+build_options="libkml postgresql"
+build_options_default="libkml"
+CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}"
+CXXFLAGS="$CFLAGS"
+LDFLAGS="-L${XBPS_CROSS_BASE}/${py3_lib}"
+
+_python_env() {
+ local f
+ export PYPREFIX="${XBPS_CROSS_BASE}"
+ export LDSHARED="${CXX} -shared ${LDFLAGS}"
+ export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}
+ for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
+ f=${f##*/}
+ export _PYTHON_SYSCONFIGDATA_NAME=${f%.py}
+ done
+}
+
+post_build() {
+ cd ${wrksrc}/swig/python
+ _python_env
+ python3 setup.py build
+ cd ${wrksrc}
+}
post_install() {
vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
+ cd ${wrksrc}/swig/python
+ _python_env
+ python3 setup.py install --prefix=/usr --root=${DESTDIR}
+ cd ${wrksrc}
}
libgdal-tools_package() {
@@ -46,3 +76,14 @@ 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 "$py3_lib"
+ vmkdir usr/share/examples
+ cp -R swig/python/samples ${PKGDESTDIR}/usr/share/examples/${pkgname}
+ }
+}
diff --git a/srcpkgs/python3-gdal b/srcpkgs/python3-gdal
new file mode 120000
index 000000000000..377d50dfc2b8
--- /dev/null
+++ b/srcpkgs/python3-gdal
@@ -0,0 +1 @@
+libgdal
\ No newline at end of file
From 91e65239c20095c763d99ae4883bef4d6df74f97 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:45:30 +0100
Subject: [PATCH 06/10] qscintilla-qt5: update to 2.12.0.
---
.../patches/configure.py-objdir-support.patch | 42 -------------------
srcpkgs/qscintilla-qt5/template | 14 +++----
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 8 insertions(+), 51 deletions(-)
delete mode 100644 srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
diff --git a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch b/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
deleted file mode 100644
index bca4b87dc88e..000000000000
--- a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
-<scott@kitterman.com>
-patch the configure script for the Python bindings to support object dir
-builds
-Index: Python/configure.py
-===================================================================
---- Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ Python/configure.py 2014-07-05 10:02:02.306834375 -0400
-@@ -31,6 +31,8 @@
- import optparse
- import sys
-
-+src_dir = os.path.dirname(os.path.abspath(__file__))
-+
-
- ###############################################################################
- # You shouldn't need to modify anything above this line.
-@@ -210,6 +212,8 @@
- "The QScintilla version number could not be determined by "
- "reading %s." % sciglobal)
-
-+ return # Debian: do not check for the installed version, we're good this way.
-+
- lib_dir = target_configuration.qsci_lib_dir
- if lib_dir is None:
- lib_dir = target_configuration.qt_lib_dir
-@@ -264,7 +268,12 @@
- the target configuration.
- """
-
-- return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
-+ if target_configuration.pyqt_package == 'PyQt5':
-+ return os.path.join(src_dir, 'sip/qscimod5.sip')
-+ else:
-+ return os.path.join(src_dir, 'sip/qscimod4.sip')
-+
-+ #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
-
- def get_sip_installs(self, target_configuration):
- """ Return a tuple of the installation directory of the module's .sip
-
diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
index 5bc6c8530757..5542b3e28dc9 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,18 +1,18 @@
# Template file for 'qscintilla-qt5'
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.0
revision=1
-wrksrc="QScintilla_gpl-${version}"
-build_wrksrc=Qt4Qt5
+wrksrc="QScintilla_src-${version}"
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
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="Monkey-7-12 <monkeyseven@fblog.ch>"
+license="GPL-3.0-or-only"
homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
-distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"
-checksum=029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=2116181cce3076aa4897e36182532d0e6768081fb0cf6dcdd5be720519ab1434
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..1111fb16d9f9 100644
--- a/srcpkgs/qscintilla-qt5/update
+++ b/srcpkgs/qscintilla-qt5/update
@@ -1,3 +1,2 @@
site="https://www.riverbankcomputing.com/software/qscintilla/download"
-pkgname=QScintilla_gpl
-ignore="*dev*"
+pattern='QScintilla_src-\K[\d.]+(?=.tar.gz)'
From 248de9e37a90c12dd23253a82d8a2fdc328916ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 11 Mar 2021 22:41:02 +0700
Subject: [PATCH 07/10] New package: python3-PyQt5-QScintilla-2.12.0
---
srcpkgs/python3-PyQt5-QScintilla/template | 37 +++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/python3-PyQt5-QScintilla/template
diff --git a/srcpkgs/python3-PyQt5-QScintilla/template b/srcpkgs/python3-PyQt5-QScintilla/template
new file mode 100644
index 000000000000..010a8f5169c2
--- /dev/null
+++ b/srcpkgs/python3-PyQt5-QScintilla/template
@@ -0,0 +1,37 @@
+# Template file for 'python3-PyQt5-QScintilla'
+pkgname=python3-PyQt5-QScintilla
+version=2.12.0
+revision=1
+wrksrc="QScintilla-${version}"
+build_helper=qmake
+hostmakedepends="qt5-qmake qscintilla-qt5 pkg-config python3-PyQt-builder
+ qt5-host-tools python3-PyQt5-devel"
+makedepends="python3-devel qscintilla-qt5-devel python3-PyQt5-devel qt5-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="$PYPI_SITE/Q/QScintilla/QScintilla-${version}.tar.gz"
+checksum=08f9cf2c35af130730231502a550ced2fce45d22b768a43bd49b0334267aa585
+CXXFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
+
+do_configure() {
+ mkdir -p build
+ sip-build --no-make \
+ --api-dir /usr/share/qt5/qsci/api/python \
+ --build-dir build
+
+ if [ "$CROSS_BUILD" ]; then
+ # -I/usr/include/python$py3_ver is set by sip-build :(
+ find build -name Makefile |
+ xargs sed -i "s,-I\\(/usr/include\\),-I$XBPS_CROSS_BASE\\1,g"
+ fi
+}
+
+do_build() {
+ make -C build ${makejobs}
+}
+
+do_install() {
+ make -C build DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install
+}
From ea12b0cb9349340c39f106768869e0edfc64656d 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 08/10] grass: update to 7.8.5.
---
common/shlibs | 8 ++-
srcpkgs/grass-devel | 1 +
srcpkgs/grass/patches/fix-config.patch | 18 +++++
srcpkgs/grass/patches/musl-build-fix.patch | 12 ++++
srcpkgs/grass/template | 82 ++++++++++++++++------
5 files changed, 99 insertions(+), 22 deletions(-)
create mode 120000 srcpkgs/grass-devel
create mode 100644 srcpkgs/grass/patches/fix-config.patch
create mode 100644 srcpkgs/grass/patches/musl-build-fix.patch
diff --git a/common/shlibs b/common/shlibs
index e8b87d0cc043..ec3165e8d8cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3966,7 +3966,6 @@ libsimavrparts.so.1 simavr-1.6_2
libsword-1.8.1.so libsword-1.8.1_6
libpari-gmp.so.7 pari-2.13.0_1
libtree-sitter.so.0 tree-sitter-0.19.0_1
-libtree-sitter.so.0 tree-sitter-0.18.2_1
libavro.so.23 libavro-1.10.1_1
libonigmo.so.6 onigmo-6.2.0_1
libprotobuf-lite.so.26 libprotobuf26-lite-3.15.3_1
@@ -3978,3 +3977,10 @@ 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
+libgrass_gis.7.8.so grass-7.8.4_1
+libgrass_raster.7.8.so grass-7.8.4_1
+libgrass_gproj.7.8.so grass-7.8.4_1
+libgrass_dbmiclient.7.8.so grass-7.8.4_1
+libgrass_vector.7.8.so grass-7.8.4_1
+libgrass_dbmibase.7.8.so grass-7.8.4_1
+libgrass_imagery.7.8.so grass-7.8.4_1
diff --git a/srcpkgs/grass-devel b/srcpkgs/grass-devel
new file mode 120000
index 000000000000..0b83126164de
--- /dev/null
+++ b/srcpkgs/grass-devel
@@ -0,0 +1 @@
+grass
\ No newline at end of file
diff --git a/srcpkgs/grass/patches/fix-config.patch b/srcpkgs/grass/patches/fix-config.patch
new file mode 100644
index 000000000000..0d4a4e406e3f
--- /dev/null
+++ b/srcpkgs/grass/patches/fix-config.patch
@@ -0,0 +1,18 @@
+Index: grass.pc.in
+===================================================================
+--- grass.pc.in.orig
++++ grass.pc.in
+@@ -4,11 +4,11 @@
+
+ prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+ exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
++libdir=/usr/lib
+ includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
+
+ Name: GRASS
+ Description: GRASS GIS
+ Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
++Libs: -L/usr/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
+ Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
diff --git a/srcpkgs/grass/patches/musl-build-fix.patch b/srcpkgs/grass/patches/musl-build-fix.patch
new file mode 100644
index 000000000000..e8177836574a
--- /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>
diff --git a/srcpkgs/grass/template b/srcpkgs/grass/template
index bccd691a8116..afacf6ef8a17 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,70 @@
# Template file for 'grass'
pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.5
+revision=1
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"
+build_helper=cmake-wxWidgets-gtk3
+configure_args="--prefix=/usr/libexec
+ --with-nls --with-bzlib --with-pthread --with-python
+ --with-wxwidgets=$WX_CONFIG
+ $(vopt_with geos) $(vopt_with mysql) $(vopt_with postgres)"
+hostmakedepends="flex libgdal-tools pkg-config python3-numpy python3-six tar
+ gettext"
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>"
+ fftw-devel cairo-devel glu-devel wxPython4
+ libzstd-devel bzip2-devel $(vopt_if geos geos-devel)
+ $(vopt_if mysql libmariadbclient-devel)
+ $(vopt_if postgres postgresql-libs-devel)"
+depends="python3-numpy wxPython4"
+short_desc="Geographic Resources Analysis Support System"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
license="GPL-2.0-or-later"
homepage="https://grass.osgeo.org/"
-distfiles="https://grass.osgeo.org/grass${_binver}/source/${pkgname}-${version}.tar.gz"
-checksum=9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b
-python_version=2 #unverified
+distfiles="https://github.com/OSGeo/grass/archive/${version}.tar.gz"
+checksum=a359bb665524ecccb643335d70f5436b1c84ffb6a0e428b78dffebacd983ff37
nocross="tries to execute target binaries"
+CPPFLAGS=" -I${XBPS_CROSS_BASE}/usr/include/freetype2"
+CPPFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/mysql"
-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}\";"
+build_options="geos mysql postgres"
+build_options_default="geos postgres"
+
+do_install() {
+ local _file
+ local _libexec=/usr/libexec/grass-$version
+ make INST_DIR=${DESTDIR}${_libexec} \
+ UNIX_BIN=${DESTDIR}/usr/bin \
+ install
+ for _file in AUTHORS CHANGES CITING COPYING GPL.TXT INSTALL \
+ REQUIREMENTS.html config.status \
+ contributors.csv contributors_extra.csv \
+ demolocation/PERMANENT/.tmp/ \
+ translation_status.json translators.csv
+ do
+ rm -rf ${DESTDIR}${_libexec}/${_file}
+ done
+ rm -rf ${DESTDIR}/usr/lib
+ mv ${DESTDIR}${_libexec}/lib ${DESTDIR}/usr
+ vsed -i ${DESTDIR}/usr/bin/grass* -e "s:${DESTDIR}::"
+ vmkdir usr/share
+ mv ${DESTDIR}${_libexec}/locale ${DESTDIR}/usr/share
+ mv ${DESTDIR}${_libexec}/docs/man ${DESTDIR}/usr/share
+}
+
+grass-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ local _file
+ vmove usr/libexec/grass-$version/include
+ vmove usr/libexec/grass-$version/tools
+ vmove "usr/lib/*.a"
+ for _file in $DESTDIR/usr/lib/libgrass_*.so; do
+ case "$_file" in
+ *${version%.*}.so) ;;
+ *) mv "$_file" "${PKGDESTDIR}/usr/lib" ;;
+ esac
+ done
+ vinstall grass.pc 644 usr/share/pkgconfig
+ }
}
From 2cc879c0e351200c86bfd7cfcf2ac2c02ca2ec24 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 09/10] New package: python3-OWSLib-0.20.0
---
srcpkgs/python3-OWSLib/template | 22 ++++++++++++++++++++++
1 file changed, 22 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 000000000000..f016b3854bc6
--- /dev/null
+++ b/srcpkgs/python3-OWSLib/template
@@ -0,0 +1,22 @@
+# 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-3-Clause"
+homepage="https://geopython.github.io/OWSLib"
+distfiles="https://github.com/geopython/OWSLib/archive/${version}.tar.gz"
+checksum=24dfed7372449a942d7d5090df3021f090c2bb52189b3f0044405d7b98c3bf66
+
+do_check() {
+ # skip tests for now. too many missing packages in void-linux
+ :
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 73c6935fa163bce29be960ff0555ece23e270b2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Sun, 17 Jan 2021 08:19:09 +0100
Subject: [PATCH 10/10] New package: qgis-3.18.0
---
srcpkgs/qgis/template | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..cf5458f44707
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,41 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.18.0
+revision=1
+# archs="x86_64*"
+wrksrc=QGIS-final-${version//./_}
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF
+ -DGRASS_PREFIX7=/usr/libexec/grass78
+ $(vopt_if server -DWITH_SERVER=ON)"
+hostmakedepends="pkg-config flex bison python3 protobuf"
+makedepends="gsl-devel hdf5-devel protobuf-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-QScintilla python3-sip-PyQt5 qca-qt5-devel qca-qt5-ossl
+ qtkeychain-qt5-devel python3-devel python3-PyQt5-devel
+ python3-PyQt5-devel-tools geos-devel grass-devel libgdal-devel
+ proj-devel libspatialindex-devel libspatialite-devel
+ postgresql-libs-devel sqlite-devel $(vopt_if server fcgi-devel)"
+# geos-devel grass>=7.8.0 grass<7.9.0 libgdal-devel proj-devel
+depends="python3-PyQt5 python3-PyQt5-QScintilla 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"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
+license="GPL-3.0-or-later"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=0be091b2b8067a268213ada46aea62f035694764331f88f304a58e32ff3a3187
+
+build_options="server"
+#build_options_default="server"
+
+xpost_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/
+}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
2021-03-13 15:13 ` [PR PATCH] [Updated] " sgn
@ 2021-04-05 13:43 ` nezos
2021-04-13 15:59 ` nezos
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: nezos @ 2021-04-05 13:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/29398#issuecomment-813399973
Comment:
Hi, has this been stalled out?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
2021-03-13 15:13 ` [PR PATCH] [Updated] " sgn
2021-04-05 13:43 ` nezos
@ 2021-04-13 15:59 ` nezos
2021-04-22 0:47 ` sgn
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: nezos @ 2021-04-13 15:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/29398#issuecomment-813399973
Comment:
Hi, has this been stalled out?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
` (2 preceding siblings ...)
2021-04-13 15:59 ` nezos
@ 2021-04-22 0:47 ` sgn
2021-04-22 0:47 ` [PR PATCH] [Closed]: " sgn
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2021-04-22 0:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/29398#issuecomment-824456843
Comment:
@Nyx70 sorry, I couldn't find time to continue. Would you mind to continue?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
` (3 preceding siblings ...)
2021-04-22 0:47 ` sgn
@ 2021-04-22 0:47 ` sgn
2021-04-22 0:48 ` sgn
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2021-04-22 0:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1442 bytes --]
There's a closed pull request on the void-packages repository
[WIP] Qgis package
https://github.com/void-linux/void-packages/pull/29398
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Close #27041
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
` (4 preceding siblings ...)
2021-04-22 0:47 ` [PR PATCH] [Closed]: " sgn
@ 2021-04-22 0:48 ` sgn
2021-04-23 4:50 ` Nyx70
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2021-04-22 0:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/29398#issuecomment-824457005
Comment:
`git fetch https://github.com/sgn/void-packages.git qgis-package`
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
` (5 preceding siblings ...)
2021-04-22 0:48 ` sgn
@ 2021-04-23 4:50 ` Nyx70
2021-04-23 6:32 ` nezos
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: Nyx70 @ 2021-04-23 4:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
New comment by Nyx70 on void-packages repository
https://github.com/void-linux/void-packages/pull/29398#issuecomment-825383869
Comment:
Ok, i’ll continue later.
QGIS needs SIP 5, which is no more included in void-linux.
SIP 4 also make problems (python 2.x code mix ?): "sip: Py_ssize_t is undefined"
I‘ll wait until SIP 6 is supported in QGIS and reopen a new „pull request“.
Until then, QGIS for void-linux is available on https://void-linux.nýx.ch/ (https://nýx.ch/prj/qgis/)
👁 https://github.com/qgis/QGIS/issues/38911
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
` (6 preceding siblings ...)
2021-04-23 4:50 ` Nyx70
@ 2021-04-23 6:32 ` nezos
2021-04-23 12:39 ` Nyx70
2021-04-25 12:43 ` Nyx70
9 siblings, 0 replies; 11+ messages in thread
From: nezos @ 2021-04-23 6:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/29398#issuecomment-825424355
Comment:
@Nyx70 could you please upgrade grass as its GUI is not currently working? grass does not rely on SIP. Things will be easier then for QGIS to be added.
[Package 'grass' : GRASS GUI not working #29209](https://github.com/void-linux/void-packages/issues/29209)
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
` (7 preceding siblings ...)
2021-04-23 6:32 ` nezos
@ 2021-04-23 12:39 ` Nyx70
2021-04-25 12:43 ` Nyx70
9 siblings, 0 replies; 11+ messages in thread
From: Nyx70 @ 2021-04-23 12:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by Nyx70 on void-packages repository
https://github.com/void-linux/void-packages/pull/29398#issuecomment-825629760
Comment:
@nezos https://github.com/void-linux/void-packages/pull/30452
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [WIP] Qgis package
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
` (8 preceding siblings ...)
2021-04-23 12:39 ` Nyx70
@ 2021-04-25 12:43 ` Nyx70
9 siblings, 0 replies; 11+ messages in thread
From: Nyx70 @ 2021-04-25 12:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New comment by Nyx70 on void-packages repository
https://github.com/void-linux/void-packages/pull/29398#issuecomment-826318322
Comment:
https://github.com/void-linux/void-packages/pull/30452
I get out
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-04-25 12:43 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-11 15:50 [PR PATCH] [WIP] Qgis package sgn
2021-03-13 15:13 ` [PR PATCH] [Updated] " sgn
2021-04-05 13:43 ` nezos
2021-04-13 15:59 ` nezos
2021-04-22 0:47 ` sgn
2021-04-22 0:47 ` [PR PATCH] [Closed]: " sgn
2021-04-22 0:48 ` sgn
2021-04-23 4:50 ` Nyx70
2021-04-23 6:32 ` nezos
2021-04-23 12:39 ` Nyx70
2021-04-25 12:43 ` 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).