sci-geosciences/qgis: Drop 3.44.3 and upstreamed patch

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner 2025-11-28 20:45:15 +01:00
parent 264e32b18b
commit 58d6a792ba
No known key found for this signature in database
GPG Key ID: AE591BBC73E4DD5E
4 changed files with 0 additions and 533 deletions

View File

@ -1,3 +1,2 @@
DIST qgis-3.44.3.tar.bz2 187793769 BLAKE2B 4a4d1361717427fc5bb2f9ededa8c28c89c14a1a4fc00fc34ee61c7966a6f73e8e0d5850f3454b9cc1a986829c2c14af41b6a0bdaa70adb018bbeed3247213d4 SHA512 f995766fac0aa6db90d58e0a42a8180c31e996dfb0c4087279ee4928bcd2f3d3fd894f83d17719ca8a173f4f82f007baf46ca9de35cbfa48e5bc3a4e178cd5ea
DIST qgis-3.44.5.tar.bz2 190602610 BLAKE2B 70218904d368f93e2fb4acef8d84a91c2507ee185f6ac89074e353d75350a321ee13718dc8ce1ae9c2406448099a07b64325ade06b32339b49eb785a0d0da123 SHA512 5955ef7f3f79571efda149c23d95b4ac320ba38c218fed3493dde0b8e721ce895cdbab6245e300086c22d063cfdc46151381a08ce4dd4f73092cbb156bf8f5d8
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d

View File

@ -1,22 +0,0 @@
From 3ba46f8b10f2b33e2136bc8773f6628172b65804 Mon Sep 17 00:00:00 2001
From: Paul Zander <negril.nx+gentoo@gmail.com>
Date: Sun, 24 Aug 2025 11:41:16 +0200
Subject: [PATCH] include memory
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
diff --git a/src/core/pal/priorityqueue.h b/src/core/pal/priorityqueue.h
index 3386961..4bedbe8 100644
--- a/src/core/pal/priorityqueue.h
+++ b/src/core/pal/priorityqueue.h
@@ -34,6 +34,7 @@
#include <iostream>
+#include <memory>
#define LEFT(x) (2*x+1)
#define RIGHT(x) (2*x+2)
--
2.51.0

View File

