* [PR PATCH] Qgis
@ 2023-01-22 21:21 ar-jan
2023-01-28 20:33 ` [PR PATCH] [Updated] New package: qgis-3.28.2 ar-jan
` (82 more replies)
0 siblings, 83 replies; 84+ messages in thread
From: ar-jan @ 2023-01-22 21:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1243 bytes --]
There is a new pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
Qgis
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14563 bytes --]
From 7a24f1bc062b05b59cd813505a171bca219985a5 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 9b11e370e1a9aeafc2f4ccf927cf13bb1d117247 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 39 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 62 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..27ca229fced3
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From aeaba3a1d0b366bef0b4c1d1910e69c4aa31aeb8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 79c3592d6642944bc92f37c73434e0e03916274e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 5845b00d034d..3e32f4c9ab3c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4115,6 +4115,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 4d8b4de38d0330bc28ff8533f79dc859e42b73bc Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.2
---
srcpkgs/qgis/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..1d0ef4f55b3e
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.2
+revision=1
+archs="x86_64* i686*"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=8dcc8604addaee7ee5447c08e4c5d25d088a73ef7ae03d6cbba95c43af877fa7
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: qgis-3.28.2
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
@ 2023-01-28 20:33 ` ar-jan
2023-01-28 20:34 ` ar-jan
` (81 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-01-28 20:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: qgis-3.28.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14563 bytes --]
From b1a19e46737aa50b6e1245622b929abd0627ebc8 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 63513c3b9280660207a05668ff0376d46e7e947c 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 39 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 62 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..27ca229fced3
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From db742ab168886a848dd0ca9fae0d3aad8d2e4618 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 1ec0a3357801dfba9c3bca70bd103bd732faff23 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 f632ce9c76da..f8485b04a13d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4114,6 +4114,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 acb6c373ee1f228e55fb51f89a9f2388980a19c3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.2
---
srcpkgs/qgis/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..1d0ef4f55b3e
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.2
+revision=1
+archs="x86_64* i686*"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=8dcc8604addaee7ee5447c08e4c5d25d088a73ef7ae03d6cbba95c43af877fa7
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: qgis-3.28.2
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
2023-01-28 20:33 ` [PR PATCH] [Updated] New package: qgis-3.28.2 ar-jan
@ 2023-01-28 20:34 ` ar-jan
2023-01-28 20:43 ` ar-jan
` (80 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-01-28 20:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: qgis-3.28.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14563 bytes --]
From b1a19e46737aa50b6e1245622b929abd0627ebc8 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 63513c3b9280660207a05668ff0376d46e7e947c 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 39 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 62 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..27ca229fced3
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From db742ab168886a848dd0ca9fae0d3aad8d2e4618 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 1ec0a3357801dfba9c3bca70bd103bd732faff23 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 f632ce9c76da..f8485b04a13d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4114,6 +4114,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 60ccf5ed177d477c6cac71e3134d728145571593 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.3
---
srcpkgs/qgis/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..5559812f54c7
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.3
+revision=1
+archs="x86_64* i686*"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=24f6e0cbc35c366099a6ac65b803ee2abf9deb1718dc792d07f1f3dcf30d5d9c
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: qgis-3.28.2
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
2023-01-28 20:33 ` [PR PATCH] [Updated] New package: qgis-3.28.2 ar-jan
2023-01-28 20:34 ` ar-jan
@ 2023-01-28 20:43 ` ar-jan
2023-01-28 22:28 ` [PR PATCH] [Updated] New package: qgis-3.28.3 ar-jan
` (79 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-01-28 20:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: qgis-3.28.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14564 bytes --]
From b1a19e46737aa50b6e1245622b929abd0627ebc8 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 63513c3b9280660207a05668ff0376d46e7e947c 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 39 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 62 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..27ca229fced3
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,39 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From db742ab168886a848dd0ca9fae0d3aad8d2e4618 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 1ec0a3357801dfba9c3bca70bd103bd732faff23 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 f632ce9c76da..f8485b04a13d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4114,6 +4114,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 40db50fef4b89103ac3e3d22789040980a793817 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.3
---
srcpkgs/qgis/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..fdf808b3dc0e
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.3
+revision=1
+archs="~aarch64 ~arm*"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=24f6e0cbc35c366099a6ac65b803ee2abf9deb1718dc792d07f1f3dcf30d5d9c
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: qgis-3.28.3
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (2 preceding siblings ...)
2023-01-28 20:43 ` ar-jan
@ 2023-01-28 22:28 ` ar-jan
2023-04-18 19:47 ` ar-jan
` (78 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-01-28 22:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: qgis-3.28.3
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14626 bytes --]
From b1a19e46737aa50b6e1245622b929abd0627ebc8 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 3f9a9c8c984d8d79e1705ff38b8ada3d2303daac 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 40 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 63 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..d8002e11cf62
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+archs="x86_64* i686" # TODO: Fix the sip-build for aarch64/arm
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 6a61db969a15ef44a34b9111bd66460022fa87ee Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 f2a8f44989f79f672dac5038906dfc76a4b82af5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 f632ce9c76da..f8485b04a13d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4114,6 +4114,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 b883766c85513fdf3f2b9f84f1fb3efb2a6a487a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.3
---
srcpkgs/qgis/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..2eedfeca3709
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.3
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=24f6e0cbc35c366099a6ac65b803ee2abf9deb1718dc792d07f1f3dcf30d5d9c
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: qgis-3.28.3
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (3 preceding siblings ...)
2023-01-28 22:28 ` [PR PATCH] [Updated] New package: qgis-3.28.3 ar-jan
@ 2023-04-18 19:47 ` ar-jan
2023-04-18 19:59 ` [PR PATCH] [Updated] New package: QGIS ar-jan
` (77 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-04-18 19:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1268 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: qgis-3.28.3
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14626 bytes --]
From a92e00ea4de7076b4390aa0c05b919b3d990951f 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From a008cef3145469c431c4e17c9d60a145309fa537 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 40 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 63 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..d8002e11cf62
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+archs="x86_64* i686" # TODO: Fix the sip-build for aarch64/arm
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From ea010e3f8f28be3c686a1606409b70276b6a0cc8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 7518ccbc8f4497dbfc12785beaec2fcbef6d0657 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 0b05cd99d6b3..e3688789c6d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4130,6 +4130,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 d49bdf2d58994deef25be3b213c34164fe68fcce Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.5
---
srcpkgs/qgis/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..bcd401499974
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.5
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=7f05aaf400c84cb798bd56166d30db4d693e4e5229550acc0a802383e936a016
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (4 preceding siblings ...)
2023-04-18 19:47 ` ar-jan
@ 2023-04-18 19:59 ` ar-jan
2023-04-29 15:26 ` ar-jan
` (76 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-04-18 19:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14626 bytes --]
From a92e00ea4de7076b4390aa0c05b919b3d990951f 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From a008cef3145469c431c4e17c9d60a145309fa537 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 40 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 63 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..d8002e11cf62
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+archs="x86_64* i686" # TODO: Fix the sip-build for aarch64/arm
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From ea010e3f8f28be3c686a1606409b70276b6a0cc8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 7518ccbc8f4497dbfc12785beaec2fcbef6d0657 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 0b05cd99d6b3..e3688789c6d0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4130,6 +4130,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 bab97fe692c5dddda80b6a55c1a95546c6f688f3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.5
---
srcpkgs/qgis/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..bcd401499974
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.5
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=7f05aaf400c84cb798bd56166d30db4d693e4e5229550acc0a802383e936a016
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (5 preceding siblings ...)
2023-04-18 19:59 ` [PR PATCH] [Updated] New package: QGIS ar-jan
@ 2023-04-29 15:26 ` ar-jan
2023-04-29 15:29 ` ar-jan
` (75 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-04-29 15:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14626 bytes --]
From 08e24b8c08b3c4b15eb5d9738c2409de1bb3c121 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 6509d0d516db1e4b13acf80e2c6475777e93d3d9 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 40 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 63 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..d8002e11cf62
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+archs="x86_64* i686" # TODO: Fix the sip-build for aarch64/arm
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 88372dbf74121da5904c718bb360cdec27940964 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 2603aab290e3310abf17707c3ab40ec2b27583c4 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 e282bbd1f588..684951bf38b6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4138,6 +4138,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 98fefcf69e8de9ae4c5c75c16471b778de3f6890 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.6
---
srcpkgs/qgis/template | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..ab9dee3bdef2
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,36 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.6
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=d4696b1bec2a234d4a67c1a8fb3ed0bc349c3c8d7594860516cf71a95a2b91bf
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (6 preceding siblings ...)
2023-04-29 15:26 ` ar-jan
@ 2023-04-29 15:29 ` ar-jan
2023-04-29 15:30 ` ar-jan
` (74 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-04-29 15:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1528812943
Comment:
Keeping this on the [LTS branch](https://qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule) for now. If/when the qscintilla PR is merged and this could get in, ideally I'd like to have both `qgis` and `qgis-lts` packages.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (7 preceding siblings ...)
2023-04-29 15:29 ` ar-jan
@ 2023-04-29 15:30 ` ar-jan
2023-05-12 23:46 ` cinerion
` (73 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-04-29 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1528812943
Comment:
Updated to 3.28.6. Keeping this on the [LTS branch](https://qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule) for now. If/when the qscintilla PR is merged and this could get in, ideally I'd like to have both `qgis` and `qgis-lts` packages.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (8 preceding siblings ...)
2023-04-29 15:30 ` ar-jan
@ 2023-05-12 23:46 ` cinerion
2023-05-13 7:42 ` ar-jan
` (72 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: cinerion @ 2023-05-12 23:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
New comment by cinerion on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1546440024
Comment:
Tested the package in my PC, it works properly, except for one missing runtime dependency, `python3-PyQt5-location`. Once i installed it i had no issues.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (9 preceding siblings ...)
2023-05-12 23:46 ` cinerion
@ 2023-05-13 7:42 ` ar-jan
2023-06-20 8:22 ` ar-jan
` (71 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-05-13 7:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1546587871
Comment:
Good to know, I'll add it with a next version bump.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (10 preceding siblings ...)
2023-05-13 7:42 ` ar-jan
@ 2023-06-20 8:22 ` ar-jan
2023-06-24 13:10 ` [PR PATCH] [Updated] " ar-jan
` (70 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-06-20 8:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1528812943
Comment:
Updated to 3.28.6. Keeping this on the [LTR branch](https://qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule) for now. If/when the qscintilla PR is merged and this could get in, ideally I'd like to have both `qgis` and `qgis-lts` packages.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (11 preceding siblings ...)
2023-06-20 8:22 ` ar-jan
@ 2023-06-24 13:10 ` ar-jan
2023-06-24 13:11 ` ar-jan
` (69 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-06-24 13:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14652 bytes --]
From cdfe3c8d7e0fdf5d5571c44d6e6cf7bf39aaecd1 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a863..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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898f..55eb29df3b0e 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b260..8ddafc0f70ad 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 526d7a6a8f0b2ee39e018c2fb6eeded99d7e1213 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 40 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 63 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 000000000000..2ded1bc41fb7
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 000000000000..e69b09225d0b
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 000000000000..d8002e11cf62
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+archs="x86_64* i686" # TODO: Fix the sip-build for aarch64/arm
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 000000000000..8ddafc0f70ad
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 45bfa024e75ae7c76e6fd8380520789da822c625 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 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..44d298a09a42
--- /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 <arjanmossel@gmail.com>"
+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 4920a6b8746457dc078c7776ac9d8fb083b17bb9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 7bc98cc1b474..c538dd942339 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4130,6 +4130,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 86a256bdf011a60049445c6b797c51c0c1fc243b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.8
---
srcpkgs/qgis/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 000000000000..04af0e54432b
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,37 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.8
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=3230f1ec6ecf8bf58c008645a9faf4f6e50ff88c14a11c4486ce94def8d55ed6
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (12 preceding siblings ...)
2023-06-24 13:10 ` [PR PATCH] [Updated] " ar-jan
@ 2023-06-24 13:11 ` ar-jan
2023-07-23 8:22 ` [PR PATCH] [Updated] " ar-jan
` (68 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-06-24 13:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1605481538
Comment:
Updated to 3.28.8.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (13 preceding siblings ...)
2023-06-24 13:11 ` ar-jan
@ 2023-07-23 8:22 ` ar-jan
2023-07-23 8:22 ` ar-jan
` (67 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-23 8:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 14674 bytes --]
From 7c09afbdfff90958e5ed8689e807b6aaee63d23b 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: Wed, 2 Jun 2021 14:28:41 +0700
Subject: [PATCH 1/5] qscintilla-qt5: update to 2.12.1.
---
.../patches/configure.py-objdir-support.patch | 42 ---------------
srcpkgs/qscintilla-qt5/template | 51 +++++++++++++++++--
srcpkgs/qscintilla-qt5/update | 3 +-
3 files changed, 47 insertions(+), 49 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 774e4eb5a8637..0000000000000
--- 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
-===================================================================
---- a/Python/configure.py 2014-07-05 10:02:02.318834374 -0400
-+++ b/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 1700d195898fc..55eb29df3b0ea 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -1,17 +1,58 @@
# Template file for 'qscintilla-qt5'
+# XXX keep in sync with python3-pyqt5-qscintilla
pkgname=qscintilla-qt5
-version=2.11.2
+version=2.12.1
revision=1
-build_wrksrc=Qt4Qt5
+build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
-makedepends="qt5-devel"
+makedepends="qt5-devel qt5-tools-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"
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=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+
+post_configure() {
+ local _qt_arch
+ local qmake_args
+ if [ "$CROSS_BUILD" ]; then
+ case $XBPS_TARGET_MACHINE in
+ i686*) _qt_arch=i386;;
+ x86_64*) _qt_arch=x86_64;;
+ aarch64*) _qt_arch=arm64;;
+ arm*) _qt_arch=arm;;
+ mips*) _qt_arch=mips;;
+ ppc64*) _qt_arch=power64;;
+ ppc*) _qt_arch=power;;
+ esac
+ qmake_args="-qtconf ${wrksrc}/qt.conf
+ PKG_CONFIG_EXECUTABLE=${XBPS_WRAPPERDIR}/${PKG_CONFIG}"
+ fi
+ cd ../designer
+ /usr/lib/qt5/bin/qmake \
+ ${qmake_args} \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC=$CC QMAKE_CXX=$CXX \
+ QMAKE_LINK=$CXX QMAKE_LINK_C=$CC \
+ QMAKE_CFLAGS="${CFLAGS} -I$wrksrc/src" \
+ QMAKE_CXXFLAGS="${CXXFLAGS} -I$wrksrc/src" \
+ QMAKE_LFLAGS="${LDFLAGS}" \
+ ${_qt_arch:+"QT_TARGET_ARCH=$_qt_arch"} \
+ CONFIG+=no_qt_rpath
+}
+
+post_build() {
+ make -C ../designer ${makejobs} CC="$CC" CXX="$CXX" LINK="$CXX"
+}
+
+post_install() {
+ make -C ../designer STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} \
+ INSTALL_ROOT=${DESTDIR} install
+}
qscintilla-qt5-devel_package() {
short_desc+=" - development files"
diff --git a/srcpkgs/qscintilla-qt5/update b/srcpkgs/qscintilla-qt5/update
index 4c5ed097b2605..8ddafc0f70ad5 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[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 28521337dab1899862dbdb01bc0bc2f5ad76d54c 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: Sun, 6 Jun 2021 21:35:40 +0700
Subject: [PATCH 2/5] New package: python3-pyqt5-qsci-2.12.1
---
srcpkgs/python3-pyqt5-qsci-devel | 1 +
.../python3-pyqt5-qsci/patches/cross.patch | 20 ++++++++++
srcpkgs/python3-pyqt5-qsci/template | 40 +++++++++++++++++++
srcpkgs/python3-pyqt5-qsci/update | 2 +
4 files changed, 63 insertions(+)
create mode 120000 srcpkgs/python3-pyqt5-qsci-devel
create mode 100644 srcpkgs/python3-pyqt5-qsci/patches/cross.patch
create mode 100644 srcpkgs/python3-pyqt5-qsci/template
create mode 100644 srcpkgs/python3-pyqt5-qsci/update
diff --git a/srcpkgs/python3-pyqt5-qsci-devel b/srcpkgs/python3-pyqt5-qsci-devel
new file mode 120000
index 0000000000000..2ded1bc41fb7d
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci-devel
@@ -0,0 +1 @@
+python3-pyqt5-qsci
\ No newline at end of file
diff --git a/srcpkgs/python3-pyqt5-qsci/patches/cross.patch b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
new file mode 100644
index 0000000000000..e69b09225d0bd
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/patches/cross.patch
@@ -0,0 +1,20 @@
+Index: QScintilla_src-2.12.1/Python/project.py
+===================================================================
+--- QScintilla_src-2.12.1.orig/Python/project.py
++++ QScintilla_src-2.12.1/Python/project.py
+@@ -41,6 +41,15 @@ class QScintilla(PyQtProject):
+ # static or dynamic).
+ self.qsci_external_lib = not os.path.isdir('src')
+
++ def run_command(self, args, *, fatal=True):
++ """ Run a command and display the output if requested. """
++ qemu_machine = os.environ.get("XBPS_TARGET_QEMU_MACHINE")
++ builddir = os.environ.get("XBPS_BUILDDIR")
++ if qemu_machine and args[0].startswith(os.path.join(builddir, "QScintilla")):
++ qemu = "qemu-{}-static".format(qemu_machine)
++ args.insert(0, qemu)
++ super().run_command(args, fatal=fatal)
++
+ def apply_user_defaults(self, tool):
+ """ Set default values for user options that haven't been set yet. """
+
diff --git a/srcpkgs/python3-pyqt5-qsci/template b/srcpkgs/python3-pyqt5-qsci/template
new file mode 100644
index 0000000000000..d8002e11cf621
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/template
@@ -0,0 +1,40 @@
+# Template file for 'python3-pyqt5-qsci'
+# XXX Keep in sync with qscintilla-qt5
+# Splited because of circular dependencies
+# qscintilla-qt5 -> PyQt5 -> pyqt5-qsci
+pkgname=python3-pyqt5-qsci
+version=2.12.1
+revision=1
+archs="x86_64* i686" # TODO: Fix the sip-build for aarch64/arm
+build_wrksrc=Python
+build_style=sip-build
+build_helper=qemu
+hostmakedepends="qt5-qmake qt5-host-tools python3-PyQt5-devel
+ python3-PyQt-builder pkg-config"
+makedepends="qscintilla-qt5-devel python3-PyQt5-devel qt5-devel python3-devel"
+depends="python3-PyQt5"
+short_desc="Qt5 port of Scintilla editor - Python 3 binding"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
+distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_src-${version}.tar.gz"
+checksum=a7331c44b5d7320cbf58cb2382c38857e9e9f4fa52c405bd7776c8b6649836c2
+lib32disabled=yes
+
+CXXFLAGS="$(printf " -I$XBPS_CROSS_BASE/usr/include/qt5/%s" \
+ QtWidgets QtPrintSupport)"
+
+post_extract() {
+ rm -rf src
+ ln -sf pyproject-qt5.toml Python/pyproject.toml
+}
+
+python3-pyqt5-qsci-devel_package() {
+ short_desc+=" - development files"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ lib32disabled=yes
+ pkg_install() {
+ vmove ${py3_sitelib}/PyQt5/bindings
+ vmove usr/share/qt5/qsci/api
+ }
+}
diff --git a/srcpkgs/python3-pyqt5-qsci/update b/srcpkgs/python3-pyqt5-qsci/update
new file mode 100644
index 0000000000000..8ddafc0f70ad5
--- /dev/null
+++ b/srcpkgs/python3-pyqt5-qsci/update
@@ -0,0 +1,2 @@
+site="https://www.riverbankcomputing.com/software/qscintilla/download"
+pattern='QScintilla[_a-zA-Z]*-\K[\d.]+(?=.tar.gz)'
From 8e66b67d4468106667cdf2d86470404d97966789 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 3/5] 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 <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 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 <arjanmossel@gmail.com>"
+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 592a63a45ac9f994016f66f969c43067e5c4df42 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 4/5] 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 dc2e91141d95c..b33ececbc8466 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4135,6 +4135,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 76b429ecb257ccabd4891591c398214ce76aa819 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 5/5] New package: qgis-3.28.9
---
srcpkgs/qgis/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..53e05daba2fe3
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,37 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.9
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=d1db0a5a3c7f1f020174d352c00fb04faa7d0452ce97deec118f42e0b279419f
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (14 preceding siblings ...)
2023-07-23 8:22 ` [PR PATCH] [Updated] " ar-jan
@ 2023-07-23 8:22 ` ar-jan
2023-07-25 8:12 ` [PR PATCH] [Updated] " ar-jan
` (66 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-23 8:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1646778807
Comment:
Rebased and updated to 3.28.9.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (15 preceding siblings ...)
2023-07-23 8:22 ` ar-jan
@ 2023-07-25 8:12 ` ar-jan
2023-07-28 0:40 ` classabbyamp
` (65 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-25 8:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Depends on #31620 being updated/merged.
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 5200 bytes --]
From 0068e07b796b7b9d872a5f877682e719478781e8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 1/3] 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 <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 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 <arjanmossel@gmail.com>"
+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 ef237d3b9590ecb543c93a41aa4fed76439fd6bb Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 2/3] 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 53341ad9809bc..2645082199c7e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4135,6 +4135,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 5929e9933ab2b6ea2db9cf1da954fc681efb6cd2 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 3/3] New package: qgis-3.28.9
---
srcpkgs/qgis/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..53e05daba2fe3
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,37 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.28.9
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel expat-devel geos-devel gsl-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-opengl python3-pyqt5-qsci-devel python3-PyQt5-sensors
+ python3-PyQt5-webchannel 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-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 <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=d1db0a5a3c7f1f020174d352c00fb04faa7d0452ce97deec118f42e0b279419f
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (16 preceding siblings ...)
2023-07-25 8:12 ` [PR PATCH] [Updated] " ar-jan
@ 2023-07-28 0:40 ` classabbyamp
2023-07-28 12:40 ` ar-jan
` (64 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-07-28 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1654808094
Comment:
tested this out on x86_64. is it ready?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (17 preceding siblings ...)
2023-07-28 0:40 ` classabbyamp
@ 2023-07-28 12:40 ` ar-jan
2023-07-28 12:41 ` ar-jan
` (63 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-28 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 647 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1655623756
Comment:
Can we include both the latest stable and LTR release? Currently that would be `qgis-3.32.1` and `qgis-ltr-3.28.9`.
If yes, is there some xbps-src option to specify `qgis-ltr` as the name of the binary/package dir?
And if we go with a single version, shall we go with the latest stable? I've now tried 3.32.1 as well. Also made a few small changes to the template (compilation flags to disable pdal and grass, and removed a few makedepends which I think are not needed). Otherwise I think it's ready.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (18 preceding siblings ...)
2023-07-28 12:40 ` ar-jan
@ 2023-07-28 12:41 ` ar-jan
2023-07-28 12:45 ` ar-jan
` (62 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-28 12:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 656 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1655623756
Comment:
Can we include both the latest stable and LTR release? Currently that would be `qgis-3.32.1` and `qgis-ltr-3.28.9`.
If yes, is there some xbps-src/template option to specify `qgis-ltr` as the name of the binary/package dir?
And if we go with a single version, shall we go with the latest stable? I've now tried 3.32.1 as well. Also made a few small changes to the template (compilation flags to disable pdal and grass, and removed a few makedepends which I think are not needed). Otherwise I think it's ready.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (19 preceding siblings ...)
2023-07-28 12:41 ` ar-jan
@ 2023-07-28 12:45 ` ar-jan
2023-07-28 12:48 ` classabbyamp
` (61 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-28 12:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 283 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1655629582
Comment:
Optional dependencies that could be added:
- PDAL
- pyproj
- Grass support (I think it requires adding grass-devel subpackage and using it)
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (20 preceding siblings ...)
2023-07-28 12:45 ` ar-jan
@ 2023-07-28 12:48 ` classabbyamp
2023-07-28 20:41 ` ar-jan
` (60 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-07-28 12:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1655633447
Comment:
i think it's fine to do latest stable only
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (21 preceding siblings ...)
2023-07-28 12:48 ` classabbyamp
@ 2023-07-28 20:41 ` ar-jan
2023-07-28 20:50 ` classabbyamp
` (59 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-28 20:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1656314413
Comment:
I want to get the GRASS support functioning, but get `"Could not find GRASS 8"` in the config step. It looks like there's something wrong with how grass is currently packaged. I added a missing `vinstall grass.pc 644 usr/lib/pkgconfig` to the grass template, but notice it contains the wrong location:
``` sh
# Package Information for pkg-config
#
# See also: grass --config
prefix=/opt/grass/grass-8.2.1
exec_prefix=/opt/grass/grass-8.2.1
libdir=/opt/grass/grass-8.2.1/lib
includedir=/opt/grass/grass-8.2.1/include
Name: GRASS
Description: GRASS GIS
Version: 8.2.1
Libs: -L/opt/grass/grass-8.2.1/lib -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_raster -lgrass_vector -lgrass_dbmibase -lgrass_dbmiclient -lm -lz
Cflags: -I/opt/grass/grass-8.2.1/include
```
The actual path is `/opt/grass/grass-8.2`. Any ideas? Elsewhere the correct path is used, e.g. for `GISBASE` in /usr/bin/grass.
Additionally, I suppose the libraries listed in grass.pc should also be added to `shlib_provides`?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (22 preceding siblings ...)
2023-07-28 20:41 ` ar-jan
@ 2023-07-28 20:50 ` classabbyamp
2023-07-28 21:04 ` ar-jan
` (58 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-07-28 20:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1656321728
Comment:
yeah I think we discovered grass had issues in #31687
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (23 preceding siblings ...)
2023-07-28 20:50 ` classabbyamp
@ 2023-07-28 21:04 ` ar-jan
2023-07-30 13:59 ` nezos
` (57 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-28 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1656333422
Comment:
Yes, but it was updated to python3 and grass 8 in #40347, and the cli does seem to work. Actually QGIS does show GRASS operations in the processing toolbox and a few I tried seem to work, but I'm not sure if they're complete. Still, something is wrong.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (24 preceding siblings ...)
2023-07-28 21:04 ` ar-jan
@ 2023-07-30 13:59 ` nezos
2023-07-30 14:01 ` nezos
` (56 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: nezos @ 2023-07-30 13:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1657180891
Comment:
I was not monitoring the thread, so I moved independently. In case they help I attach my templates and a patch I did for resolving grass not found (it's hardlinked!):
[libpdal.txt](https://github.com/void-linux/void-packages/files/12209339/libpdal.txt)
[libgeotiff.txt](https://github.com/void-linux/void-packages/files/12209348/libgeotiff.txt)
[libgdal.txt](https://github.com/void-linux/void-packages/files/12209342/libgdal.txt)
[grass.txt](https://github.com/void-linux/void-packages/files/12209345/grass.txt)
[qgis.txt](https://github.com/void-linux/void-packages/files/12209346/qgis.txt)
[FindGRASS.patch.txt](https://github.com/void-linux/void-packages/files/12209354/FindGRASS.patch.txt)
The problem with grass that it compiles well with qgis but when I try to install qgis it cannot find the grass shared libraries. The reason is that in the grass project, they name libraries as VERSION.so and in voidlinux they need to be .so.VERSION . I couldn't find a solution as many makefiles need to be patched and this would complicate things alot. If you have a grass package that provides shlibs then you have the solution!
For the LTR I don't know how useful it is, especially considering that each new version usually changes something at the project files created by the user...
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (25 preceding siblings ...)
2023-07-30 13:59 ` nezos
@ 2023-07-30 14:01 ` nezos
2023-07-31 14:44 ` ar-jan
` (55 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: nezos @ 2023-07-30 14:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1569 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1657180891
Comment:
I was not monitoring the thread, so I moved independently. In case they help I attach my templates and a patch I did for resolving grass not found (it's hardlinked!):
[libpdal.txt](https://github.com/void-linux/void-packages/files/12209339/libpdal.txt)
[libgeotiff.txt](https://github.com/void-linux/void-packages/files/12209348/libgeotiff.txt)
[libgdal.txt](https://github.com/void-linux/void-packages/files/12209342/libgdal.txt)
[grass.txt](https://github.com/void-linux/void-packages/files/12209345/grass.txt)
[qgis.txt](https://github.com/void-linux/void-packages/files/12209346/qgis.txt)
[FindGRASS.patch.txt](https://github.com/void-linux/void-packages/files/12209354/FindGRASS.patch.txt)
The problem with grass that it compiles well with qgis but when I try to install qgis it cannot find the grass shared libraries. The reason is that in the grass project, they name libraries as VERSION.so and in voidlinux they need to be .so.VERSION . I couldn't find a solution as many makefiles need to be patched and this would complicate things alot. If you have a grass package that provides shlibs then you have the solution!
For the LTR I don't know how useful it is, especially considering that each new version usually changes something at the project files created by the user...
I also noticed on a forum that updating wxPython4 to the latest version would make the GUI of grass work but I haven't tried it.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (26 preceding siblings ...)
2023-07-30 14:01 ` nezos
@ 2023-07-31 14:44 ` ar-jan
2023-07-31 14:44 ` ar-jan
` (54 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-31 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 900 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1658515156
Comment:
Thanks for chiming in, I'll see if your examples help out here.
> For the LTR I don't know how useful it is, especially considering that each new version usually changes something at the project files created by the user...
Yeah, that's exactly why I think it's useful to have. If you collaborate with someone they may not have the the latest version of QGIS available, but everyone can generally use the current LTR. But personally I'm also fine with the latest version so let's start with that.
> updating wxPython4 to the latest version would make the GUI of grass work
Yeah, but then someone needs to update wxPython for all of Void first which is not trivial. IIRC it requires upgrading wxWidgets, which is/was incompatible with other packages.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (27 preceding siblings ...)
2023-07-31 14:44 ` ar-jan
@ 2023-07-31 14:44 ` ar-jan
2023-09-19 22:15 ` ar-jan
` (53 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-07-31 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 902 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1658515156
Comment:
Thanks for chiming in, I'll see if your examples help out here.
> For the LTR I don't know how useful it is, especially considering that each new version usually changes something at the project files created by the user...
Yeah, that's exactly why I think it's useful to have. If you collaborate with someone they may not have the the latest version of QGIS available, but everyone can generally use the current LTR. But personally I'm also fine with the latest version so let's start with that.
> updating wxPython4 to the latest version would make the GUI of grass work
Yeah, but then someone needs to update wxPython for all of Void first which is not trivial. IIRC it requires upgrading wxWidgets, which is/was incompatible with other packages.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (28 preceding siblings ...)
2023-07-31 14:44 ` ar-jan
@ 2023-09-19 22:15 ` ar-jan
2023-09-19 22:16 ` ar-jan
` (52 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-19 22:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1726613637
Comment:
I thought [this branch](https://github.com/ar-jan/void-packages/commits/qgis-proj) _should_ solve the grass issues, I fixed the install location for pkg-config and added a -devel subpackage (I pushed to another branch to avoid needless CI build here). The QGIS build configuration step can now find grass as well. But when I install qgis I still get this:
```
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_dbmibase.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_dbmiclient.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_gis.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_gproj.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_imagery.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_raster.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_vector.8.3.so'
Transaction aborted due to unresolved shlibs.
```
Do they have to be located in `/usr/lib` to be found? Any clue, @classabbyamp?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (29 preceding siblings ...)
2023-09-19 22:15 ` ar-jan
@ 2023-09-19 22:16 ` ar-jan
2023-09-20 8:23 ` 0x5c
` (51 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-19 22:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1150 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1726613637
Comment:
I thought [this branch](https://github.com/ar-jan/void-packages/commits/qgis-proj) _should_ solve the grass issues, I fixed the install location for pkg-config and added a -devel subpackage (I pushed to another branch to avoid needless CI build here). The QGIS build configuration step can now find grass as well. But when I install qgis I get this problem even though these are available:
```
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_dbmibase.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_dbmiclient.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_gis.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_gproj.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_imagery.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_raster.8.3.so'
qgis-3.32.3_1: broken, unresolvable shlib `libgrass_vector.8.3.so'
Transaction aborted due to unresolved shlibs.
```
Do they have to be located in `/usr/lib` to be found? Any clue, @classabbyamp?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (30 preceding siblings ...)
2023-09-19 22:16 ` ar-jan
@ 2023-09-20 8:23 ` 0x5c
2023-09-20 14:13 ` ar-jan
` (50 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: 0x5c @ 2023-09-20 8:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1727215460
Comment:
> Do they have to be located in `/usr/lib` to be found?
In what dir are they located?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (31 preceding siblings ...)
2023-09-20 8:23 ` 0x5c
@ 2023-09-20 14:13 ` ar-jan
2023-09-20 14:58 ` 0x5c
` (49 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-20 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1727818853
Comment:
`/opt/grass83/lib`.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (32 preceding siblings ...)
2023-09-20 14:13 ` ar-jan
@ 2023-09-20 14:58 ` 0x5c
2023-09-20 15:19 ` 0x5c
` (48 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: 0x5c @ 2023-09-20 14:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1727901219
Comment:
That's likely to be it, shlibs should be in the usual `/usr/lib`
Do we know why the prefix got changed to `/opt/grass` in e8abe0a01b81041e245e399730ab9b61141ceb89?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (33 preceding siblings ...)
2023-09-20 14:58 ` 0x5c
@ 2023-09-20 15:19 ` 0x5c
2023-09-24 14:56 ` ar-jan
` (47 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: 0x5c @ 2023-09-20 15:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1727939068
Comment:
Debian seems to use the normal prefix https://packages.debian.org/sid/amd64/grass-core/filelist
https://salsa.debian.org/debian-gis-team/grass/-/tree/master/debian
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (34 preceding siblings ...)
2023-09-20 15:19 ` 0x5c
@ 2023-09-24 14:56 ` ar-jan
2023-09-24 15:02 ` ar-jan
` (46 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-24 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1791 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1732591052
Comment:
I'm stuck. I've changed it to install to `/usr/lib/grass83`. I'm not quite sure why `/opt` was picked, but before that it was already strange to first install to `/usr/share` and then move the whole install dir to `/usr/lib` anyway. Grass has `--includedir=DIR` and `--libdir=DIR` options but I couldn't get those options to work, setting it to e.g. `--includedir=/usr/include` appears to do nothing.
The library paths for `grass.pc` had to be fixed, but I'm still getting the `unresolvable shlib` problem. Grass compile and install appears to work fine. QGIS can be compiled with grass and the configure phase reports finding grass, but then when actually installing qgis the grass libraries can't be found (if I remove grass-devel from qgis makedepends it can be installed).
If I compile QGIS with grass-devel in makedepends, it starts like this:
> ./xbps-src pkg -C qgis
> Package grass was not found in the pkg-config search path.
> Perhaps you should add the directory containing `grass.pc'
> to the PKG_CONFIG_PATH environment variable
> No package 'grass' found
But despite that, qgis__do_configure.log then says:
> -- Found GRASS 8: /usr/lib/grass83 (8.3.0, off_t size = )
(Maybe because of passing setting the location with configure arg `GRASS_PREFIX8`?)
Without grass-devel, I get the `PKG_CONFIG_PATH` warning; when I install the grass-devel built in that same branch, I get this:
> pkg-config --variable=prefix grass
> /usr/lib/grass83
So the issue seems to come from pkg-config? Anyone want to try building it and see if they spot what's happening?
`https://github.com/ar-jan/void-packages/tree/qgis-proj`
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (35 preceding siblings ...)
2023-09-24 14:56 ` ar-jan
@ 2023-09-24 15:02 ` ar-jan
2023-09-27 6:44 ` classabbyamp
` (45 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-24 15:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1830 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1732591052
Comment:
I'm stuck. I've changed it to install to `/usr/lib/grass83`. I'm not quite sure why `/opt` was picked, but before that it was already strange to first install to `/usr/share` and then move the whole install dir to `/usr/lib` anyway. Grass has `--includedir=DIR` and `--libdir=DIR` options but I couldn't get those options to work, setting it to e.g. `--includedir=/usr/include` appears to do nothing.
The library paths for `grass.pc` had to be fixed, but I'm still getting the `unresolvable shlib` problem. Grass compile and install appears to work fine. QGIS can be compiled with grass and the configure phase reports finding grass, but then when actually installing qgis the grass libraries can't be found (if I remove grass-devel from qgis makedepends it can be installed).
If I compile QGIS with grass-devel in makedepends, it starts like this:
> ./xbps-src pkg -C qgis
> Package grass was not found in the pkg-config search path.
> Perhaps you should add the directory containing `grass.pc'
> to the PKG_CONFIG_PATH environment variable
> No package 'grass' found
But despite that, qgis__do_configure.log then says:
> -- Found GRASS 8: /usr/lib/grass83 (8.3.0, off_t size = )
(Maybe because of passing setting the location with configure arg `GRASS_PREFIX8`?)
When I install the grass-devel built in that same branch, I get this when testing:
> pkg-config --variable=prefix grass
> /usr/lib/grass83
While without `grass-devel` installed, I get the same `PKG_CONFIG_PATH` warning.
So the issue seems to come from pkg-config? Anyone want to try building it and see if they spot what's happening?
`https://github.com/ar-jan/void-packages/tree/qgis-proj`
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (36 preceding siblings ...)
2023-09-24 15:02 ` ar-jan
@ 2023-09-27 6:44 ` classabbyamp
2023-09-27 6:44 ` classabbyamp
` (44 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-09-27 6:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1736796024
Comment:
see #46285, i think i got everything working
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (37 preceding siblings ...)
2023-09-27 6:44 ` classabbyamp
@ 2023-09-27 6:44 ` classabbyamp
2023-09-27 16:45 ` ar-jan
` (43 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-09-27 6:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1736796024
Comment:
see #46285, i think i got everything working. I tested it briefly with qgis and the native gui but I don't really know what I'm doing
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (38 preceding siblings ...)
2023-09-27 6:44 ` classabbyamp
@ 2023-09-27 16:45 ` ar-jan
2023-09-27 22:18 ` [PR PATCH] [Updated] " ar-jan
` (42 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-27 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1737749785
Comment:
+1, works with QGIS, will update after grass is merged.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (39 preceding siblings ...)
2023-09-27 16:45 ` ar-jan
@ 2023-09-27 22:18 ` ar-jan
2023-09-27 22:41 ` [PR REVIEW] " classabbyamp
` (41 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-27 22:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 6418 bytes --]
From ecd83eb7e7d2ae22d89c606a455110c1efb33b9a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <me@johnnynator.dev>"
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 <arjanmossel@gmail.com>
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 <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 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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 ef431706eb6a6b5df2dcaf323505e2029f10bc1c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 4/4] New package: qgis-3.32.3
---
srcpkgs/qgis/template | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..c11a5f5a54383
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,39 @@
+# 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
+ -DWITH_GRASS7=False -DWITH_GRASS8=True
+ -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 <arjanmossel@gmail.com>"
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (40 preceding siblings ...)
2023-09-27 22:18 ` [PR PATCH] [Updated] " ar-jan
@ 2023-09-27 22:41 ` classabbyamp
2023-09-28 17:44 ` [PR PATCH] [Updated] " ar-jan
` (40 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-09-27 22:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 236 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1339299539
Comment:
```suggestion
```
those aren't needed, they get set to those values automatically
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (41 preceding siblings ...)
2023-09-27 22:41 ` [PR REVIEW] " classabbyamp
@ 2023-09-28 17:44 ` ar-jan
2023-09-28 17:45 ` [PR REVIEW] " ar-jan
` (39 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-28 17:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 6376 bytes --]
From ecd83eb7e7d2ae22d89c606a455110c1efb33b9a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <me@johnnynator.dev>"
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 <arjanmossel@gmail.com>
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 <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 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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (42 preceding siblings ...)
2023-09-28 17:44 ` [PR PATCH] [Updated] " ar-jan
@ 2023-09-28 17:45 ` ar-jan
2023-09-28 17:56 ` ar-jan
` (38 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-28 17:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1340486898
Comment:
Removed
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (43 preceding siblings ...)
2023-09-28 17:45 ` [PR REVIEW] " ar-jan
@ 2023-09-28 17:56 ` ar-jan
2023-09-28 17:57 ` ar-jan
` (37 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-28 17:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 377 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1739775336
Comment:
One minor issue I encounter is that tooltips for toolbar icons are sometimes partially rendered, then usually rendering fully on the next hover. I have no clue why that is, I guess something Qt related. But basically I think it's ready.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (44 preceding siblings ...)
2023-09-28 17:56 ` ar-jan
@ 2023-09-28 17:57 ` ar-jan
2023-09-29 4:58 ` nezos
` (36 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-28 17:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 402 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1528812943
Comment:
Updated to 3.28.6. Keeping this on the [LTR branch](https://qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule) for now. If/when the qscintilla PR is merged and this could get in, ideally I'd like to have both `qgis` and `qgis-ltr` packages.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (45 preceding siblings ...)
2023-09-28 17:57 ` ar-jan
@ 2023-09-29 4:58 ` nezos
2023-09-29 5:01 ` nezos
` (35 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: nezos @ 2023-09-29 4:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1740315723
Comment:
> One minor issue I encounter is that tooltips for toolbar icons are sometimes partially rendered, then usually rendering fully on the next hover. I have no clue why that is, I guess something Qt related. But basically I think it's ready.
I didn't compile the posted branch but toolbar icons in 3.32.2 render normaly here - running i3 on X (if this matters).
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (46 preceding siblings ...)
2023-09-29 4:58 ` nezos
@ 2023-09-29 5:01 ` nezos
2023-09-29 7:28 ` ar-jan
` (34 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: nezos @ 2023-09-29 5:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1740317282
Comment:
One last comment, I think geotiff library is essential but we can look at it in a next update.
Good job!
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (47 preceding siblings ...)
2023-09-29 5:01 ` nezos
@ 2023-09-29 7:28 ` ar-jan
2023-09-30 4:27 ` nezos
` (33 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-09-29 7:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1740433155
Comment:
The icons do render ok for me, it's only the tooltips shown on hovering that that are sometimes incomplete for me on first hover (I'm running KDE Plasma).
Ah right geotiff would be good. I see you posted a template above, do you want to list yourself as maintainer?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (48 preceding siblings ...)
2023-09-29 7:28 ` ar-jan
@ 2023-09-30 4:27 ` nezos
2023-09-30 4:27 ` nezos
` (32 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: nezos @ 2023-09-30 4:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1741673706
Comment:
> The icons do render ok for me, it's only the tooltips shown on hovering that that are sometimes incomplete for me on first hover (I'm running KDE Plasma).
>
> Ah right geotiff would be good. I see you posted a template above, do you want to list yourself as maintainer?
You can take ownership:) No problem! ... I mean if libgeotiff gets updated than QGIS will be updated too.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (49 preceding siblings ...)
2023-09-30 4:27 ` nezos
@ 2023-09-30 4:27 ` nezos
2023-11-01 20:30 ` nezos
` (31 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: nezos @ 2023-09-30 4:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 526 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1741673706
Comment:
> The icons do render ok for me, it's only the tooltips shown on hovering that that are sometimes incomplete for me on first hover (I'm running KDE Plasma).
>
> Ah right geotiff would be good. I see you posted a template above, do you want to list yourself as maintainer?
You can take ownership:) No problem! ... I mean if libgeotiff gets updated then QGIS will be updated too.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (50 preceding siblings ...)
2023-09-30 4:27 ` nezos
@ 2023-11-01 20:30 ` nezos
2023-11-01 20:38 ` ar-jan
` (30 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: nezos @ 2023-11-01 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1975 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1789632023
Comment:
Just wanted to add that as time passes, newer versions have more requirements. I am adding my latest build templates in case you find them useful. Another new library is being used by QGIS, draco, while 3 more are required for building. GRASS (latest version) is now been detected without the need for a patch and is shown properly in the tools.
Here are all my templates and a patch:
[draco.txt](https://github.com/void-linux/void-packages/files/13231442/draco.txt)
[freexl.txt](https://github.com/void-linux/void-packages/files/13231444/freexl.txt)
[qgis.txt](https://github.com/void-linux/void-packages/files/13231445/qgis.txt)
[grass.txt](https://github.com/void-linux/void-packages/files/13231449/grass.txt)
[libgeotiff.txt](https://github.com/void-linux/void-packages/files/13231454/libgeotiff.txt)
[libpdal.txt](https://github.com/void-linux/void-packages/files/13231457/libpdal.txt)
[libspatialite.txt](https://github.com/void-linux/void-packages/files/13231464/libspatialite.txt)
[libgdal.txt](https://github.com/void-linux/void-packages/files/13231469/libgdal.txt)
[libkml.txt](https://github.com/void-linux/void-packages/files/13231473/libkml.txt)
[libkml-NOUNCRYPT.patch.txt](https://github.com/void-linux/void-packages/files/13231475/libkml-NOUNCRYPT.patch.txt)
[python3-OWSLib.txt](https://github.com/void-linux/void-packages/files/13231478/python3-OWSLib.txt)
[python3-pyproj.txt](https://github.com/void-linux/void-packages/files/13231487/python3-pyproj.txt)
[python3-PyQt5-QScintilla.txt](https://github.com/void-linux/void-packages/files/13231490/python3-PyQt5-QScintilla.txt)
In case someone wants to build QGIS the sequence is:
1) libkml, 2) python3-OWSLib, 3) proj, python3-pyproj, 4) libgeotiff, 5) libgdal, 6) freexl, libspatialite, 7) libpdal, 8) grass, 9) python3-PyQt5-QScintilla, 10) qgis
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (51 preceding siblings ...)
2023-11-01 20:30 ` nezos
@ 2023-11-01 20:38 ` ar-jan
2023-11-01 20:39 ` ar-jan
` (29 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-01 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1789643772
Comment:
After the the move to Python 3.12 I had trouble with with PyQGIS, and I believe some core functionality broke (missing some menu items) just with rebuilding 3.32 for Python 3.12. Have you seen that? Haven't tried 3.34 yet, will take this into account, thanks!
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (52 preceding siblings ...)
2023-11-01 20:38 ` ar-jan
@ 2023-11-01 20:39 ` ar-jan
2023-11-04 9:37 ` nezos
` (28 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-01 20:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 395 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1789643772
Comment:
After the the move to Python 3.12 I had trouble with PyQGIS, and I believe some core functionality broke (missing some menu items) just with rebuilding 3.32 for Python 3.12. Have you seen that? Haven't tried 3.34 yet, will take this into account, thanks!
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (53 preceding siblings ...)
2023-11-01 20:39 ` ar-jan
@ 2023-11-04 9:37 ` nezos
2023-11-12 19:36 ` [PR PATCH] [Updated] " ar-jan
` (27 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: nezos @ 2023-11-04 9:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New comment by nezos on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1793395641
Comment:
3.34 works fine and I also have the grass and gdal tools working. I don't see anything missing from the menus.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (54 preceding siblings ...)
2023-11-04 9:37 ` nezos
@ 2023-11-12 19:36 ` ar-jan
2023-11-12 19:41 ` ar-jan
` (26 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-12 19:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 10685 bytes --]
From b42512b6f9c1fc58902ceb02c426367faa09f71e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
srcpkgs/libgeotiff/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..b37f3ac2766df
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,18 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
From 337e4b78c0cc788d2ae4a329323cafc0005eadde Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..d9a6e86796766
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,24 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove usr/share/cmake
+ }
+}
From 37c92462add11e07448c9c649aa2379ff04688c2 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
common/shlibs | 2 ++
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 36 +++++++++++++++++++++++++++++++++++
4 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f8417..fc9a91b900620 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2468,6 +2468,8 @@ 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.31 libgdal-3.5.3_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..1a431d474360b
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,36 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libgdal-devel libgeotiff zlib-devel libcurl-devel python3
+ libunwind-devel libxml2-devel tiff-devel proj-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+
+do_check() {
+ cd build
+ ctest -E 'pdal_app_plugin_test'
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From b4dc8068ea57ad87e944e0732c7049d8eb162e5c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 f93938f1dccc9d8b260ea393f804ee5bb8fd5f1e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 fc9a91b900620..e7c673a515e35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4061,6 +4061,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 5a9e655412af4ee974c6e62f3e4d8014c721d04c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
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..fe5ddfa2ef313
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,38 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (55 preceding siblings ...)
2023-11-12 19:36 ` [PR PATCH] [Updated] " ar-jan
@ 2023-11-12 19:41 ` ar-jan
2023-11-12 21:10 ` ar-jan
` (25 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-12 19:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 10701 bytes --]
From af8d59373e976ab80dac61ef1d4fda98803042f3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
srcpkgs/libgeotiff/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..0f8a7fad2ef61
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,19 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
From 122ab5c556a83e5878d128bf87a44e8df80746a9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..d9a6e86796766
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,24 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove usr/share/cmake
+ }
+}
From 3920ce0ccb96e2c61e5a54bd3a15bf03a46b929e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
common/shlibs | 2 ++
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 36 +++++++++++++++++++++++++++++++++++
4 files changed, 40 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f8417..fc9a91b900620 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2468,6 +2468,8 @@ 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.31 libgdal-3.5.3_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..1a431d474360b
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,36 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libgdal-devel libgeotiff zlib-devel libcurl-devel python3
+ libunwind-devel libxml2-devel tiff-devel proj-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+
+do_check() {
+ cd build
+ ctest -E 'pdal_app_plugin_test'
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From 1b90c4e514aa1a85580982444dcdd016ddd9202d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 8b77efd812fbb8a27a0f8a6d51d87f27e32e96e2 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 fc9a91b900620..e7c673a515e35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4061,6 +4061,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 87178860ba255da94249c83718a6326b6ff32385 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
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..fe5ddfa2ef313
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,38 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (56 preceding siblings ...)
2023-11-12 19:41 ` ar-jan
@ 2023-11-12 21:10 ` ar-jan
2023-11-12 21:15 ` ar-jan
` (24 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-12 21:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 11399 bytes --]
From b9fa0a01dbb0cef0401294f99f63e0b473ea0ac1 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
srcpkgs/libgeotiff-devel | 1 +
srcpkgs/libgeotiff/template | 29 +++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 120000 srcpkgs/libgeotiff-devel
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/srcpkgs/libgeotiff-devel b/srcpkgs/libgeotiff-devel
new file mode 120000
index 0000000000000..192e7a87a2aed
--- /dev/null
+++ b/srcpkgs/libgeotiff-devel
@@ -0,0 +1 @@
+libgeotiff
\ No newline at end of file
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..b35993a0b73c4
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,29 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
+
+libgeotiff-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove usr/share/cmake
+ }
+}
From 70976091ab3b4611731664ca16c611cde9761856 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..d9a6e86796766
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,24 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove usr/share/cmake
+ }
+}
From b971fde15bb05a3d4b002d8d3ff3b8abcc807338 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
common/shlibs | 2 ++
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 41 +++++++++++++++++++++++++++++++++++
4 files changed, 45 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f8417..fc9a91b900620 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2468,6 +2468,8 @@ 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.31 libgdal-3.5.3_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..e70348d3b9296
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,41 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel libgdal-devel libgeotiff-devel libunwind-devel
+ libxml2-devel python3-devel tiff-devel zlib-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+
+do_check() {
+ cd build
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) ctest -E \
+ "pdal_(app_plugin|file_utils|filters_colorinterp|filters_stats)_test" ;;
+ x86_64*) ctest -E 'pdal_app_plugin_test' ;;
+ esac
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From 69cb59f9f221838f237a148110ab6fd42a199aec Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 24622853fdb1c7ed940a2cb80d8aa79aa3d8d45c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 fc9a91b900620..e7c673a515e35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4061,6 +4061,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 e10ab8d2d9a615c1b9a40954f80c7a66cfc8c5a5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
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..fe5ddfa2ef313
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,38 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (57 preceding siblings ...)
2023-11-12 21:10 ` ar-jan
@ 2023-11-12 21:15 ` ar-jan
2023-11-12 21:48 ` [PR PATCH] [Updated] " ar-jan
` (23 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-12 21:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 291 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1807241746
Comment:
Updated to 3.34. The apparent Python 3.12 issues are gone (grass had been working correctly for me since the 8.3 update). I've now also included PDAL.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (58 preceding siblings ...)
2023-11-12 21:15 ` ar-jan
@ 2023-11-12 21:48 ` ar-jan
2023-11-14 7:09 ` [PR REVIEW] " classabbyamp
` (22 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-12 21:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 11314 bytes --]
From b9fa0a01dbb0cef0401294f99f63e0b473ea0ac1 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
srcpkgs/libgeotiff-devel | 1 +
srcpkgs/libgeotiff/template | 29 +++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 120000 srcpkgs/libgeotiff-devel
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/srcpkgs/libgeotiff-devel b/srcpkgs/libgeotiff-devel
new file mode 120000
index 0000000000000..192e7a87a2aed
--- /dev/null
+++ b/srcpkgs/libgeotiff-devel
@@ -0,0 +1 @@
+libgeotiff
\ No newline at end of file
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..b35993a0b73c4
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,29 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
+
+libgeotiff-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove usr/share/cmake
+ }
+}
From 70976091ab3b4611731664ca16c611cde9761856 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..d9a6e86796766
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,24 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove usr/share/cmake
+ }
+}
From f252c9cff1bea14832da472b6363070136ac7e78 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
common/shlibs | 2 ++
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 40 +++++++++++++++++++++++++++++++++++
4 files changed, 44 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f8417..fc9a91b900620 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2468,6 +2468,8 @@ 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.31 libgdal-3.5.3_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
libosgViewer.so.161 osg-3.6.5_1
libosgShadow.so.161 osg-3.6.5_1
libosgParticle.so.161 osg-3.6.5_1
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..10c4991fe4ad7
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,40 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel libgdal-devel libgeotiff-devel libunwind-devel
+ libxml2-devel python3-devel tiff-devel zlib-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+
+do_check() {
+ cd build
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) ;;
+ x86_64*) ctest -E 'pdal_app_plugin_test' ;;
+ esac
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From 777048d747afccb7e1061bf6c0f444185e3e3240 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 bdcced5e57cb76961cf76f3717797ce0598d6506 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 fc9a91b900620..e7c673a515e35 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4061,6 +4061,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 6c811b013d438d5447b1955f48ef51341452af57 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
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..fe5ddfa2ef313
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,38 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+archs="x86_64* i686"
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (60 preceding siblings ...)
2023-11-14 7:09 ` [PR REVIEW] " classabbyamp
@ 2023-11-14 7:09 ` classabbyamp
2023-11-14 7:09 ` classabbyamp
` (20 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-14 7:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392081747
Comment:
generally new additions go at the bottom, I think
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (61 preceding siblings ...)
2023-11-14 7:09 ` classabbyamp
@ 2023-11-14 7:09 ` classabbyamp
2023-11-14 7:09 ` classabbyamp
` (19 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-14 7:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392082128
Comment:
why only static?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (62 preceding siblings ...)
2023-11-14 7:09 ` classabbyamp
@ 2023-11-14 7:09 ` classabbyamp
2023-11-14 7:09 ` classabbyamp
` (18 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-14 7:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392081270
Comment:
why only the static lib?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (59 preceding siblings ...)
2023-11-12 21:48 ` [PR PATCH] [Updated] " ar-jan
@ 2023-11-14 7:09 ` classabbyamp
2023-11-14 7:09 ` classabbyamp
` (21 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-14 7:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392083843
Comment:
does this make more sense as nocross?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (63 preceding siblings ...)
2023-11-14 7:09 ` classabbyamp
@ 2023-11-14 7:09 ` classabbyamp
2023-11-14 12:17 ` ar-jan
` (17 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-14 7:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392083452
Comment:
why only x86?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (64 preceding siblings ...)
2023-11-14 7:09 ` classabbyamp
@ 2023-11-14 12:17 ` ar-jan
2023-11-14 12:37 ` ar-jan
` (16 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 12:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392502003
Comment:
The package has no `.so`s
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (65 preceding siblings ...)
2023-11-14 12:17 ` ar-jan
@ 2023-11-14 12:37 ` ar-jan
2023-11-14 12:39 ` ar-jan
` (15 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 12:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 530 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392524576
Comment:
I didn't get it to compile on arm because it uses some vendored tool `dimbuilder` on which it failed with `/bin/sh: line 1: dimbuilder: command not found`. It's also not entirely clear on which architectures it's [supposed to compile](https://github.com/PDAL/PDAL/issues/4239), though probably it should work on some arm arches. Any tips what to try there? Might `nocross` help here?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (66 preceding siblings ...)
2023-11-14 12:37 ` ar-jan
@ 2023-11-14 12:39 ` ar-jan
2023-11-14 12:41 ` ar-jan
` (14 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 12:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392526913
Comment:
I guess, I listed these because that's what other distros support for QGIS. Will give it a try.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (67 preceding siblings ...)
2023-11-14 12:39 ` ar-jan
@ 2023-11-14 12:41 ` ar-jan
2023-11-14 13:50 ` classabbyamp
` (13 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 12:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 180 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392529087
Comment:
Here too there are no `.so` libs.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (68 preceding siblings ...)
2023-11-14 12:41 ` ar-jan
@ 2023-11-14 13:50 ` classabbyamp
2023-11-14 13:50 ` classabbyamp
` (12 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-14 13:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392610917
Comment:
i think nocross is probably reasonable
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (69 preceding siblings ...)
2023-11-14 13:50 ` classabbyamp
@ 2023-11-14 13:50 ` classabbyamp
2023-11-14 18:28 ` ar-jan
` (11 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-14 13:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1392611995
Comment:
on both of these packages with only .as, is there no configure option to enable shared libraries?
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (70 preceding siblings ...)
2023-11-14 13:50 ` classabbyamp
@ 2023-11-14 18:28 ` ar-jan
2023-11-14 18:30 ` ar-jan
` (10 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 18:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1393058699
Comment:
Oh you're right, the generic cmake option works.
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (71 preceding siblings ...)
2023-11-14 18:28 ` ar-jan
@ 2023-11-14 18:30 ` ar-jan
2023-11-14 18:46 ` [PR PATCH] [Updated] " ar-jan
` (9 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 18:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1393060493
Comment:
Changed to use `BUILD_SHARED_LIBS=ON` (excludes static archives)
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (72 preceding siblings ...)
2023-11-14 18:30 ` ar-jan
@ 2023-11-14 18:46 ` ar-jan
2023-11-14 18:47 ` ar-jan
` (8 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 18:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 11380 bytes --]
From 44b8fc7f7aeee6aba194af85e9628ef3531df814 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
srcpkgs/libgeotiff-devel | 1 +
srcpkgs/libgeotiff/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 120000 srcpkgs/libgeotiff-devel
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/srcpkgs/libgeotiff-devel b/srcpkgs/libgeotiff-devel
new file mode 120000
index 0000000000000..192e7a87a2aed
--- /dev/null
+++ b/srcpkgs/libgeotiff-devel
@@ -0,0 +1 @@
+libgeotiff
\ No newline at end of file
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..1b3570404f454
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,30 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
+
+libgeotiff-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From f6c98a6065d52bec1f9efbd38ddfcee07e8c6bfb Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..fd6d26cf33649
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,25 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From 8d63b6e143ca9afe2a9e034f941c1ff680c4cb0a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
common/shlibs | 2 ++
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 42 +++++++++++++++++++++++++++++++++++
4 files changed, 46 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/common/shlibs b/common/shlibs
index 7e9cee83f8417..3c898c3001164 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4267,3 +4267,5 @@ libgrass_gproj.8.3.so grass-8.3.0_1
libgrass_imagery.8.3.so grass-8.3.0_1
libgrass_raster.8.3.so grass-8.3.0_1
libgrass_vector.8.3.so grass-8.3.0_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..319f004325c96
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,42 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel libgdal-devel libgeotiff-devel libunwind-devel
+ libxml2-devel python3-devel tiff-devel zlib-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+nocross="dimbuilder: command not found"
+
+do_check() {
+ cd build
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) ctest -E \
+ "pdal_(app_plugin|file_utils|filters_colorinterp|filters_stats|io_optech)_test" ;;
+ x86_64*) ctest -E 'pdal_app_plugin_test' ;;
+ *) ctest ;;
+ esac
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From db3e8d61bb788c555dd1409d9f731a9dd87b118f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 d5157ab696f1a9e6d441f87fad3c5d003b164a49 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 3c898c3001164..8332d77e25d83 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4059,6 +4059,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 14a1feeb71f892d83fd0fd9cd6384bae851420b5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
srcpkgs/qgis/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..d12cf9b841f1f
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,37 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (73 preceding siblings ...)
2023-11-14 18:46 ` [PR PATCH] [Updated] " ar-jan
@ 2023-11-14 18:47 ` ar-jan
2023-11-14 19:04 ` ar-jan
` (7 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 11382 bytes --]
From f241826db1dee04744dbb24955a925158e5acba8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
srcpkgs/libgeotiff-devel | 1 +
srcpkgs/libgeotiff/template | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 120000 srcpkgs/libgeotiff-devel
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/srcpkgs/libgeotiff-devel b/srcpkgs/libgeotiff-devel
new file mode 120000
index 0000000000000..192e7a87a2aed
--- /dev/null
+++ b/srcpkgs/libgeotiff-devel
@@ -0,0 +1 @@
+libgeotiff
\ No newline at end of file
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..1b3570404f454
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,30 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
+
+libgeotiff-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From 17b12cbf3941e40b87eb4df6025fe5acb6da2c1e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..fd6d26cf33649
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,25 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From dc971102ecb1b4ab15c8495317be55dae42ddd1a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
common/shlibs | 2 ++
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 42 +++++++++++++++++++++++++++++++++++
4 files changed, 46 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/common/shlibs b/common/shlibs
index 1a721780f8545..cca62c9d0ae43 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4269,3 +4269,5 @@ libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..319f004325c96
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,42 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel libgdal-devel libgeotiff-devel libunwind-devel
+ libxml2-devel python3-devel tiff-devel zlib-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+nocross="dimbuilder: command not found"
+
+do_check() {
+ cd build
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) ctest -E \
+ "pdal_(app_plugin|file_utils|filters_colorinterp|filters_stats|io_optech)_test" ;;
+ x86_64*) ctest -E 'pdal_app_plugin_test' ;;
+ *) ctest ;;
+ esac
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From 4f8ac0d31384ff0f17762ed6270cc410103acc7d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 43967b3ca85f53e80b37d2203729882097bd1e03 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 cca62c9d0ae43..0faa6d9e4c9ee 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4058,6 +4058,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 e34c4e5502999812ec45d68113af48889b7b3fd9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
srcpkgs/qgis/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..d12cf9b841f1f
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,37 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (74 preceding siblings ...)
2023-11-14 18:47 ` ar-jan
@ 2023-11-14 19:04 ` ar-jan
2023-11-14 21:10 ` ar-jan
` (6 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 11417 bytes --]
From 96b36bca9a8301b4b1654772e165ed6ed0d922c1 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
common/shlibs | 3 +++
srcpkgs/libgeotiff-devel | 1 +
srcpkgs/libgeotiff/template | 30 ++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libgeotiff-devel
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/common/shlibs b/common/shlibs
index 1a721780f8545..dff2d095d8927 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4269,3 +4269,6 @@ libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
+libgeotiff.so.5 libgeotiff-1.7.1_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
diff --git a/srcpkgs/libgeotiff-devel b/srcpkgs/libgeotiff-devel
new file mode 120000
index 0000000000000..192e7a87a2aed
--- /dev/null
+++ b/srcpkgs/libgeotiff-devel
@@ -0,0 +1 @@
+libgeotiff
\ No newline at end of file
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..1b3570404f454
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,30 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
+
+libgeotiff-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From 2ed195cca2e9919ba0a225d544e8237ff89636ef Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..fd6d26cf33649
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,25 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From 68c4912882351c130ed95c35001a87a693628e1e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 42 +++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..319f004325c96
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,42 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel libgdal-devel libgeotiff-devel libunwind-devel
+ libxml2-devel python3-devel tiff-devel zlib-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+nocross="dimbuilder: command not found"
+
+do_check() {
+ cd build
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) ctest -E \
+ "pdal_(app_plugin|file_utils|filters_colorinterp|filters_stats|io_optech)_test" ;;
+ x86_64*) ctest -E 'pdal_app_plugin_test' ;;
+ *) ctest ;;
+ esac
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From 0d0ee95541782e17ad2e85a744e7b170757ed747 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 1711b8a2ae06394574a93aba3c817382c7f13bda Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 dff2d095d8927..281e22de8ba06 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4058,6 +4058,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 dd4843e5ca08d51cb0386b26d38d106c4d23484b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
srcpkgs/qgis/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..d12cf9b841f1f
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,37 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (75 preceding siblings ...)
2023-11-14 19:04 ` ar-jan
@ 2023-11-14 21:10 ` ar-jan
2023-11-15 17:49 ` [PR REVIEW] " classabbyamp
` (5 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-14 21:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 11847 bytes --]
From 96b36bca9a8301b4b1654772e165ed6ed0d922c1 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
common/shlibs | 3 +++
srcpkgs/libgeotiff-devel | 1 +
srcpkgs/libgeotiff/template | 30 ++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libgeotiff-devel
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/common/shlibs b/common/shlibs
index 1a721780f8545..dff2d095d8927 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4269,3 +4269,6 @@ libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
+libgeotiff.so.5 libgeotiff-1.7.1_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
diff --git a/srcpkgs/libgeotiff-devel b/srcpkgs/libgeotiff-devel
new file mode 120000
index 0000000000000..192e7a87a2aed
--- /dev/null
+++ b/srcpkgs/libgeotiff-devel
@@ -0,0 +1 @@
+libgeotiff
\ No newline at end of file
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..1b3570404f454
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,30 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
+
+libgeotiff-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From 9a5085bafe7f34dab4ccb2273cdf85610d17f23c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
common/shlibs | 1 +
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 25 +++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/common/shlibs b/common/shlibs
index dff2d095d8927..76eab603a3823 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4270,5 +4270,6 @@ libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
libgeotiff.so.5 libgeotiff-1.7.1_1
+libdraco.so.8 draco-1.5.6_1
libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..fd6d26cf33649
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,25 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From ceef59ee6c98365a04f69f29bb0738bea4e19b32 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 42 +++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..319f004325c96
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,42 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+build_style=cmake
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel libgdal-devel libgeotiff-devel libunwind-devel
+ libxml2-devel python3-devel tiff-devel zlib-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+nocross="dimbuilder: command not found"
+
+do_check() {
+ cd build
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) ctest -E \
+ "pdal_(app_plugin|file_utils|filters_colorinterp|filters_stats|io_optech)_test" ;;
+ x86_64*) ctest -E 'pdal_app_plugin_test' ;;
+ *) ctest ;;
+ esac
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From ac6896b5523a562b9d051b46426d5479a2ec7713 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 2b6c1b9307b589abeaa61a962f64a588aea0c4df Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 76eab603a3823..c4a090b04798f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4058,6 +4058,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 4b572f3d60d5a70d324c4fb7fadf3ff75dffee07 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
srcpkgs/qgis/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..d12cf9b841f1f
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,37 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (77 preceding siblings ...)
2023-11-15 17:49 ` [PR REVIEW] " classabbyamp
@ 2023-11-15 17:49 ` classabbyamp
2023-11-15 18:16 ` classabbyamp
` (3 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-15 17:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1394551400
Comment:
```suggestion
build_style=cmake
build_helper="qemu"
```
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR REVIEW] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (76 preceding siblings ...)
2023-11-14 21:10 ` ar-jan
@ 2023-11-15 17:49 ` classabbyamp
2023-11-15 17:49 ` classabbyamp
` (4 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-15 17:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#discussion_r1394551639
Comment:
```suggestion
```
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (78 preceding siblings ...)
2023-11-15 17:49 ` classabbyamp
@ 2023-11-15 18:16 ` classabbyamp
2023-11-15 18:16 ` classabbyamp
` (2 subsequent siblings)
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-15 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1813027971
Comment:
QGIS will still be nocross due to grass, but getting grass to work on cross is much less trivial and i'm not going to bother with that for now
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (79 preceding siblings ...)
2023-11-15 18:16 ` classabbyamp
@ 2023-11-15 18:16 ` classabbyamp
2023-11-15 22:41 ` [PR PATCH] [Updated] " ar-jan
2023-11-16 20:26 ` [PR PATCH] [Merged]: " classabbyamp
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-15 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/41812#issuecomment-1813027971
Comment:
QGIS will still be (implicit) nocross due to grass, but getting grass to work on cross is much less trivial and i'm not going to bother with that for now
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Updated] New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (80 preceding siblings ...)
2023-11-15 18:16 ` classabbyamp
@ 2023-11-15 22:41 ` ar-jan
2023-11-16 20:26 ` [PR PATCH] [Merged]: " classabbyamp
82 siblings, 0 replies; 84+ messages in thread
From: ar-jan @ 2023-11-15 22:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages qgis
https://github.com/void-linux/void-packages/pull/41812
New package: QGIS
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
A patch file from https://github.com/void-linux/void-packages/pull/41812.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qgis-41812.patch --]
[-- Type: text/x-diff, Size: 11827 bytes --]
From 96b36bca9a8301b4b1654772e165ed6ed0d922c1 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:18:15 +0100
Subject: [PATCH 1/6] New package: libgeotiff-1.7.1
---
common/shlibs | 3 +++
srcpkgs/libgeotiff-devel | 1 +
srcpkgs/libgeotiff/template | 30 ++++++++++++++++++++++++++++++
3 files changed, 34 insertions(+)
create mode 120000 srcpkgs/libgeotiff-devel
create mode 100644 srcpkgs/libgeotiff/template
diff --git a/common/shlibs b/common/shlibs
index 1a721780f8545..dff2d095d8927 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4269,3 +4269,6 @@ libgrass_vector.8.3.so grass-8.3.0_1
libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
+libgeotiff.so.5 libgeotiff-1.7.1_1
+libpdal_base.so.15 libpdal-2.5.6_1
+libpdal_util.so.15 libpdal-2.5.6_1
diff --git a/srcpkgs/libgeotiff-devel b/srcpkgs/libgeotiff-devel
new file mode 120000
index 0000000000000..192e7a87a2aed
--- /dev/null
+++ b/srcpkgs/libgeotiff-devel
@@ -0,0 +1 @@
+libgeotiff
\ No newline at end of file
diff --git a/srcpkgs/libgeotiff/template b/srcpkgs/libgeotiff/template
new file mode 100644
index 0000000000000..1b3570404f454
--- /dev/null
+++ b/srcpkgs/libgeotiff/template
@@ -0,0 +1,30 @@
+# Template file for 'libgeotiff'
+pkgname=libgeotiff
+version=1.7.1
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config"
+makedepends="proj-devel tiff-devel sqlite-devel"
+short_desc="TIFF based interchange format for georeferenced raster imagery"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="MIT"
+homepage="https://github.com/OSGeo/libgeotiff"
+distfiles="https://github.com/OSGeo/libgeotiff/releases/download/${version}/libgeotiff-${version}.tar.gz"
+checksum=05ab1347aaa471fc97347d8d4269ff0c00f30fa666d956baba37948ec87e55d6
+
+post_install() {
+ vlicense LICENSE
+ vmkdir usr/share/doc/libgeotiff
+ mv $DESTDIR/usr/doc/ $DESTDIR/usr/share/doc/libgeotiff/
+}
+
+libgeotiff-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From 9a5085bafe7f34dab4ccb2273cdf85610d17f23c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:26:58 +0100
Subject: [PATCH 2/6] New package: draco-1.5.6
---
common/shlibs | 1 +
srcpkgs/draco-devel | 1 +
srcpkgs/draco/template | 25 +++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/draco-devel
create mode 100644 srcpkgs/draco/template
diff --git a/common/shlibs b/common/shlibs
index dff2d095d8927..76eab603a3823 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4270,5 +4270,6 @@ libvpl.so.2 oneVPL-2023.3.1_1
libusrsctp.so.2 usrsctp-0.9.5.0_1
libdatachannel.so.0.19.1 libdatachannel-0.19.1_1
libgeotiff.so.5 libgeotiff-1.7.1_1
+libdraco.so.8 draco-1.5.6_1
libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
diff --git a/srcpkgs/draco-devel b/srcpkgs/draco-devel
new file mode 120000
index 0000000000000..3aaa74d8def03
--- /dev/null
+++ b/srcpkgs/draco-devel
@@ -0,0 +1 @@
+draco
\ No newline at end of file
diff --git a/srcpkgs/draco/template b/srcpkgs/draco/template
new file mode 100644
index 0000000000000..fd6d26cf33649
--- /dev/null
+++ b/srcpkgs/draco/template
@@ -0,0 +1,25 @@
+# Template file for 'draco'
+pkgname=draco
+version=1.5.6
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+hostmakedepends="pkg-config python3"
+short_desc="Library to compress/decompress 3D geometric meshes, point clouds"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://google.github.io/draco/"
+distfiles="https://github.com/google/draco/archive/refs/tags/${version}.tar.gz"
+checksum=0280888e5b8e4c4fb93bf40e65e4e8a1ba316a0456f308164fb5c2b2b0c282d6
+
+draco-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove usr/share/cmake
+ }
+}
From fec85dbb20dbdfb3e5b70f2c4d0f10c40725ada5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 12 Nov 2023 17:20:28 +0100
Subject: [PATCH 3/6] New package: libpdal-2.5.6
---
srcpkgs/libpdal-devel | 1 +
srcpkgs/libpdal/libpdal-devel | 1 +
srcpkgs/libpdal/template | 42 +++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+)
create mode 120000 srcpkgs/libpdal-devel
create mode 120000 srcpkgs/libpdal/libpdal-devel
create mode 100644 srcpkgs/libpdal/template
diff --git a/srcpkgs/libpdal-devel b/srcpkgs/libpdal-devel
new file mode 120000
index 0000000000000..65613a704ddfb
--- /dev/null
+++ b/srcpkgs/libpdal-devel
@@ -0,0 +1 @@
+libpdal
\ No newline at end of file
diff --git a/srcpkgs/libpdal/libpdal-devel b/srcpkgs/libpdal/libpdal-devel
new file mode 120000
index 0000000000000..656a16af8e292
--- /dev/null
+++ b/srcpkgs/libpdal/libpdal-devel
@@ -0,0 +1 @@
+libpdal-devel
\ No newline at end of file
diff --git a/srcpkgs/libpdal/template b/srcpkgs/libpdal/template
new file mode 100644
index 0000000000000..812729bbd7ccb
--- /dev/null
+++ b/srcpkgs/libpdal/template
@@ -0,0 +1,42 @@
+# Template file for 'libpdal'
+pkgname=libpdal
+version=2.5.6
+revision=1
+build_style=cmake
+build_helper="qemu"
+hostmakedepends="pkg-config"
+makedepends="libcurl-devel libgdal-devel libgeotiff-devel libunwind-devel
+ libxml2-devel python3-devel tiff-devel zlib-devel"
+checkdepends="libgdal-tools"
+short_desc="Point Data Abstraction Library"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pdal.io/"
+distfiles="https://github.com/PDAL/PDAL/releases/download/${version}/PDAL-${version}-src.tar.gz"
+checksum=c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85
+
+do_check() {
+ cd build
+ case "$XBPS_TARGET_MACHINE" in
+ i686*) ctest -E \
+ "pdal_(app_plugin|file_utils|filters_colorinterp|filters_stats|io_optech)_test" ;;
+ x86_64*) ctest -E 'pdal_app_plugin_test' ;;
+ *) ctest ;;
+ esac
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+libpdal-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/bin/pdal-config
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
From e8ca2d50b5ae2d5f9120f2d930b59e012c58748e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 21:55:23 +0100
Subject: [PATCH 4/6] 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 <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 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 <arjanmossel@gmail.com>"
+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 cda4d3d749776cf276fff56b7a8a9a26ff152dc8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sun, 6 Nov 2022 12:24:57 +0100
Subject: [PATCH 5/6] 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 76eab603a3823..c4a090b04798f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4058,6 +4058,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 f9b334bf85522f24b74fbc31590b3f1410b78e63 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Sat, 5 Nov 2022 20:02:59 +0100
Subject: [PATCH 6/6] New package: qgis-3.34.0
---
srcpkgs/qgis/template | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 srcpkgs/qgis/template
diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template
new file mode 100644
index 0000000000000..d12cf9b841f1f
--- /dev/null
+++ b/srcpkgs/qgis/template
@@ -0,0 +1,37 @@
+# Template file for 'qgis'
+pkgname=qgis
+version=3.34.0
+revision=1
+build_style=cmake
+configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
+ -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-sip-PyQt5 sip"
+makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
+ gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
+ minizip-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-urllib3 python3-yaml qca-qt5-ossl qt5-plugin-sqlite"
+short_desc="QGIS - A Free and Open Source Geographic Information System"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="GPL-2.0-only"
+homepage="https://qgis.org"
+distfiles="https://github.com/qgis/QGIS/archive/final-${version//./_}.tar.gz"
+checksum=013c46f3da435e3965a5095425c5c02f680e5e05c245cfbe44d8f33b085adc81
+
+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/
+}
^ permalink raw reply [flat|nested] 84+ messages in thread
* Re: [PR PATCH] [Merged]: New package: QGIS
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
` (81 preceding siblings ...)
2023-11-15 22:41 ` [PR PATCH] [Updated] " ar-jan
@ 2023-11-16 20:26 ` classabbyamp
82 siblings, 0 replies; 84+ messages in thread
From: classabbyamp @ 2023-11-16 20:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1153 bytes --]
There's a merged pull request on the void-packages repository
New package: QGIS
https://github.com/void-linux/void-packages/pull/41812
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **yes**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New packages:
- QGIS
- libkml
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Completed: ~Depends on #31620 being updated/merged.~
^ permalink raw reply [flat|nested] 84+ messages in thread
end of thread, other threads:[~2023-11-16 20:26 UTC | newest]
Thread overview: 84+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-22 21:21 [PR PATCH] Qgis ar-jan
2023-01-28 20:33 ` [PR PATCH] [Updated] New package: qgis-3.28.2 ar-jan
2023-01-28 20:34 ` ar-jan
2023-01-28 20:43 ` ar-jan
2023-01-28 22:28 ` [PR PATCH] [Updated] New package: qgis-3.28.3 ar-jan
2023-04-18 19:47 ` ar-jan
2023-04-18 19:59 ` [PR PATCH] [Updated] New package: QGIS ar-jan
2023-04-29 15:26 ` ar-jan
2023-04-29 15:29 ` ar-jan
2023-04-29 15:30 ` ar-jan
2023-05-12 23:46 ` cinerion
2023-05-13 7:42 ` ar-jan
2023-06-20 8:22 ` ar-jan
2023-06-24 13:10 ` [PR PATCH] [Updated] " ar-jan
2023-06-24 13:11 ` ar-jan
2023-07-23 8:22 ` [PR PATCH] [Updated] " ar-jan
2023-07-23 8:22 ` ar-jan
2023-07-25 8:12 ` [PR PATCH] [Updated] " ar-jan
2023-07-28 0:40 ` classabbyamp
2023-07-28 12:40 ` ar-jan
2023-07-28 12:41 ` ar-jan
2023-07-28 12:45 ` ar-jan
2023-07-28 12:48 ` classabbyamp
2023-07-28 20:41 ` ar-jan
2023-07-28 20:50 ` classabbyamp
2023-07-28 21:04 ` ar-jan
2023-07-30 13:59 ` nezos
2023-07-30 14:01 ` nezos
2023-07-31 14:44 ` ar-jan
2023-07-31 14:44 ` ar-jan
2023-09-19 22:15 ` ar-jan
2023-09-19 22:16 ` ar-jan
2023-09-20 8:23 ` 0x5c
2023-09-20 14:13 ` ar-jan
2023-09-20 14:58 ` 0x5c
2023-09-20 15:19 ` 0x5c
2023-09-24 14:56 ` ar-jan
2023-09-24 15:02 ` ar-jan
2023-09-27 6:44 ` classabbyamp
2023-09-27 6:44 ` classabbyamp
2023-09-27 16:45 ` ar-jan
2023-09-27 22:18 ` [PR PATCH] [Updated] " ar-jan
2023-09-27 22:41 ` [PR REVIEW] " classabbyamp
2023-09-28 17:44 ` [PR PATCH] [Updated] " ar-jan
2023-09-28 17:45 ` [PR REVIEW] " ar-jan
2023-09-28 17:56 ` ar-jan
2023-09-28 17:57 ` ar-jan
2023-09-29 4:58 ` nezos
2023-09-29 5:01 ` nezos
2023-09-29 7:28 ` ar-jan
2023-09-30 4:27 ` nezos
2023-09-30 4:27 ` nezos
2023-11-01 20:30 ` nezos
2023-11-01 20:38 ` ar-jan
2023-11-01 20:39 ` ar-jan
2023-11-04 9:37 ` nezos
2023-11-12 19:36 ` [PR PATCH] [Updated] " ar-jan
2023-11-12 19:41 ` ar-jan
2023-11-12 21:10 ` ar-jan
2023-11-12 21:15 ` ar-jan
2023-11-12 21:48 ` [PR PATCH] [Updated] " ar-jan
2023-11-14 7:09 ` [PR REVIEW] " classabbyamp
2023-11-14 7:09 ` classabbyamp
2023-11-14 7:09 ` classabbyamp
2023-11-14 7:09 ` classabbyamp
2023-11-14 7:09 ` classabbyamp
2023-11-14 12:17 ` ar-jan
2023-11-14 12:37 ` ar-jan
2023-11-14 12:39 ` ar-jan
2023-11-14 12:41 ` ar-jan
2023-11-14 13:50 ` classabbyamp
2023-11-14 13:50 ` classabbyamp
2023-11-14 18:28 ` ar-jan
2023-11-14 18:30 ` ar-jan
2023-11-14 18:46 ` [PR PATCH] [Updated] " ar-jan
2023-11-14 18:47 ` ar-jan
2023-11-14 19:04 ` ar-jan
2023-11-14 21:10 ` ar-jan
2023-11-15 17:49 ` [PR REVIEW] " classabbyamp
2023-11-15 17:49 ` classabbyamp
2023-11-15 18:16 ` classabbyamp
2023-11-15 18:16 ` classabbyamp
2023-11-15 22:41 ` [PR PATCH] [Updated] " ar-jan
2023-11-16 20:26 ` [PR PATCH] [Merged]: " classabbyamp
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).