split to blend2d with devel package | qgis

Author: nezos

common/shlibs

@@ -4587,3 +4587,4 @@ libgpiodcxx.so.2 libgpiod-2.2_4
 libigloo.so.0 libigloo-0.9.5_1
 libfyaml.so.0 libfyaml-0.9.6_1
 libcpptrace.so.1 cpptrace-1.0.4_1
+libblend2d.so libblend2d-libblend2d-0.21.2_1

srcpkgs/libblend2d-devel

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

srcpkgs/libblend2d-devel/template srcpkgs/libblend2d/templatesrcpkgs/libblend2d-devel/template renamed to srcpkgs/libblend2d/template

@@ -1,13 +1,22 @@
-# Template file for 'libblend2d-devel'
-pkgname=libblend2d-devel
+# Template file for 'libblend2d'
+pkgname=libblend2d
 version=0.21.2
 revision=1
 build_style=cmake
 configure_args="-DBLEND2D_TEST=OFF -DBLEND2D_DEMOS=OFF -DBLEND2D_STATIC=ON
-		-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
+ -DBLEND2D_STATIC=OFF"
 short_desc="High performance 2D vector graphics engine"
-maintainer="Orphaned <you@example.com>"
+maintainer="Vassilios Grigoriadis <nezos@hotmail.com>"
 license="Zlib"
 homepage="https://blend2d.com"
 distfiles="https://blend2d.com/download/blend2d-${version}.tar.gz"
 checksum=234ba57a64153c96885a6271f15fdcf6c594ac8cb03adaad19abb8d3b2b533fa
+
+libblend2d-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

srcpkgs/qgis/template

@@ -1,20 +1,28 @@
 # Template file for 'qgis'
 pkgname=qgis
-version=4.0.2
+version=4.0.3
 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
  -DPDF4QT_INSTALL_TO_USR=OFF
- -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass"
+ -DQT_HOST_PATH=/usr
+ -DQT_REG_EXE_PATH=/usr/lib/qt6/libexec/qmltyperegistrar
+ -DQT_LRELEASE_EXECUTABLE=/usr/lib/qt6/bin/lrelease
+ -DQt6_LRELEASE_EXECUTABLE=/usr/lib/qt6/bin/lrelease
+ -DQT_LRELEASE_PATH=/usr/lib/qt6/bin
+ $(vopt_if grass '-DWITH_GRASS=ON -DGRASS_PREFIX8=${XBPS_CROSS_BASE}/usr/lib/grass' -DWITH_GRASS=OFF)"
 _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"
-hostmakedepends="bison flex pkg-config protobuf python3 python3-pyqt6-sip sip"
+hostmakedepends="bison flex pkg-config protobuf python3 python3-pyqt6-sip sip
+ qt6-tools-devel qt6-base-devel python3-pyqt6 python3-pyqt6-qsci python3-pyqt6-gui
+ python3-pyqt6-widgets python3-pyqt6-printsupport python3-PyQt-builder
+ python3-pyqt6-bindings python3-pyqt6-qsci-devel qt6-declarative-devel"
 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 hdf5-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
  proj-devel protobuf-devel python3-devel python3-PyQt-builder
@@ -24,19 +32,36 @@ makedepends="exiv2-devel draco-devel expat-devel freexl-devel geos-devel
  qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite OpenCL-CLHPP
  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
+ python3-devel sqlite-devel zlib-devel libopenjpeg2-devel libblend2d"
+depends="libgdal-python3 python3-dateutil python3-yaml
+ python3-Jinja2 python3-numpy python3-owslib python3-Pillow
  python3-psycopg2 python3-Pygments python3-pytz python3-requests python3-urllib3
- ${_pyqt} qca-qt6 qt6-plugin-sqlite qt6-plugin-tls-openssl"
+ ${_pyqt} qca-qt6 qt6-plugin-sqlite qt6-plugin-tls-openssl
+ $(vopt_if grass grass-devel)"
 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=1800a4ad63224821d4b391b87cc53cc8a53c8626193fde8235934c81223e617e
-lib32disabled=yes
-nocross="due to grass"
+checksum=825ee7ebbdb9cebe2a446f8ffde0e9b7b4523249965e36106f55d3f96a21186f
+build_options="grass"
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*) build_options_default="" ;;
+ *) build_options_default="grass" ;;
+esac
+desc_option_grass="Enable GRASS GIS support"
+
+if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then
+	broken="QGIS no longer supports 32-bit"
+fi
+
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		mkdir -p ${XBPS_CROSS_BASE}/usr/lib64/qt6/bin
+		rm -f ${XBPS_CROSS_BASE}/usr/lib64/qt6/bin/lrelease
+		ln -sf /usr/lib/qt6/bin/lrelease ${XBPS_CROSS_BASE}/usr/lib64/qt6/bin/lrelease
+	fi
+}
 
 post_install() {
 	mv ${DESTDIR}/usr/share/qgis/python ${DESTDIR}/usr/lib/qgis/