diff --git a/common/shlibs b/common/shlibs index 584309d824d7fe..27bea227c513a0 100644 --- a/common/shlibs +++ b/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 diff --git a/srcpkgs/libblend2d-devel b/srcpkgs/libblend2d-devel new file mode 120000 index 00000000000000..4fe88aa1afa7c4 --- /dev/null +++ b/srcpkgs/libblend2d-devel @@ -0,0 +1 @@ +libblend2d \ No newline at end of file diff --git a/srcpkgs/libblend2d/template b/srcpkgs/libblend2d/template new file mode 100644 index 00000000000000..a967db1c60f4e6 --- /dev/null +++ b/srcpkgs/libblend2d/template @@ -0,0 +1,22 @@ +# 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 + -DBLEND2D_STATIC=OFF" +short_desc="High performance 2D vector graphics engine" +maintainer="Vassilios Grigoriadis " +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 + } +} diff --git a/srcpkgs/qgis/patches/ftbfs.patch b/srcpkgs/qgis/patches/ftbfs.patch deleted file mode 100644 index 0aa578ed121254..00000000000000 --- a/srcpkgs/qgis/patches/ftbfs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/python/gui/auto_generated/processing/qgsprocessinggui.sip.in -+++ b/python/gui/auto_generated/processing/qgsprocessinggui.sip.in -@@ -17,6 +17,10 @@ components. - - .. versionadded:: 3.4 - %End -+ -+%TypeHeaderCode -+#include "qgsprocessinggui.h" -+%End - public: - - }; diff --git a/srcpkgs/qgis/template b/srcpkgs/qgis/template index f0816231092a0a..30a86b6aeb68ec 100644 --- a/srcpkgs/qgis/template +++ b/srcpkgs/qgis/template @@ -1,47 +1,66 @@ # Template file for 'qgis' pkgname=qgis -version=3.44.4 -revision=4 +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 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-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite + qt6-multimedia-devel qt6-webengine qt6-webengine-devel libblend2d-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 " 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=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" -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 +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() {