* [PR PATCH] DBeaver: update to 21.1.5
@ 2021-08-16 19:50 ar-jan
2021-08-16 19:55 ` [PR PATCH] [Updated] " ar-jan
2021-08-18 2:12 ` [PR PATCH] [Merged]: " abenson
0 siblings, 2 replies; 3+ messages in thread
From: ar-jan @ 2021-08-16 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]
There is a new pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages dbeaver2115
https://github.com/void-linux/void-packages/pull/32518
DBeaver: update to 21.1.5
<!-- 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?
- [x] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/32518.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dbeaver2115-32518.patch --]
[-- Type: text/x-diff, Size: 43148 bytes --]
From d60b736591d4edc8738f35f23ffe329988125810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Tue, 11 May 2021 07:00:33 +0200
Subject: [PATCH 01/16] proj: update to 7.2.1.
---
common/shlibs | 2 +-
srcpkgs/proj/template | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 301649ded872..77fb15b7ac6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3037,7 +3037,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..94995256d81d 100644
--- a/srcpkgs/proj/template
+++ b/srcpkgs/proj/template
@@ -1,17 +1,17 @@
# Template file for 'proj'
pkgname=proj
-version=6.3.2
+version=7.2.1
revision=1
build_style=cmake
-configure_args="-DPROJ_TESTS=OFF"
+configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="python3"
-makedepends="sqlite-devel"
+makedepends="sqlite-devel tiff-devel libcurl-devel"
short_desc="Cartographic Projections Library"
maintainer="John <me@johnnynator.dev>"
license="MIT"
-homepage="https://proj4.org"
+homepage="https://proj.org"
distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz"
-checksum=cb776a70f40c35579ae4ba04fb4a388c1d1ce025a1df6171350dc19f25b80311
+checksum=b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14
post_install() {
vlicense COPYING
@@ -22,7 +22,6 @@ proj-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
- vmove usr/share/man/man3
vmove usr/lib/cmake
vmove "usr/lib/*.so"
}
From 8239795d9f6e9b8c424edd7689a09d9df8c2429f 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 02/16] 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.
i686/i686 : ok
x86_64-musl/x86_64-musl : ok
aarch64/x86_64 : ok
aarch64-musl/x86_64-musl: ok
armv7l/x86_64 : ok
armv6l-musl/x86_64-musl : ok
---
common/shlibs | 16 +++++++++
srcpkgs/libspatialite-devel | 1 +
.../patches/disable_check_sql.patch | 29 +++++++++++++++
srcpkgs/libspatialite/template | 36 +++++++++++++++++++
4 files changed, 82 insertions(+)
create mode 120000 srcpkgs/libspatialite-devel
create mode 100644 srcpkgs/libspatialite/patches/disable_check_sql.patch
create mode 100644 srcpkgs/libspatialite/template
diff --git a/common/shlibs b/common/shlibs
index 77fb15b7ac6a..b266f95466ed 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4005,3 +4005,19 @@ liblhasa.so.0 lhasa-0.3.1_2
libmt32emu.so.2 libmt32emu-2.5.1_1
libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
libstemmer.so.2 libstemmer-2.1.0_1
+libkmlbase.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
+libspatialite.so.7 libspatialite-5.0.0_1
+libspatialindex.so.6 libspatialindex-1.9.3_1
+libgrass_gis.7.8.so grass-7.8.5_1
+libgrass_raster.7.8.so grass-7.8.5_1
+libgrass_gproj.7.8.so grass-7.8.5_1
+libgrass_dbmiclient.7.8.so grass-7.8.5_1
+libgrass_vector.7.8.so grass-7.8.5_1
+libgrass_dbmibase.7.8.so grass-7.8.5_1
+libgrass_imagery.7.8.so grass-7.8.5_1
+libkmlconvenience.so.1 libkml-1.3.0_1
+mod_spatialite.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..951c1ac1724d
--- /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
+
+--- a/test/Makefile.am 2020-08-23 18:46:23.000000000 +0200
++++ b/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 \
+--- a/test/Makefile.in 2020-08-23 18:46:23.000000000 +0200
++++ b/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/template b/srcpkgs/libspatialite/template
new file mode 100644
index 000000000000..da7a9439da7e
--- /dev/null
+++ b/srcpkgs/libspatialite/template
@@ -0,0 +1,36 @@
+# 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="Orphaned <orphan@voidlinux.org>"
+license="MPL-1.0"
+homepage="https://www.gaia-gis.it/fossil/libspatialite/index"
+distfiles="http://www.gaia-gis.it/gaia-sins/${pkgname}-${version}.tar.gz"
+checksum=7b7fd70243f5a0b175696d87c46dde0ace030eacc27f39241c24bac5dfac6dac
+
+CFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" libtool geos-devel"
+fi
+
+post_install() {
+ vlicense COPYING
+}
+
+libspatialite-devel_package() {
+ depends="$pkgname>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
+ }
+}
From 4faa990150b98a2bd1908f45e482b310bc3f26cc 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/16] 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/template | 23 +++++++++++++++++++++++
3 files changed, 41 insertions(+)
create mode 120000 srcpkgs/libkml-devel
create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch
create mode 100644 srcpkgs/libkml/template
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..d2abee573fe1
--- /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="Orphaned <orphan@voidlinux.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/libkml/libkml"
+distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz"
+checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
+
+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 22db50ba572cd631ba8d030d5a1d85c23d17ffb9 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Fri, 27 Nov 2020 07:02:22 +0100
Subject: [PATCH 04/16] libgdal: update to 3.2.3.
- update to 3.2.3.
- --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 | 83 ++++++++++++++++---
srcpkgs/python3-gdal | 1 +
5 files changed, 73 insertions(+), 97 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 b266f95466ed..636026690bc4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2482,7 +2482,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.3_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 968edeb32c77..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
---- a/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/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
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/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 643eac882f6f..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
---- a/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/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 c34684b8115b..f71d947b0aea 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,30 +1,77 @@
# Template file for 'libgdal'
pkgname=libgdal
-version=3.0.4
-revision=10
+version=3.2.3
+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
+ $(vopt_if kml libkml)
+ $(vopt_with postgresql pg)"
+hostmakedepends="gettext-devel pkg-config python3-numpy json-c-devel swig"
+makedepends="boost-devel expat-devel freexl-devel geos-devel jasper-devel
+ json-c-devel libcurl-devel libopenexr-devel libopenjpeg2-devel
+ libpodofo-devel libqhull-devel libspatialite-devel libwebp-devel
+ libxml2-devel libzstd-devel netcdf-devel ocl-icd-devel opencl-headers
+ pcre2-devel proj-devel python3-devel sqlite-devel
+ $(vopt_if kml libkml-devel)
+ $(vopt_if postgresql postgresql-libs-devel)"
short_desc="Geospatial Data Abstraction Library"
maintainer="Orphaned <orphan@voidlinux.org>"
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"
+homepage="https://gdal.org/"
+distfiles="https://github.com/OSGeo/gdal/releases/download/v${version}/gdal-${version}.tar.gz"
+checksum=86a35aad60a1eb87c2c0c145f9bccd83a47c4781254544ed5246f64d55ee1f18
+subpackages="python3-gdal libgdal-devel libgdal-tools"
+
+build_options="kml postgresql"
+build_options_default="kml"
if [ -z "$CROSS_BUILD" ]; then
makedepends+=" hdf5-devel"
fi
+CFLAGS="-pthread -I${XBPS_CROSS_BASE}/${py3_inc}"
+LDFLAGS="-L${XBPS_CROSS_BASE}/${py3_lib}"
+
+post_build() {
+ if [ "$CROSS_BUILD" ]; then
+ export PYPREFIX="$XBPS_CROSS_BASE"
+ 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
+ fi
+ export LDSHARED="${CC} $CFLAGS -shared $LDFLAGS"
+
+ rm -f swig/python/*_wrap.cpp
+ make -C swig/python generate
+ cd swig/python
+ python3 setup.py build
+}
post_install() {
vinstall gdal.pc 644 usr/lib/pkgconfig
vlicense LICENSE.TXT
+ if [ "$CROSS_BUILD" ]; then
+ export PYPREFIX="$XBPS_CROSS_BASE"
+ 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
+ fi
+ export LDSHARED="${CC} $CFLAGS -shared $LDFLAGS"
+
+ cd swig/python
+ python3 setup.py install --prefix=/usr --root=$DESTDIR
}
libgdal-tools_package() {
@@ -46,3 +93,15 @@ libgdal-devel_package() {
vmove usr/lib/*.so
}
}
+
+python3-gdal_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - Python3 bindings"
+ pkg_install() {
+ vmove "usr/bin/*.py"
+ vmove "usr/lib/python*"
+ vdoc swig/python/README.rst
+ vmkdir usr/share/python3-gdal
+ vcopy swig/python/samples usr/share/python3-gdal/examples
+ }
+}
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 198a2a7d91f9cd3e183d208f9f571494e5a57a41 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 27 Jun 2021 22:18:46 +0200
Subject: [PATCH 05/16] merkaartor: rebuild against libgdal-3.2.3 and
proj-7.2.1
---
srcpkgs/merkaartor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template
index 17c8d5dc361d..72c59006e968 100644
--- a/srcpkgs/merkaartor/template
+++ b/srcpkgs/merkaartor/template
@@ -1,7 +1,7 @@
# Template file for 'merkaartor'
pkgname=merkaartor
version=0.18.4
-revision=2
+revision=3
build_style=qmake
configure_args="SYSTEM_QUAZIP=1 SYSTEM_QUAZIP_LDFLAGS=-lquazip5"
hostmakedepends="qt5-qmake libgdal-tools qt5-host-tools"
From 286a3769e51758cccfff98ac81749de3803896ea Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 29 Jun 2021 00:21:27 +0200
Subject: [PATCH 06/16] OpenOrienteering-Mapper: rebuild against libgdal-3.2.3
and proj-7.2.1
---
srcpkgs/OpenOrienteering-Mapper/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/OpenOrienteering-Mapper/template b/srcpkgs/OpenOrienteering-Mapper/template
index fd29a08e75b6..6a652a6a7b97 100644
--- a/srcpkgs/OpenOrienteering-Mapper/template
+++ b/srcpkgs/OpenOrienteering-Mapper/template
@@ -1,14 +1,15 @@
# Template file for 'OpenOrienteering-Mapper'
pkgname=OpenOrienteering-Mapper
version=0.9.5
-revision=1
+revision=2
wrksrc="mapper-${version}"
build_style=cmake
hostmakedepends="doxygen qt5-host-tools qt5-plugin-sqlite qt5-qmake qt5-tools"
makedepends="qt5-devel clipper-devel proj-devel zlib-devel libgdal-devel
qt5-tools-devel sqlite-devel cups-devel $(vopt_if location qt5-location-devel)
$(vopt_if sensors qt5-sensors-devel)
- qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds"
+ qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
+ tiff-devel libcurl-devel"
short_desc="Orienteering mapmaking program"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
@@ -18,3 +19,9 @@ checksum=619152ca01a370875c15e1930918ce961284ccbf5d2371c147d50caf5e5c2f00
build_options="location sensors"
build_options_default="location sensors"
+
+do_check() {
+ # sensors_t test fails on test runner
+ cd build
+ ctest -E 'sensors_t'
+}
From 8481510b57ff92b6ef8ecf3e145a0d5238b82961 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 29 Jun 2021 00:38:35 +0200
Subject: [PATCH 07/16] osg: rebuild against libgdal-3.2.3, fix license
---
srcpkgs/osg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template
index 08bf6d4b6591..f51535c5719d 100644
--- a/srcpkgs/osg/template
+++ b/srcpkgs/osg/template
@@ -2,7 +2,7 @@
pkgname=osg
reverts=3.6.0_1
version=3.4.1
-revision=12
+revision=13
wrksrc=OpenSceneGraph-OpenSceneGraph-${version}
build_style=cmake
build_helper="qemu"
@@ -19,7 +19,7 @@ makedepends="MesaLib-devel gtkglext-devel libcurl-devel giflib-devel librsvg-dev
depends="xrandr"
short_desc="OpenSceneGraph: high performance real-time graphics toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="OSGPL-2.0-or-later"
+license="custom:OpenSceneGraph-Public-License-0.0"
homepage="http://www.openscenegraph.org"
distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz"
checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5
From 087ce9e52e80ad7ced5b36a9f4ee8e1c00255891 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 29 Jun 2021 17:35:47 +0200
Subject: [PATCH 08/16] sumo: update to 1.9.2 / rebuild against libgdal-3.2.3
and proj-7.2.1
- Build TraaS.jar using Maven (fixes tests)
- Add Eigen3 dependency
---
common/shlibs | 2 ++
srcpkgs/sumo/template | 22 ++++++++++++++++------
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 636026690bc4..d8b858976343 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4021,3 +4021,5 @@ libgrass_dbmibase.7.8.so grass-7.8.5_1
libgrass_imagery.7.8.so grass-7.8.5_1
libkmlconvenience.so.1 libkml-1.3.0_1
mod_spatialite.so.7 libspatialite-5.0.0_1
+libsumocpp.so sumo-1.9.2_1
+libtracicpp.so sumo-1.9.2_1
diff --git a/srcpkgs/sumo/template b/srcpkgs/sumo/template
index 4c1eb6876a46..3c0eea9916aa 100644
--- a/srcpkgs/sumo/template
+++ b/srcpkgs/sumo/template
@@ -1,18 +1,28 @@
# Template file for 'sumo'
pkgname=sumo
-version=1.5.0
-revision=3
+version=1.9.2
+revision=1
build_style=cmake
-python_version=3
-hostmakedepends="libgdal-tools pkg-config swig python3-setuptools"
-makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel libxerces-c-devel osg-devel proj-devel"
+hostmakedepends="libgdal-tools pkg-config swig python3-setuptools
+ apache-maven openjdk11 git"
+makedepends="python3-devel ffmpeg-devel fox-devel gl2ps-devel libgdal-devel
+ libxerces-c-devel osg-devel proj-devel eigen"
+checkdepends="gtest"
short_desc="SUMO (Simulation of Urban MObility) and included applications"
maintainer="Warrior Graph <marques@larces.uece.br>"
license="EPL-2.0"
homepage="https://sumo.dlr.de"
distfiles="https://sumo.dlr.de/releases/${version}/sumo-src-${version}.tar.gz"
-checksum=dcf5339fdda0659fa44fcfd69fe3f4e03009aa9a59849624f2a3cfe72eda9f8e
+checksum=193a8ab14bb305d3967625d76cd291f5c55bb906817465f2a12c2e69f4b80813
+python_version=3
+
+pre_build() {
+ cd tools/contributed/traas
+ mvn package
+ mv target/traas*.jar ${wrksrc}/bin/TraaS.jar
+}
post_install() {
rm -f ${DESTDIR}/usr/share/sumo/tools/libsumo/*.so
+ rm -f ${DESTDIR}/usr/share/sumo/tools/libtraci/_libtraci.so
}
From 9151f6383f78e808bb3be10a38e66414baf96189 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 29 Jun 2021 18:43:05 +0200
Subject: [PATCH 09/16] vtk: rebuild against proj-7.2.1
---
srcpkgs/vtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vtk/template b/srcpkgs/vtk/template
index 4c1710087f83..8811247ae7e5 100644
--- a/srcpkgs/vtk/template
+++ b/srcpkgs/vtk/template
@@ -1,7 +1,7 @@
# Template file for 'vtk'
pkgname=vtk
version=9.0.1
-revision=5
+revision=6
wrksrc=VTK-${version}
build_style=cmake
# vtk can be huge, especially with -DVTK_BUILD_ALL_MODULES=ON"
From 5640f16ddc485ad41256c83bbf5cf3c691b73f3f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 29 Jun 2021 19:24:43 +0200
Subject: [PATCH 10/16] osm2pgsql: rebuild against proj-7.2.1
---
srcpkgs/osm2pgsql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 9698f63059b6..d9df40f1ffe5 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.5.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="boost python3 python3-psycopg2"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
From d446a107df75ebf948bc9d257c4e860a141b7abf Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 29 Jun 2021 19:26:57 +0200
Subject: [PATCH 11/16] XyGrib: rebuild against proj-7.2.1
Do not use ninja ("unknown target" error)
---
srcpkgs/XyGrib/template | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/XyGrib/template b/srcpkgs/XyGrib/template
index e4aa3a2e0265..995ec3eeeabb 100644
--- a/srcpkgs/XyGrib/template
+++ b/srcpkgs/XyGrib/template
@@ -1,8 +1,9 @@
# Template file for 'XyGrib'
pkgname=XyGrib
version=1.2.6.1
-revision=3
+revision=4
build_style=cmake
+make_cmd=make
hostmakedepends="qt5-devel pkg-config"
makedepends="jasper-devel libnova-devel nettle-devel proj-devel qt5-devel
qwt-devel libopenjpeg2-devel"
@@ -13,6 +14,8 @@ homepage="https://opengribs.org/"
distfiles="https://github.com/opengribs/XyGrib/archive/v${version}.tar.gz"
checksum=2dc6099293ae6f7a4bfbfc0cab590cf7ad48241d608e6d7a76e35961b9fc2157
+export CMAKE_GENERATOR="Unix Makefiles"
+
if [ "$CROSS_BUILD" ]; then
make_build_args="LINK=${XBPS_CROSS_TRIPLET}-c++"
fi
From b8860684ef53dd2e48db4c39eac30a1e750edea2 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Tue, 29 Jun 2021 21:53:09 +0200
Subject: [PATCH 12/16] paraview: rebuild against libgdal-3.2.3
---
.../paraview/patches/cmake-build-type-none.patch | 16 ++++++++++++++++
srcpkgs/paraview/template | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/paraview/patches/cmake-build-type-none.patch
diff --git a/srcpkgs/paraview/patches/cmake-build-type-none.patch b/srcpkgs/paraview/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..53dfb4edba77
--- /dev/null
+++ b/srcpkgs/paraview/patches/cmake-build-type-none.patch
@@ -0,0 +1,16 @@
+Required to keep using build type None and not override debug flags etc.
+
+--- a/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt
++++ b/VTK/ThirdParty/eigen/vtkeigen/CMakeLists.txt
+@@ -22,11 +22,6 @@ if (NOT CMAKE_BUILD_TYPE)
+ endif()
+
+ string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_tolower)
+-if( NOT cmake_build_type_tolower STREQUAL "debug"
+- AND NOT cmake_build_type_tolower STREQUAL "release"
+- AND NOT cmake_build_type_tolower STREQUAL "relwithdebinfo")
+- message(FATAL_ERROR "Unknown build type \"${CMAKE_BUILD_TYPE}\". Allowed values are Debug, Release, RelWithDebInfo (case-insensitive).")
+-endif()
+
+
+ #############################################################################
diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template
index 20a7f5589677..49ad9e48c2c0 100644
--- a/srcpkgs/paraview/template
+++ b/srcpkgs/paraview/template
@@ -1,7 +1,7 @@
# Template file for 'paraview'
pkgname=paraview
version=5.8.1
-revision=3
+revision=4
wrksrc=ParaView-v${version}
build_style=cmake
configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
From e780178ad83fe7b05f759c2226411592031474ec Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Tue, 8 Dec 2020 15:33:58 +0100
Subject: [PATCH 13/16] grass: update to 7.8.5.
---
srcpkgs/grass/patches/fix-config.patch | 18 +++++
srcpkgs/grass/patches/musl-build-fix.patch | 12 ++++
srcpkgs/grass/template | 81 ++++++++++++++++------
3 files changed, 90 insertions(+), 21 deletions(-)
create mode 100644 srcpkgs/grass/patches/fix-config.patch
create mode 100644 srcpkgs/grass/patches/musl-build-fix.patch
diff --git a/srcpkgs/grass/patches/fix-config.patch b/srcpkgs/grass/patches/fix-config.patch
new file mode 100644
index 000000000000..28682209c610
--- /dev/null
+++ b/srcpkgs/grass/patches/fix-config.patch
@@ -0,0 +1,18 @@
+--- a/grass.pc.in 2021-05-02 16:45:31.080611475 +0200
++++ b/grass.pc.in 2021-05-02 16:47:26.898147110 +0200
+@@ -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
+-includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
++libdir=/usr/lib/grass-@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@/lib
++includedir=/usr/lib/grass-@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@/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
+-Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
++Libs: -L/usr/lib/grass-@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
++Cflags: -I/usr/lib/grass-@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@/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..2c4bb7e0f412
--- /dev/null
+++ b/srcpkgs/grass/patches/musl-build-fix.patch
@@ -0,0 +1,12 @@
+error: unknown type name 'int64_t' patch for musl
+
+--- a/include/gis.h 2020-10-05 08:39:31.000000000 +0200
++++ b/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..45b3087ba034 100644
--- a/srcpkgs/grass/template
+++ b/srcpkgs/grass/template
@@ -1,30 +1,69 @@
# Template file for 'grass'
pkgname=grass
-version=7.6.1
-revision=4
-_binver=${version//./}
-_binver=${_binver:0:2}
+version=7.8.5
+revision=1
+_binver=${version%.*}
+_binver=${_binver//./}
build_style=gnu-configure
-configure_args="--prefix=\${DESTDIR}/usr/share --bindir=\${DESTDIR}/usr/bin
- --with-freetype-includes=${XBPS_CROSS_BASE}/usr/include/freetype2"
-hostmakedepends="flex libgdal-tools pkg-config python-numpy tar"
-makedepends="proj-devel tiff-devel libgdal-devel sqlite-devel
- fftw-devel cairo-devel glu-devel wxPython-devel"
-depends="python-numpy wxPython"
-short_desc="Geographic Resources Analysis Support System - GIS"
-maintainer="Alex Jarosch <research@alexj.at>"
+configure_args="--prefix=\${DESTDIR}/usr/lib --bindir=\${DESTDIR}/usr/bin
+ --with-regex --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 python3-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="python3-numpy wxPython4 libgdal>=3.2.0_1"
+short_desc="Geographic Resources Analysis Support System"
+maintainer="Orphaned <orphan@voidlinux.org>"
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"
+build_options="geos mysql nls pthread postgres"
+build_options_default="pthread"
+
+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"
+
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}\";"
+ # remove $DESTDIR in paths
+ vsed -i -e "s|${DESTDIR}||" \
+ ${DESTDIR}/usr/bin/grass${_binver} \
+ ${DESTDIR}/usr/lib/grass78/etc/fontcap \
+ ${DESTDIR}/usr/lib/grass78/demolocation/.grassrc78 \
+ ${DESTDIR}/usr/lib/grass78/include/Make/Platform.make \
+ ${DESTDIR}/usr/lib/grass78/include/Make/Grass.make
+
+ # 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
+
+ # install .pc file
+ vinstall grass.pc 644 usr/share/pkgconfig
+
+ # desktop entry
+ vinstall gui/icons/grass.desktop 644 usr/share/applications
+
+ # icons
+ local icon res
+ for icon in gui/icons/grass-[0-9]*x[0-9]*.png; do
+ res=$(echo $icon |sed -E -e 's|.*-([0-9]+x[0-9]+).png|\1|')
+ vinstall $icon 0644 /usr/share/icons/hicolor/$res/apps grass.png
+ done
}
From e59eb4447442e36fb44bf259e8d82726288f7c9c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 9 Aug 2021 19:53:17 +0200
Subject: [PATCH 14/16] wxPython4: backport wxPseudoDC patch, and fix tests
---
.../patches/restore-gil-pseudodc.patch | 52 +++++++++++++++++++
srcpkgs/wxPython4/template | 3 +-
2 files changed, 54 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/wxPython4/patches/restore-gil-pseudodc.patch
diff --git a/srcpkgs/wxPython4/patches/restore-gil-pseudodc.patch b/srcpkgs/wxPython4/patches/restore-gil-pseudodc.patch
new file mode 100644
index 000000000000..6f21ecb7a718
--- /dev/null
+++ b/srcpkgs/wxPython4/patches/restore-gil-pseudodc.patch
@@ -0,0 +1,52 @@
+Backport https://github.com/wxWidgets/Phoenix/pull/1849
+Regarding segfault as in https://github.com/OSGeo/grass/issues/1123
+
+From 5cace47aaece3cc4f2e6ea97d7fd5bb8ed316ac9 Mon Sep 17 00:00:00 2001
+From: Robin Dunn <robin@alldunn.com>
+Date: Wed, 18 Nov 2020 10:52:53 -0800
+Subject: [PATCH] Restore GIL acquisition in wxPseudoDC::FindObjects*
+
+---
+ src/pseudodc.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/pseudodc.cpp b/src/pseudodc.cpp
+index 5890ed7e2..ed4bcd06a 100644
+--- a/src/pseudodc.cpp
++++ b/src/pseudodc.cpp
+@@ -483,7 +483,7 @@ bool wxPseudoDC::GetIdGreyedOut(int id)
+ // ----------------------------------------------------------------------------
+ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
+ {
+- //wxPyBlock_t blocked = wxPyBeginBlockThreads();
++ wxPyThreadBlocker blocker;
+ pdcObjectList::compatibility_iterator pt = m_objectlist.GetFirst();
+ pdcObject *obj;
+ PyObject* pyList = NULL;
+@@ -501,7 +501,6 @@ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
+ }
+ pt = pt->GetNext();
+ }
+- //wxPyEndBlockThreads(blocked);
+ return pyList;
+ }
+
+@@ -511,7 +510,7 @@ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
+ PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
+ wxCoord radius, const wxColor& bg)
+ {
+- //wxPyBlock_t blocked = wxPyBeginBlockThreads();
++ wxPyThreadBlocker blocker;
+ pdcObjectList::compatibility_iterator pt = m_objectlist.GetFirst();
+ pdcObject *obj;
+ PyObject* pyList = NULL;
+@@ -611,8 +610,7 @@ PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
+ maskdc.SelectObject(wxNullBitmap);
+ memdc.SelectObject(wxNullBitmap);
+ }
+- //wxPyEndBlockThreads(blocked);
+- return pyList;
++ return pyList;
+ }
+
+ // ----------------------------------------------------------------------------
diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template
index 1f32be9131ce..a639bad31380 100644
--- a/srcpkgs/wxPython4/template
+++ b/srcpkgs/wxPython4/template
@@ -1,7 +1,7 @@
# Template file for 'wxPython4'
pkgname=wxPython4
version=4.0.7
-revision=3
+revision=4
wrksrc="wxPython-${version}"
build_style=python3-module
make_build_args="--skip-build"
@@ -10,6 +10,7 @@ hostmakedepends="pkg-config python3-setuptools python3-pathlib2"
makedepends="python3-devel wxWidgets-gtk3-devel SDL2-devel webkit2gtk-devel
gst-plugins-base1-devel"
depends="python3 python3-six python3-numpy python3-Pillow"
+checkdepends="python3-six python3-numpy python3-Pillow"
short_desc="WxWidgets GUI toolkit library (Python3 Bindings)"
maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="custom:wxWindows"
From c881641efd90ef94b19db990c967e434cbdcd81b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Wed, 11 Aug 2021 23:55:07 +0200
Subject: [PATCH 15/16] wxPython: backport wxPseudoDC patch
---
.../patches/restore-gil-pseudodc.patch | 41 +++++++++++++++++++
srcpkgs/wxPython/template | 8 ++--
2 files changed, 45 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/wxPython/patches/restore-gil-pseudodc.patch
diff --git a/srcpkgs/wxPython/patches/restore-gil-pseudodc.patch b/srcpkgs/wxPython/patches/restore-gil-pseudodc.patch
new file mode 100644
index 000000000000..4ab4387ab906
--- /dev/null
+++ b/srcpkgs/wxPython/patches/restore-gil-pseudodc.patch
@@ -0,0 +1,41 @@
+Backport https://github.com/wxWidgets/Phoenix/pull/1849
+due to segfault as in https://github.com/OSGeo/grass/issues/1123
+
+diff --git a/wxPython/src/pseudodc.cpp b/wxPython/src/pseudodc.cpp
+index 50374f5..5d4fdbc 100644
+--- a/wxPython/src/pseudodc.cpp
++++ b/wxPython/src/pseudodc.cpp
+@@ -447,7 +447,7 @@ bool wxPseudoDC::GetIdGreyedOut(int id)
+ // ----------------------------------------------------------------------------
+ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
+ {
+- //wxPyBlock_t blocked = wxPyBeginBlockThreads();
++ wxPyThreadBlocker blocker;
+ pdcObjectList::compatibility_iterator pt = m_objectlist.GetFirst();
+ pdcObject *obj;
+ PyObject* pyList = NULL;
+@@ -465,7 +465,6 @@ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
+ }
+ pt = pt->GetNext();
+ }
+- //wxPyEndBlockThreads(blocked);
+ return pyList;
+ }
+
+@@ -475,7 +474,7 @@ PyObject *wxPseudoDC::FindObjectsByBBox(wxCoord x, wxCoord y)
+ PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
+ wxCoord radius, const wxColor& bg)
+ {
+- //wxPyBlock_t blocked = wxPyBeginBlockThreads();
++ wxPyThreadBlocker blocker;
+ pdcObjectList::compatibility_iterator pt = m_objectlist.GetFirst();
+ pdcObject *obj;
+ PyObject* pyList = NULL;
+@@ -575,7 +574,6 @@ PyObject *wxPseudoDC::FindObjects(wxCoord x, wxCoord y,
+ maskdc.SelectObject(wxNullBitmap);
+ memdc.SelectObject(wxNullBitmap);
+ }
+- //wxPyEndBlockThreads(blocked);
+ return pyList;
+ }
+
diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template
index ffbee38c50cd..5fc20e9d8b9d 100644
--- a/srcpkgs/wxPython/template
+++ b/srcpkgs/wxPython/template
@@ -8,12 +8,12 @@ makedepends="
zlib-devel libpng-devel libjpeg-turbo-devel tiff-devel expat-devel gtk+-devel
libSM-devel MesaLib-devel glu-devel
libnotify-devel python-devel wxWidgets-devel"
+# pycompile_module="wx-3.0-gtk2 wxversion.py"
depends="python"
-pycompile_module="wx-3.0-gtk2 wxversion.py"
-short_desc="The wxWidgets GUI toolkit library (Python Bindings)"
+short_desc="WxWidgets GUI toolkit library (Python Bindings)"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://www.wxpython.org/"
-license="wxWindows"
+license="custom:wxWindows"
+homepage="https://www.wxpython.org/"
distfiles="${SOURCEFORGE_SITE}/wxpython/${pkgname}-src-${version}.tar.bz2"
checksum=d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61
From 20379fca4b4ab8dcadaa9d0636eac98cc2d789b6 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 16 Aug 2021 21:49:01 +0200
Subject: [PATCH 16/16] dbeaver: update to 21.1.5.
---
srcpkgs/dbeaver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b5ae64ae7d74..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
# Template file for 'dbeaver'
pkgname=dbeaver
-version=21.1.4
+version=21.1.5
revision=1
# the build downloads binaries linked to glibc
archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="Apache-2.0"
homepage="https://dbeaver.io"
distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
nopie=true
do_build() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] DBeaver: update to 21.1.5
2021-08-16 19:50 [PR PATCH] DBeaver: update to 21.1.5 ar-jan
@ 2021-08-16 19:55 ` ar-jan
2021-08-18 2:12 ` [PR PATCH] [Merged]: " abenson
1 sibling, 0 replies; 3+ messages in thread
From: ar-jan @ 2021-08-16 19:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages dbeaver2115
https://github.com/void-linux/void-packages/pull/32518
DBeaver: update to 21.1.5
<!-- 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?
- [x] 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/32518.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dbeaver2115-32518.patch --]
[-- Type: text/x-diff, Size: 998 bytes --]
From 4e8fd24e478b566a0c4d0273f722376b4e7d6f11 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 16 Aug 2021 21:49:01 +0200
Subject: [PATCH] dbeaver: update to 21.1.5.
---
srcpkgs/dbeaver/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template
index b5ae64ae7d74..37a21d96335b 100644
--- a/srcpkgs/dbeaver/template
+++ b/srcpkgs/dbeaver/template
@@ -1,6 +1,6 @@
# Template file for 'dbeaver'
pkgname=dbeaver
-version=21.1.4
+version=21.1.5
revision=1
# the build downloads binaries linked to glibc
archs="x86_64"
@@ -11,7 +11,7 @@ maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="Apache-2.0"
homepage="https://dbeaver.io"
distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz"
-checksum=45a984fd562d28b0712e25a0ccb5d0f927f8e411bffa54b5b49cd8c08e5490be
+checksum=429f366ee896fb21a1ef92b0ea8a9ec45d9d7d32f407b9191ecfab129d6520f1
nopie=true
do_build() {
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: DBeaver: update to 21.1.5
2021-08-16 19:50 [PR PATCH] DBeaver: update to 21.1.5 ar-jan
2021-08-16 19:55 ` [PR PATCH] [Updated] " ar-jan
@ 2021-08-18 2:12 ` abenson
1 sibling, 0 replies; 3+ messages in thread
From: abenson @ 2021-08-18 2:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]
There's a merged pull request on the void-packages repository
DBeaver: update to 21.1.5
https://github.com/void-linux/void-packages/pull/32518
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?
- [x] 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
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-18 2:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-16 19:50 [PR PATCH] DBeaver: update to 21.1.5 ar-jan
2021-08-16 19:55 ` [PR PATCH] [Updated] " ar-jan
2021-08-18 2:12 ` [PR PATCH] [Merged]: " abenson
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).