qgis: update to 4.2.1; sip: update to 6.16.1; New package: libblend2d-0.21.2

common/shlibs

@@ -4612,3 +4612,4 @@ libfyaml.so.0 libfyaml-0.9.6_1
 libcpptrace.so.1 cpptrace-1.0.4_1
 libcgif.so.0 cgif-0.5.3_1
 libdsk.so.5 libdsk-1.5.22_1
+libblend2d.so libblend2d-0.21.2_1

srcpkgs/libblend2d-devel

@@ -0,0 +1 @@
+libblend2d

srcpkgs/libblend2d/template

@@ -0,0 +1,33 @@
+# Template file for 'libblend2d'
+pkgname=libblend2d
+version=0.21.2
+revision=1
+build_style=cmake
+configure_args="-DBLEND2D_STATIC=OFF -DBLEND2D_DEMOS=OFF
+ -DBLEND2D_EXTERNAL_ASMJIT=OFF"
+short_desc="High-performance 2D vector graphics engine with JIT compiler"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+license="Zlib"
+homepage="https://blend2d.com/"
+distfiles="https://blend2d.com/download/blend2d-${version}.tar.gz"
+checksum=234ba57a64153c96885a6271f15fdcf6c594ac8cb03adaad19abb8d3b2b533fa
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -DBLEND2D_TEST=ON"
+else
+	configure_args+=" -DBLEND2D_TEST=OFF"
+fi
+
+post_install() {
+	vlicense LICENSE.md
+	vlicense 3rdparty/asmjit/LICENSE.md asmjit-LICENSE.md
+}
+
+libblend2d-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

srcpkgs/qgis/patches/cross-python.patch

