From ecd83eb7e7d2ae22d89c606a455110c1efb33b9a Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 19 Sep 2023 16:42:40 +0200 Subject: [PATCH 1/4] proj: update to 9.3.0. --- srcpkgs/proj/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/proj/template b/srcpkgs/proj/template index 0c5490970a47c..42a0e3e86b0d2 100644 --- a/srcpkgs/proj/template +++ b/srcpkgs/proj/template @@ -1,7 +1,7 @@ # Template file for 'proj' pkgname=proj -version=9.2.1 -revision=3 +version=9.3.0 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="python3" @@ -11,7 +11,7 @@ maintainer="John " license="MIT" homepage="https://proj.org" distfiles="https://download.osgeo.org/proj/proj-${version}.tar.gz" -checksum=15ebf4afa8744b9e6fccb5d571fc9f338dc3adcf99907d9e62d1af815d4971a1 +checksum=91a3695a004ea28db0448a34460bed4cc3b130e5c7d74339ec999efdab0e547d post_install() { vlicense COPYING @@ -24,5 +24,6 @@ proj-devel_package() { vmove usr/include vmove usr/lib/cmake vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig } } From 461c534032dee2322091999ffce9c4c5dfc47ecf Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 21:55:23 +0100 Subject: [PATCH 2/4] New package: libkml-1.3.0 --- srcpkgs/libkml/patches/NOUNCRYPT.patch | 17 +++++++++++++++++ srcpkgs/libkml/template | 16 ++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch create mode 100644 srcpkgs/libkml/template diff --git a/srcpkgs/libkml/patches/NOUNCRYPT.patch b/srcpkgs/libkml/patches/NOUNCRYPT.patch new file mode 100644 index 0000000000000..5b7e016c0e023 --- /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 //RR + #include "unzip.h" + #include "iomem_simple.h" +-#undef NOUNCRYPT ++#define NOUNCRYPT + + #ifdef STDC + # include diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template new file mode 100644 index 0000000000000..44d298a09a429 --- /dev/null +++ b/srcpkgs/libkml/template @@ -0,0 +1,16 @@ +# Template file for 'libkml' +pkgname=libkml +version=1.3.0 +revision=1 +build_style=cmake +makedepends="boost-devel expat-devel minizip-devel uriparser-devel zlib-devel" +short_desc="Library to manipulate KML OGC files" +maintainer="Arjan Mossel " +license="BSD-3-Clause" +homepage="https://github.com/libkml/libkml" +distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz" +checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963 + +post_install() { + vlicense LICENSE +} From b02d816abee1b834220c8a8f6b0934b75d9e2708 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sun, 6 Nov 2022 12:24:57 +0100 Subject: [PATCH 3/4] common/shlibs: add libspatialindex.so.6 for QGIS --- common/shlibs | 1 + 1 file changed, 1 insertion(+) diff --git a/common/shlibs b/common/shlibs index e4cded8484762..0b898a6cca026 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4070,6 +4070,7 @@ libawt_xawt.so openjdk17-jre-17.0.1+12_1 libjava.so openjdk17-jre-17.0.1+12_1 libjli.so openjdk17-jre-17.0.1+12_1 libjvm.so openjdk17-jre-17.0.1+12_1 +libspatialindex.so.6 libspatialindex-1.9.3_1 librttopo.so.1 librttopo-1.1.0_1 libspatialite.so.7 libspatialite-5.0.1_1 mod_spatialite.so.7 libspatialite-5.0.1_1 From 81624ba08eece528e66614b61634410c2351ebd0 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Sat, 5 Nov 2022 20:02:59 +0100 Subject: [PATCH 4/4] New package: qgis-3.32.3 --- srcpkgs/qgis/template | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 srcpkgs/qgis/template diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template new file mode 100644 index 0000000000000..c33d2e4aacb61 --- /dev/null +++ b/srcpkgs/qgis/template @@ -0,0 +1,38 @@ +# Template file for 'qgis' +pkgname=qgis +version=3.32.3 +revision=1 +archs="x86_64* i686" +build_style=cmake +configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=False + -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass" +hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip" +makedepends="exiv2-devel expat-devel geos-devel gsl-devel grass-devel + hdf5-devel libgdal-devel libspatialindex-devel libspatialite-devel + libxml2-devel libzip-devel netcdf-devel ocl-icd-devel opencl-clhpp + postgresql-libs-devel proj-devel protobuf-devel python3-devel + python3-PyQt-builder python3-PyQt5-devel python3-PyQt5-devel-tools + python3-PyQt5-multimedia python3-pyqt5-qsci-devel python3-PyQt5-webkit + python3-sip-PyQt5 qca-qt5-devel qca-qt5-ossl qscintilla-qt5-devel qt5-3d-devel + qt5-declarative-devel qt5-devel qt5-gamepad-devel qt5-location-devel + qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql + qt5-plugin-sqlite qt5-plugin-tds qt5-serialport-devel qt5-webkit-devel + qtkeychain-qt5-devel qwt-devel sqlite-devel" +depends="libgdal-python3 libspatialite-devel python3-dateutil python3-dateutil + python3-Jinja2 python3-numpy python3-numpy python3-owslib python3-Pillow + python3-psycopg2 python3-Pygments python3-PyQt5 python3-PyQt5-location + python3-pyqt5-qsci python3-PyQt5-sql python3-PyQt5-svg python3-pytz + python3-requests python3-requests python3-urllib3 python3-yaml qca-qt5-ossl + qt5-plugin-sqlite" +short_desc="QGIS - A Free and Open Source Geographic Information System" +maintainer="Arjan Mossel " +license="GPL-2.0-only" +homepage="https://qgis.org" +distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz" +checksum=3a84eece787d04468229dede2dfdacaad7be8b47e8c6469e5621cddf1a297639 + +post_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/ +}