diff --git a/testing/qgis/30-yarn.patch b/testing/qgis/30-yarn.patch new file mode 100644 index 00000000000..865307ee6cb --- /dev/null +++ b/testing/qgis/30-yarn.patch @@ -0,0 +1,15 @@ +Author: Holger Jaekel +Summary: @achrinza/node-ipc@9.2.9 explicitly restricts the allowed Node.js versions to <= 22 +---- + +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -47,7 +47,7 @@ + # add_custom_command does not support OUTPUT_QUIET, so we need to make a cmake subcommand first: + file(WRITE ${CMAKE_BINARY_DIR}/yarn_commands.cmake + "execute_process( +- COMMAND ${YARN} install --frozen-lockfile ++ COMMAND ${YARN} install --frozen-lockfile --ignore-engines + WORKING_DIRECTORY ${LANDINGPAGE_OUTPUT_PATH} + OUTPUT_QUIET + ERROR_FILE ${CMAKE_BINARY_DIR}/yarn_error.log diff --git a/testing/qgis/40-qt6.10.patch b/testing/qgis/40-qt6.10.patch new file mode 100644 index 00000000000..a9a16dc0a1d --- /dev/null +++ b/testing/qgis/40-qt6.10.patch @@ -0,0 +1,35 @@ +From fcf60029534c880abb88390460c85c4131e7d4d6 Mon Sep 17 00:00:00 2001 +From: t0b3 +Date: Wed, 26 Nov 2025 11:51:34 +0100 +Subject: [PATCH] fix: support private Qt6Sql headers with Qt 6.10 + +--- + CMakeLists.txt | 2 +- + external/qspatialite/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9a622f343bb2..08e38fd854cc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -622,7 +622,7 @@ if(WITH_CORE) + + find_package(${QT_VERSION_BASE} COMPONENTS Core Gui Widgets Network Xml Svg Concurrent Test Sql Positioning REQUIRED) + if (BUILD_WITH_QT6) +- find_package(${QT_VERSION_BASE} COMPONENTS Core5Compat REQUIRED) ++ find_package(${QT_VERSION_BASE} COMPONENTS Core5Compat SqlPrivate REQUIRED) + endif() + + if (NOT IOS) +diff --git a/external/qspatialite/CMakeLists.txt b/external/qspatialite/CMakeLists.txt +index 489a41f6cc33..bdd11db4a6d7 100644 +--- a/external/qspatialite/CMakeLists.txt ++++ b/external/qspatialite/CMakeLists.txt +@@ -5,6 +5,7 @@ add_definitions(${QT_DEFINITIONS}) + add_definitions(-DQT_PLUGIN) + add_definitions(-DQT_SHARED) + ++find_package(${QT_VERSION_BASE}Sql CONFIG) + include_directories(SYSTEM ${${QT_VERSION_BASE}Sql_PRIVATE_INCLUDE_DIRS}) + + set(QSQLSPATIALITE_SRC qsql_spatialite.cpp smain.cpp qsql_spatialite.h smain.h) diff --git a/testing/qgis/APKBUILD b/testing/qgis/APKBUILD index c6e7ce5965a..04de0d6e9e0 100644 --- a/testing/qgis/APKBUILD +++ b/testing/qgis/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Holger Jaekel maintainer="Holger Jaekel " pkgname=qgis -pkgver=3.44.4 +pkgver=3.44.5 pkgrel=0 pkgdesc="Geographic Information System (GIS) that supports vector, raster & database formats" url="https://qgis.org/" @@ -72,6 +72,8 @@ options="!check" # test failures on builders source="https://qgis.org/downloads/qgis-$pkgver.tar.bz2 10-libspatialindex_2_1.patch 20-qgstyle-infinite-loop.patch + 30-yarn.patch + 40-qt6.10.patch " langdir="/usr/share/qgis/i18n" @@ -258,7 +260,9 @@ py3() { } sha512sums=" -2760087dfaecb5d90ee10b09eac9ba27f05d4ef486b5d8802d960d0c8e2d16ea023afcf00c55396d43bdf5f10c0b2ba974fff3662386eff6df98092a0240bfa5 qgis-3.44.4.tar.bz2 +5955ef7f3f79571efda149c23d95b4ac320ba38c218fed3493dde0b8e721ce895cdbab6245e300086c22d063cfdc46151381a08ce4dd4f73092cbb156bf8f5d8 qgis-3.44.5.tar.bz2 94c116af7c944320ff4a4ce7e9c50494eba0d0f1d77a41d7ac214e3d1f060487695c8d2b7dee87cd51d06715c333dcbeecf3290c1f54664571085d4fa52b71a6 10-libspatialindex_2_1.patch 82e6c1bef90a12872c31264299f2102a27ad13eba197632aa65e54645e800d79395c8c25cbfb90ff34ac1f32a33f3c718c1202493aef8a57a89d2dad57925d6a 20-qgstyle-infinite-loop.patch +23d1fdcca8b3115499472c92230a471ab54b1b27139b38a90edb93dccf3eda121f4e6f6160d52ac3a210d275848c6730ce52498f6000ad808f1235c0576f96e1 30-yarn.patch +ddfeefc83aaa3e778db948af29823f8376096554006f796269bef2a29cc3739549a7fa2019f732779334b438b6c9f86386e3c952c8633f65ab9d488f01f693d7 40-qt6.10.patch "