@@ -0,0 +1,28 @@
+QGIS enables CMake policies through 4.3, so CMP0190 is NEW.
+We need separate target Development and host Interpreter lookups.
+https://cmake.org/cmake/help/latest/module/FindPython.html
+https://cmake.org/cmake/help/latest/policy/CMP0190.html
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -952,7 +952,19 @@ set(MIN_PYTHON_VERSION "3.11")
+ set(Python_FIND_FRAMEWORK "LAST")
+
+ if (WITH_BINDINGS)
+-  find_package(Python ${MIN_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development)
++  if(CMAKE_CROSSCOMPILING)
++    find_package(Python ${MIN_PYTHON_VERSION} REQUIRED COMPONENTS Development)
++    set(Python_ARTIFACTS_PREFIX "_HOST")
++    find_package(Python ${MIN_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter)
++    set(Python_ARTIFACTS_PREFIX)
++
++    # Build-time scripts need the host interpreter, while Python::Python must
++    # continue to refer to the target development artifacts.
++    set(Python_EXECUTABLE "${Python_HOST_EXECUTABLE}")
++    set(Python_SITEARCH "${Python_HOST_SITEARCH}")
++  else()
++    find_package(Python ${MIN_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development)
++  endif()
+ else()
+   find_package(Python ${MIN_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter)
+ endif()

srcpkgs/qgis/template

@@ -1,48 +1,68 @@
 # Template file for 'qgis'
 pkgname=qgis
-version=3.44.4
-revision=6
+version=4.2.1
+revision=1
 build_style=cmake
-configure_args="-DENABLE_TESTS=OFF -DWITH_3D=True -DWITH_PDAL=True
- -DBUILD_WITH_QT6=ON -DWITH_PDF4QT=ON -DWITH_QTWEBKIT=NO
+configure_args="-DENABLE_TESTS=OFF
+ -DWITH_3D=True
+ -DWITH_PDAL=True
+ -DWITH_PDF4QT=ON
  -DPDF4QT_INSTALL_TO_USR=OFF
- -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+ $(vopt_bool qtwebengine WITH_QTWEBENGINE)
+ $(vopt_bool grass WITH_GRASS8)
+ $(vopt_if grass -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass)"
 _pyqt="python3-pyqt6 python3-pyqt6-gui python3-pyqt6-serialport
  python3-pyqt6-printsupport python3-pyqt6-multimedia python3-pyqt6-network
  python3-pyqt6-xml python3-pyqt6-declarative python3-pyqt6-sql
  python3-pyqt6-widgets python3-pyqt6-position python3-pyqt6-devel-tools
- python3-pyqt6-svg python3-pyqt6-qsci"
+ python3-pyqt6-svg python3-pyqt6-qsci python3-pyqt6-webchannel"
 hostmakedepends="bison flex pkg-config protobuf python3 python3-pyqt6-sip sip"
 makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
- gsl-devel grass-devel hdf5-devel libgdal-devel libpdal-devel librttopo-devel
+ gsl-devel $(vopt_if grass grass-devel) hdf5-devel libblend2d-devel
+ libgdal-devel libpdal-devel librttopo-devel
  libspatialindex-devel libspatialite-devel libxml2-devel libzip-devel
- minizip-devel netcdf-devel ocl-icd-devel postgresql-libs-devel
+ libzstd-devel minizip-devel netcdf-devel ocl-icd-devel OpenCL-CLHPP
+ postgresql-libs-devel
  proj-devel protobuf-devel python3-devel python3-PyQt-builder
  qt6-base-private-devel qt6-svg-devel qt6-position-devel qt6-qt5compat-devel
  qt6-declarative-devel qt6-serialport-devel qt6-3d-devel
- qt6-multimedia-devel
+ qt6-multimedia-devel $(vopt_if qtwebengine qt6-webengine-devel)
  qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite
  qscintilla-qt6-devel qtkeychain-qt6-devel qca-qt6-devel qwt-qt6-devel
  python3-pyqt6-bindings python3-pyqt6-qsci-devel python3-pyqt6-sip ${_pyqt}
- python3-devel sqlite-devel zlib-devel libopenjpeg2-devel"
-depends="libgdal-python3 python3-dateutil python3-dateutil python3-yaml
- python3-Jinja2 python3-numpy python3-numpy python3-owslib python3-Pillow
+ $(vopt_if qtwebengine python3-pyqt6-webengine)
+ sqlite-devel zlib-devel libopenjpeg2-devel"
+depends="libgdal-python3 python3-dateutil python3-yaml
+ python3-Jinja2 python3-numpy python3-owslib python3-packaging python3-Pillow
  python3-psycopg2 python3-Pygments python3-pytz python3-requests python3-urllib3
- ${_pyqt} qca-qt6 qt6-plugin-sqlite qt6-plugin-tls-openssl"
+ ${_pyqt} $(vopt_if qtwebengine python3-pyqt6-webengine)
+ qca-qt6 qt6-plugin-sqlite qt6-plugin-tls-openssl"
 short_desc="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=1396c84dd6c9c89c026de8b564319e0f6206c8bbc1b160bfdc0fdf49adb61748
-nocross="due to grass"
+checksum=47c66520e0027b6b5a2063bc924eae92e8149a8ea9f177cd674065e9401ac498
 
-post_configure() {
-	# No idea why the patch was removed on generated files
-	sed -i 's/[.]sip[.]in$/.sip/' ftbfs.patch
-	cd build
-	patch -Np1 -s -i ../ftbfs.patch
-}
+build_options="grass qtwebengine"
+desc_option_grass="Enable GRASS GIS support"
+desc_option_qtwebengine="Enable Qt6 WebEngine support"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default="grass"
+fi
+
+if [ "$XBPS_WORDSIZE$XBPS_WORDSIZE" = "64$XBPS_TARGET_WORDSIZE" ]; then
+	build_options+=" qtwebengine"
+	build_options_default+=" qtwebengine"
+fi
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" python3-PyQt-builder python3-pyqt6-devel
+	 python3-pyqt6-gui python3-pyqt6-printsupport python3-pyqt6-qsci-devel
+	 python3-pyqt6-widgets qt6-base qt6-declarative-host-tools qt6-tools"
+	configure_args+=" -DQt6LinguistTools_DIR=/usr/lib/cmake/Qt6LinguistTools"
+fi
 
 post_install() {
 	mv ${DESTDIR}/usr/share/qgis/python ${DESTDIR}/usr/lib/qgis/

srcpkgs/sip/template

@@ -1,7 +1,7 @@
 # Template file for 'sip'
 pkgname=sip
-version=6.14.0
-revision=2
+version=6.16.1
+revision=1
 build_style=python3-pep517
 hostmakedepends="python3-setuptools_scm python3-packaging"
 depends="python3-setuptools python3-packaging"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="BSD-2-Clause, BSD-3-Clause"
 homepage="https://riverbankcomputing.com/software/sip/intro"
 distfiles="${PYPI_SITE}/s/sip/sip-${version}.tar.gz"
-checksum=20c086aba387707b34cf47fd96d1a978d01e2b95807e86f8aaa960081f163b28
+checksum=0a739c9cd2929de4e0884456d8caf3cfb22c10534757c7797bd8dc6bd9ed69bc
 lib32disabled=yes
 replaces="sip5<=${version}_${revision}"
 provides="sip5-${version}_${revision}"