@ -1,509 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging
PYTHON_COMPAT=( python3_{11..13} )
PYTHON_REQ_USE="sqlite"
# We only package the LTS releases right now
# We could package more but would ideally only stabilise the LTS ones
# at least.
if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"
inherit git-r3
else
SRC_URI="https://qgis.org/downloads/${P}.tar.bz2
examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )"
KEYWORDS="~amd64"
fi
inherit cmake flag-o-matic python-single-r1 xdg
DESCRIPTION="User friendly Geographic Information System"
HOMEPAGE="https://www.qgis.org/"
LICENSE="GPL-2+ GPL-3+"
SLOT="0"
IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal postgres python qml test webengine"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
mapserver? ( python )
"
# test? ( postgres )
RESTRICT="!test? ( test )"
# depends on abseil-cpp via protobuf targets
COMMON_DEPEND="
>=app-crypt/qca-2.3.7:2[qt6(+),ssl]
dev-cpp/abseil-cpp:=
>=dev-db/spatialite-4.2.0:=
dev-db/sqlite:3
dev-libs/expat
dev-libs/libzip:=
dev-libs/protobuf:=
>=dev-libs/qtkeychain-0.14.1-r1:=[qt6(+)]
dev-qt/qtbase:6[concurrent,gui,network,sql,ssl,widgets,xml]
dev-qt/qtmultimedia:6
dev-qt/qtpositioning:6
dev-qt/qtserialport:6
dev-qt/qtsvg:6
dev-qt/qttools:6[designer]
dev-vcs/git
media-gfx/exiv2:=
>=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite]
sci-libs/geos
sci-libs/libspatialindex:=
>=sci-libs/proj-8.1:=
virtual/zlib:=
>=dev-python/qscintilla-2.14.1-r1[qt6(+)]
>=x11-libs/qwt-6.2.0-r3:=[polar(+),qt6(+),svg(+)]
3d? ( dev-qt/qt3d:6 )
georeferencer? ( sci-libs/gsl:= )
grass? ( sci-geosciences/grass:= )
hdf5? ( sci-libs/hdf5:= )
mapserver? ( dev-libs/fcgi )
netcdf? ( sci-libs/netcdf:= )
opencl? ( virtual/opencl )
oracle? (
dev-db/oracle-instantclient:=
sci-libs/gdal:=[oracle]
)
pdal? ( sci-libs/pdal:= )
postgres? ( dev-db/postgresql:= )
python? (
${PYTHON_DEPS}
|| (
(
$(python_gen_cond_dep '
sci-libs/gdal[python,${PYTHON_USEDEP}]
')
)
>=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}]
)
$(python_gen_cond_dep '
dev-python/httplib2[${PYTHON_USEDEP}]
dev-python/jinja2[${PYTHON_USEDEP}]
dev-python/markupsafe[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/owslib[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
dev-python/pyqt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/qscintilla[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/sip:=[${PYTHON_USEDEP}]
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
')
)
qml? ( dev-qt/qtdeclarative:6 )
webengine? ( dev-qt/qtwebengine:6 )
"
DEPEND="${COMMON_DEPEND}
dev-cpp/nlohmann_json
test? ( python? (
app-text/poppler[cairo,utils]
app-text/qpdf
) )
"
RDEPEND="${COMMON_DEPEND}
sci-geosciences/gpsbabel
"
BDEPEND="${PYTHON_DEPS}
app-alternatives/lex
app-alternatives/yacc
dev-qt/qttools:6[linguist]
doc? ( app-text/doxygen )
test? ( python? (
$(python_gen_cond_dep '
dev-python/mock[${PYTHON_USEDEP}]
dev-python/nose2[${PYTHON_USEDEP}]
postgres? (
dev-python/psycopg:2[${PYTHON_USEDEP}]
)
dev-python/pyqt6[${PYTHON_USEDEP},testlib]
')
) )
"
PATCHES=(
"${FILESDIR}/${PN}-3.44.3-testReportDir.patch"
"${FILESDIR}/${PN}-3.44.3-include-memory.patch"
)
src_prepare() {
cmake_src_prepare
# Tests want to be run inside a git repo
if [[ ${PV} != *9999* ]]; then
if use test; then
git config set --append --global safe.directory "${S}" || die
git init -q --initial-branch="master" || die
git config set --local gc.auto 0 || die
git config set --local user.email "larry@gentoo.org" || die
git config set --local user.name "Larry the Cow" || die
git add . > /dev/null || die
git commit -m "init" > /dev/null || die
git tag -a -m "${PV}" "${PV}" || die
fi
fi
}
src_configure() {
# -Werror=strict-aliasing
# https://bugs.gentoo.org/862660
# https://github.com/qgis/QGIS/issues/56859
#
# Do not trust with LTO either
append-flags -fno-strict-aliasing
filter-lto
local mycmakeargs=(
-DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command
-DQGIS_MANUAL_SUBDIR=share/man/
-DQGIS_LIB_SUBDIR=$(get_libdir)
-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis
# -DQWT_INCLUDE_DIR=/usr/include/qwt6
# -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
# -DQGIS_QML_SUBDIR=/usr/$(get_libdir)/qt5/qml
-DPEDANTIC=OFF
-DUSE_CCACHE=OFF
-DUSE_PRECOMPILED_HEADERS=OFF
-DWITH_DRACO=OFF
-DWITH_QTWEBKIT=OFF
-DWITH_INTERNAL_NLOHMANN_JSON=OFF
-DBUILD_WITH_QT6=ON
-DWITH_ANALYSIS=ON
-DWITH_DESKTOP=ON
-DWITH_GUI=ON
-DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538
-DWITH_QSPATIALITE=ON
-DWITH_QWTPOLAR=ON
-DWITH_3D=$(usex 3d)
-DWITH_APIDOC=$(usex doc)
-DENABLE_TESTS=$(usex test)
-DWITH_GSL=$(usex georeferencer)
$(cmake_use_find_package hdf5 HDF5)
-DWITH_SERVER=$(usex mapserver)
$(cmake_use_find_package netcdf NetCDF)
-DUSE_OPENCL=$(usex opencl)
-DWITH_ORACLE=$(usex oracle)
-DWITH_PDAL=$(usex pdal)
-DWITH_POSTGRESQL=$(usex postgres)
-DWITH_BINDINGS=$(usex python)
-DWITH_PYTHON=$(usex python)
-DWITH_CUSTOM_WIDGETS=$(usex python)
-DWITH_QUICK=$(usex qml)
-DWITH_QTWEBENGINE=$(usex webengine)
)
# We list all supported versions *by upstream for this version*
# here, even if we're not allowing it (e.g. bugs for now), so
# we enable/disable all the right versions. This is so qgis doesn't
# try to automatically use a version the build system knows about.
local supported_grass_versions=( 7 8 )
if use grass; then
# We can do this because we have a := dep on grass &
# it changes subslot (ABI) when major versions change, so
# the logic here doesn't end up becoming stale.
readarray -d'-' -t f <<<"$(best_version sci-geosciences/grass)"
readarray -d'.' -t v <<<"${f[2]}"
grassdir="grass${v[0]}${v[1]}"
GRASSDIR=/usr/$(get_libdir)/${grassdir}
einfo "Supported versions: ${supported_grass_versions[*]}"
einfo "Found GRASS version: ${v[0]}*"
local known_grass_version
# GRASS isn't slotted (in Gentoo, anyway) so we pick
# the best version we can to build against, and disable the others.
for known_grass_version in "${supported_grass_versions[@]}" ; do
case "${known_grass_version}" in
"${v[0]}")
einfo "GRASS version ${known_grass_version} is supported. Enabling."
mycmakeargs+=(
"-DGRASS_PREFIX${known_grass_version}=${GRASSDIR}"
"-DWITH_GRASS${known_grass_version}=ON"
)
;;
*)
einfo "GRASS version ${known_grass_version} is not supported or not latest found. Disabling."
mycmakeargs+=(
"-DWITH_GRASS${known_grass_version}=OFF"
)
;;
esac
done
else
local known_grass_version
for known_grass_version in "${supported_grass_versions[@]}" ; do
mycmakeargs+=(
"-DWITH_GRASS${known_grass_version}=OFF"
)
done
fi
use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON )
cmake_src_configure
}
src_test() {
addwrite "/proc/self/mem"
addwrite "/proc/self/task/"
addwrite "/dev/fuse"
local -x CMAKE_SKIP_TESTS=(
"^ProcessingGdalAlgorithmsRasterTest$"
"^ProcessingGdalAlgorithmsVectorTest$"
"^ProcessingGrassAlgorithmsImageryTest$"
"^ProcessingGrassAlgorithmsRasterTestPt1$"
"^ProcessingGrassAlgorithmsRasterTestPt2$"
"^ProcessingGrassAlgorithmsVectorTest$"
"^ProcessingQgisAlgorithmsTestPt1$"
"^ProcessingQgisAlgorithmsTestPt4$"
"^PyQgsAFSProvider$"
"^PyQgsAnnotation$"
"^PyQgsAnnotationLineTextItem$"
"^PyQgsAnnotationPictureItem$"
"^PyQgsAnnotationPointTextItem$"
"^PyQgsAppStartup$"
"^PyQgsAuthenticationSystem$"
"^PyQgsAuxiliaryStorage$"
"^PyQgsColorRampLegendNode$"
"^PyQgsDelimitedTextProvider$"
"^PyQgsEditWidgets$"
"^PyQgsElevationProfileCanvas$"
"^PyQgsExternalStorageAwsS3$"
"^PyQgsExternalStorageWebDav$"
"^PyQgsGeometryGeneratorSymbolLayer$"
"^PyQgsGeometryPaintDevice$"
"^PyQgsGeometryTest$"
"^PyQgsGoogleMapsGeocoder$"
"^PyQgsLayoutAtlas$"
"^PyQgsLayoutElevationProfile$"
"^PyQgsLayoutHtml$"
"^PyQgsLayoutLegend$"
"^PyQgsLayoutMap$"
"^PyQgsLayoutMapGrid$"
"^PyQgsLinearReferencingSymbolLayer$"
"^PyQgsMapLayerComboBox$"
"^PyQgsMapLayerProxyModel$"
"^PyQgsMemoryProvider$"
"^PyQgsMeshLayer$"
"^PyQgsMeshLayerLabeling$"
"^PyQgsMeshLayerRenderer$"
"^PyQgsOGRProvider$"
"^PyQgsOapifProvider$"
"^PyQgsPalLabelingCanvas$"
"^PyQgsPalLabelingLayout$"
"^PyQgsPalLabelingPlacement$"
"^PyQgsPalLabelingServer$"
"^PyQgsPlot$"
"^PyQgsPointDisplacementRenderer$"
"^PyQgsProfileSourceRegistry$"
"^PyQgsPythonProvider$"
"^PyQgsRasterFileWriter$"
"^PyQgsRasterLabeling$"
"^PyQgsRasterLayerRenderer$"
"^PyQgsSelectiveMasking$"
"^PyQgsServerWFS$"
"^PyQgsServerWMSGetLegendGraphic$"
"^PyQgsServerWMSGetMap$"
"^PyQgsServerWMSGetPrint$"
"^PyQgsServerWMSGetPrintAtlas$"
"^PyQgsServerWMSGetPrintExtra$"
"^PyQgsServerWMSGetPrintOutputs$"
"^PyQgsSettings$"
"^PyQgsSettingsEntry$"
"^PyQgsShapefileProvider$"
"^PyQgsSipCoverage$"
"^PyQgsStyleModel$"
"^PyQgsSvgCache$"
"^PyQgsTextRenderer$"
"^PyQgsVectorFileWriter$"
"^PyQgsVectorLayer$"
"^PyQgsVectorLayerCache$"
"^PyQgsVectorLayerCache$"
"^PyQgsVectorLayerSelectedFeatureSource$"
"^PyQgsVectorLayerShapefile$"
"^PyQgsVirtualLayerProvider$"
"^PyQgsWFSProvider$"
"^PyQgsWFSProviderGUI$"
"^TestQgsRandomMarkerSymbolLayer$"
"^qgis_banned_keywords$"
"^qgis_class_names$"
"^qgis_grassprovidertest8$"
"^qgis_licenses$"
"^test_3d_3dcameracontroller$"
"^test_3d_3drendering$"
"^test_3d_3dutils$"
"^test_3d_layout3dmap$"
"^test_3d_mesh3drendering$"
"^test_3d_pointcloud3drendering$"
"^test_3d_rubberband3drendering$"
"^test_3d_tessellator$"
"^test_analysis_meshcontours$"
"^test_analysis_processing$"
"^test_analysis_processingalgspt2$"
"^test_analysis_triangulation$"
"^test_app_advanceddigitizing$"
"^test_app_applocatorfilters$"
"^test_app_maptoolcircularstring$"
"^test_app_qgisapp$"
"^test_app_qgisappclipboard$"
"^test_app_vertextool$"
"^test_core_callout$"
"^test_core_compositionconverter$"
"^test_core_elevationmap$"
"^test_core_expression$"
"^test_core_fontmarker$"
"^test_core_gdalutils$"
"^test_core_labelingengine$"
"^test_core_layoutlabel$"
"^test_core_layoutmanualtable$"
"^test_core_layoutmap$"
"^test_core_layoutmapgrid$"
"^test_core_layoutpicture$"
"^test_core_layoutscalebar$"
"^test_core_layouttable$"
"^test_core_legendrenderer$"
"^test_core_linefillsymbol$"
"^test_core_maprendererjob$"
"^test_core_maprotation$"
"^test_core_maptopixel$"
"^test_core_meshlayer$"
"^test_core_meshlayerrenderer$"
"^test_core_networkaccessmanager$"
"^test_core_pallabeling$"
"^test_core_pointcloudediting$"
"^test_core_project$"
"^test_core_projectstorage$"
"^test_core_rastercontourrenderer$"
"^test_core_rasterlayer$"
"^test_core_simplemarker$"
"^test_core_svgmarker$"
"^test_core_tiledownloadmanager$"
"^test_core_vectortilelayer$"
"^test_gui_newdatabasetablewidget$"
"^test_gui_processinggui$"
"^test_gui_queryresultwidget$"
"^test_gui_scalecombobox$"
"^test_provider_copcprovider$"
"^test_provider_wcsprovider$"
"^test_core_projectstorage$"
"^test_gui_filedownloader$"
"^PyQgsProcessExecutablePt1$"
"^PyQgsProcessExecutablePt2$"
"^PyQgsRasterAttributeTable$"
"^PyQgsAuthManagerOAuth2OWSTest$"
# git dirty
"^test_core_mesheditor$"
"^test_core_translateproject$"
"^test_app_maptooleditmesh$"
# very slow
"^qgis_sip_uptodate$"
)
if ! use netcdf; then
CMAKE_SKIP_TESTS+=(
"^test_core_gdalprovider$"
)
fi
if ! use hdf5; then
CMAKE_SKIP_TESTS+=(
"^test_gui_meshlayerpropertiesdialog$"
"^test_app_maptooleditmesh$"
)
fi
if ! use python || ! use postgres; then
CMAKE_SKIP_TESTS+=(
"^ProcessingCheckValidityAlgorithmTest$"
"^ProcessingGdalAlgorithmsGeneralTest$"
"^ProcessingGdalAlgorithmsRasterTest$"
"^ProcessingGdalAlgorithmsVectorTest$"
"^ProcessingGrassAlgorithmsImageryTest$"
"^ProcessingGrassAlgorithmsRasterTestPt1$"
"^ProcessingGrassAlgorithmsRasterTestPt2$"
"^ProcessingGrassAlgorithmsVectorTest$"
"^ProcessingQgisAlgorithmsTestPt1$"
"^ProcessingQgisAlgorithmsTestPt3$"
"^ProcessingQgisAlgorithmsTestPt4$"
"^ProcessingQgisAlgorithmsTestPt5$"
"^ProcessingScriptUtilsTest$"
)
fi
xdg_environment_reset
local -x QGIS_CONTINUOUS_INTEGRATION_RUN=true
local -x QT_QPA_PLATFORM=offscreen
LC_ALL=en_US.UTF-8 \
cmake_src_test
}
src_install() {
if use test; then
git config --global --add safe.directory "${S}" || die
fi
cmake_src_install
insinto /usr/share/mime/packages
doins debian/qgis.xml
if use examples; then
docinto examples
dodoc -r "${WORKDIR}"/qgis_sample_data/.
docompress -x "/usr/share/doc/${PF}/examples"
fi
if use python; then
python_optimize
python_optimize "${ED}"/usr/share/qgis/python
fi
if use grass; then
python_fix_shebang "${ED}"/usr/share/qgis/grass/scripts
fi
if ! [[ ${PV} == *9999* ]]; then
if use test; then
git config unset --all --global --value="${S}" safe.directory || die
fi
fi
}
pkg_postinst() {
if use postgres; then
elog "If you don't intend to use an external PostGIS server"
elog "you should install:"
elog " dev-db/postgis"
elif use python; then
elog "Support of PostgreSQL is disabled."
elog "But some installed python-plugins import the psycopg2 module."
elog "If you do not need these plugins just disable them"
elog "in the Plugins menu, else you need to set USE=\"postgres\""
fi
xdg_pkg_postinst
}

View File

@ -133,7 +133,6 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=(
"${FILESDIR}/${PN}-3.44.3-testReportDir.patch"
"${FILESDIR}/${PN}-3.44.3-include-memory.patch"
)
src_prepare() {