commit: 42c1ed171bc80870b3effc80b4fb1ec85957424a Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Jul 8 10:59:10 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jul 9 12:51:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c1ed17
sci-geosciences/qgis: add 3.38.0, 3.36.3-r1 Closes: https://bugs.gentoo.org/935732 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37487 Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/arch/x86/package.use.mask | 4 + sci-geosciences/qgis/Manifest | 1 + .../files/qgis-3.36.3-qt6-Fix-broken-test.patch | 29 ++ sci-geosciences/qgis/files/qgis-3.36.3-qt6.patch | 42 ++ .../qgis/files/qgis-3.36.3-testReportDir.patch | 13 + sci-geosciences/qgis/metadata.xml | 1 + sci-geosciences/qgis/qgis-3.36.3-r1.ebuild | 513 ++++++++++++++++++++ sci-geosciences/qgis/qgis-3.38.0.ebuild | 520 +++++++++++++++++++++ sci-geosciences/qgis/qgis-9999.ebuild | 333 +++++++++++-- 9 files changed, 1408 insertions(+), 48 deletions(-) diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index 05fc5dfd3873..16f7b6e53826 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -12,6 +12,10 @@ dev-tex/abntex lyx # additional dev-qt/qtwebengine revdeps. kde-frameworks/purpose:5 kaccounts +# Paul Zander <negril.nx+gen...@gmail.com> (2024-06-17) +# missing keywords on dev-python/PyQt6 +sci-geosciences/qgis qt6 + # Sam James <s...@gentoo.org> (2024-06-13) # Needs as-yet-unkeyworded KF6 (bug #934215) app-crypt/pinentry qt6 diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index e6367e082396..d7ccf995079b 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,4 +1,5 @@ DIST qgis-3.28.10.tar.bz2 159289420 BLAKE2B 9ae7d2b8e8c55b69f8bf93c5ace3ff86dbbed838b3b2d3bbd09e4229402cc4268e710f9f6be20b98a60d75c39199c851d00293e2e67b410b3aa3b909717839f0 SHA512 00032ae91927c0a293133cffa44eb7b963eea43814d762c13b3281169bc26eb2122eda06b9edc2110424ea29d0f73456e092f2d801392eec1d453ab15576ec56 DIST qgis-3.36.1.tar.bz2 171472398 BLAKE2B 1bcd657d1bb715566975ec5aa5bff5a6f282b025c578370d1112a53d00865e18828343ec644f7bb9cff24922e50070c361cae93246f067df4566a4cbd629349b SHA512 e6c6cd458bf9ead5ff42dd51a7c80c6fff66fe04e1618265fccff706a5e60189d8819dc61479a2f2b23f00664c91304d9891ddbaedc4cadf2b9cfd0a6af4e273 DIST qgis-3.36.3.tar.bz2 172648476 BLAKE2B 120ba5837e25b0a0ac1bd9588afccf1ee9a1cb6cb26500e010bdd81657d6c061acdf107dbbefc417cc94e113ee8039c3c4a6b664c892e8ea459c2d5f2135e6cc SHA512 534b7affb8dc0ca9aab55e3492b3b1aefd9f14f5d3e87bbecde5445d536516e6f0913f55078f2621227a6a75c18d402041d9b66c495a9e342602467e40b01e8a +DIST qgis-3.38.0.tar.bz2 175129654 BLAKE2B 2ced37dd3d65ec53d523c3f6921274ce04c3450c663bd09895b076ad5be7ba43f4efc5c2efb486780204cbc1f8b15cb716a52c3a172eeb8d6bb6fb44ea010ba9 SHA512 178c4c9f50637cfbb88c4e0c17f9c9579614ae226274d421609533b4d3d480d949f3aee90c03c1ac1c36d41a890676516d3c1e51637fefc7f53657eb6d6416ff DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d diff --git a/sci-geosciences/qgis/files/qgis-3.36.3-qt6-Fix-broken-test.patch b/sci-geosciences/qgis/files/qgis-3.36.3-qt6-Fix-broken-test.patch new file mode 100644 index 000000000000..0c4050271b10 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.36.3-qt6-Fix-broken-test.patch @@ -0,0 +1,29 @@ +From 3f87b7af8baff33e2ed31c60a32da30a5291a346 Mon Sep 17 00:00:00 2001 +From: Nyall Dawson <nyall.daw...@gmail.com> +Date: Mon, 29 Apr 2024 09:16:22 +1000 +Subject: [PATCH] Fix broken test + +This test was broken and not actually testing the QgsGeometry +operator, and breaks compilation under qt 6.7 +--- + tests/src/core/geometry/testqgsgeometry.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/src/core/geometry/testqgsgeometry.cpp b/tests/src/core/geometry/testqgsgeometry.cpp +index 5cbb5b6b8c01..18e410c7a9af 100644 +--- a/tests/src/core/geometry/testqgsgeometry.cpp ++++ b/tests/src/core/geometry/testqgsgeometry.cpp +@@ -1710,11 +1710,11 @@ void TestQgsGeometry::dataStream() + QCOMPARE( geom.constGet()->asWkt(), resultGeometry.constGet()->asWkt() ); + + //also test with geometry without data +- std::unique_ptr<QgsGeometry> emptyGeom( new QgsGeometry() ); ++ QgsGeometry emptyGeom; + + QByteArray ba2; + QDataStream ds2( &ba2, QIODevice::ReadWrite ); +- ds2 << emptyGeom.get(); ++ ds2 << emptyGeom; + + ds2.device()->seek( 0 ); + ds2 >> resultGeometry; diff --git a/sci-geosciences/qgis/files/qgis-3.36.3-qt6.patch b/sci-geosciences/qgis/files/qgis-3.36.3-qt6.patch new file mode 100644 index 000000000000..295c01b480fa --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.36.3-qt6.patch @@ -0,0 +1,42 @@ +From: Paul Zander <negril.nx+gen...@gmail.com> +Subject: [PATCH] Build against Qt6 + +diff --git a/external/qspatialite/CMakeLists.txt b/external/qspatialite/CMakeLists.txt +index 33536da..61c7370 100644 +--- a/external/qspatialite/CMakeLists.txt ++++ b/external/qspatialite/CMakeLists.txt +@@ -7,11 +7,19 @@ add_definitions(-DQT_SHARED) + + include_directories(SYSTEM + ${SQLITE3_INCLUDE_DIR} +- ${Qt5Sql_PRIVATE_INCLUDE_DIRS} + ) ++if (BUILD_WITH_QT6) ++ include_directories(SYSTEM ${Qt6Sql_PRIVATE_INCLUDE_DIRS}) ++else() ++ include_directories(SYSTEM ${Qt5Sql_PRIVATE_INCLUDE_DIRS}) ++endif() + + set(QSQLSPATIALITE_SRC qsql_spatialite.cpp smain.cpp) +-QT5_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h smain.h) ++if (BUILD_WITH_QT6) ++ QT6_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h smain.h) ++else() ++ QT5_WRAP_CPP(QSQLSPATIALITE_SRC qsql_spatialite.h smain.h) ++endif() + + add_library(qsqlspatialite SHARED ${QSQLSPATIALITE_SRC}) + target_link_libraries(qsqlspatialite +diff --git a/external/qspatialite/qsql_spatialite.cpp b/external/qspatialite/qsql_spatialite.cpp +index 0e8f15a..9e30004 100644 +--- a/external/qspatialite/qsql_spatialite.cpp ++++ b/external/qspatialite/qsql_spatialite.cpp +@@ -632,7 +632,7 @@ bool QSpatiaLiteDriver::open( const QString &db, const QString &, const QString + bool openReadOnlyOption = false; + bool openUriOption = false; + +- const auto opts = conOpts.splitRef( QLatin1Char( ';' ) ); ++ const auto opts = conOpts.split( u';' ); + for ( auto option : opts ) + { + option = option.trimmed(); diff --git a/sci-geosciences/qgis/files/qgis-3.36.3-testReportDir.patch b/sci-geosciences/qgis/files/qgis-3.36.3-testReportDir.patch new file mode 100644 index 000000000000..c8abe302104a --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.36.3-testReportDir.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/qgsrenderchecker.cpp b/src/core/qgsrenderchecker.cpp +index c75985a..4696f18 100644 +--- a/src/core/qgsrenderchecker.cpp ++++ b/src/core/qgsrenderchecker.cpp +@@ -54,7 +54,7 @@ QgsRenderChecker::QgsRenderChecker() + QDir QgsRenderChecker::testReportDir() + { + if ( qgetenv( "QGIS_CONTINUOUS_INTEGRATION_RUN" ) == QStringLiteral( "true" ) ) +- return QDir( QDir( "/root/QGIS" ).filePath( QStringLiteral( "qgis_test_report" ) ) ); ++ return QDir( QDir( qgetenv( "CMAKE_SOURCE_DIR" ) ).filePath( QStringLiteral( "qgis_test_report" ) ) ); + else + return QDir( QDir::temp().filePath( QStringLiteral( "qgis_test_report" ) ) ); + } diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml index 6a7c8a916f27..8116d12198d2 100644 --- a/sci-geosciences/qgis/metadata.xml +++ b/sci-geosciences/qgis/metadata.xml @@ -24,6 +24,7 @@ <flag name="polar">Enable support for the polar coordinate system via <pkg>x11-libs/qwtpolar</pkg></flag> <flag name="qml">Enable support Qml-based plugins using <pkg>dev-qt/qtdeclarative</pkg></flag> <flag name="serial">Enable support for serial GPS using <pkg>dev-qt/qtserialport</pkg></flag> + <flag name="webengine">Enable webengine support using <pkg>dev-qt/qtwebengine</pkg></flag> </use> <upstream> <remote-id type="github">qgis/QGIS</remote-id> diff --git a/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild b/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild new file mode 100644 index 000000000000..43309edb502c --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.36.3-r1.ebuild @@ -0,0 +1,513 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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 ~x86" +fi +inherit cmake flag-o-matic python-single-r1 virtualx 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 +polar postgres python qml qt6 test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + mapserver? ( python ) + qt6? ( polar ) + test? ( postgres ) +" + +# Disabling test suite because upstream disallow running from install path +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=dev-db/spatialite-4.2.0 + dev-db/sqlite:3 + dev-libs/expat + dev-libs/libzip:= + dev-libs/protobuf:= + dev-vcs/git + media-gfx/exiv2:= + >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] + sci-libs/geos + sci-libs/libspatialindex:= + >=sci-libs/proj-4.9.3:= + sys-libs/zlib + 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} + >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/owslib[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:0[${PYTHON_USEDEP}] ) + !qt6? ( + dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5] + ) + qt6? ( + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] + ) + ') + ) + !qt6? ( + app-crypt/qca:2[qt5,ssl] + dev-libs/qtkeychain[qt5] + x11-libs/qwt:=[qt5(+),svg(+)] + >=x11-libs/qscintilla-2.10.1:=[qt5] + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtnetwork:5[ssl] + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + 3d? ( dev-qt/qt3d:5 ) + polar? ( + || ( + ( + x11-libs/qwt:5 + x11-libs/qwtpolar + ) + ( + x11-libs/qwt:6/1.5 + x11-libs/qwtpolar + ) + ( + >=x11-libs/qwt-6.2[polar(+)] + ) + ) + ) + qml? ( dev-qt/qtdeclarative:5 ) + ) + qt6? ( + app-crypt/qca:2[qt6,ssl] + dev-libs/qtkeychain[qt6] + >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] + >=x11-libs/qscintilla-2.10.1:=[qt6] + dev-qt/qttools:6[designer] + 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 + 3d? ( dev-qt/qt3d:6 ) + polar? ( x11-libs/qwt:=[polar(+)] ) + qml? ( dev-qt/qtdeclarative:6 ) + ) +" +DEPEND="${COMMON_DEPEND} + !qt6? ( + dev-qt/qttest:5 + ) + test? ( + python? ( + app-text/qpdf + app-text/poppler[cairo,utils] + ) + ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND="${PYTHON_DEPS} + !qt6? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) + app-alternatives/yacc + app-alternatives/lex + doc? ( app-text/doxygen ) + test? ( + python? ( + $(python_gen_cond_dep ' + !qt6? ( + dev-python/PyQt5[${PYTHON_USEDEP},testlib] + ) + qt6? ( + dev-python/PyQt6[${PYTHON_USEDEP},testlib] + ) + dev-python/nose2[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch" + "${FILESDIR}/${PN}-3.36.3-qt6.patch" + "${FILESDIR}/${PN}-3.36.3-testReportDir.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 --global --add safe.directory "${S}" || die + git init -q || die + git config --local gc.auto 0 || die + git config --local user.email "la...@gentoo.org" || die + git config --local user.name "Larry the Cow" || die + git add . || die + + git commit -m "init" || 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=( + -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 + -DBUILD_WITH_QT6="$(usex qt6)" + -DWITH_ANALYSIS=ON + -DWITH_APIDOC=$(usex doc) + -DWITH_GUI=ON + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=$(usex test) + -DWITH_3D=$(usex 3d) + -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_QWTPOLAR=$(usex polar) + -DWITH_PDAL=$(usex pdal) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_BINDINGS=$(usex python) + -DWITH_CUSTOM_WIDGETS=$(usex python) + -DWITH_QUICK=$(usex qml) + -DWITH_QTWEBKIT=OFF + -DWITH_DRACO=OFF + ) + + # 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_BUILD_TYPE=Release # RelWithDebInfo enables debug logging + + cmake_src_configure +} + +src_test() { + local -x CMAKE_SKIP_TESTS=( + PyQgsAFSProvider$ + PyQgsAnnotation$ + PyQgsAuthenticationSystem$ + PyQgsAuxiliaryStorage$ + PyQgsBlockingNetworkRequest$ + PyQgsBlockingProcess$ + PyQgsCodeEditor$ + PyQgsDataItemProviderRegistry$ + PyQgsDelimitedTextProvider$ + PyQgsEditWidgets$ + PyQgsElevationProfileCanvas$ + PyQgsEmbeddedSymbolRenderer$ + PyQgsExternalStorageAwsS3$ + PyQgsExternalStorageWebDav$ + PyQgsFileDownloader$ + PyQgsFloatingWidget$ + PyQgsGeometryTest$ + PyQgsGoogleMapsGeocoder$ + PyQgsGroupLayer$ + PyQgsLayerDefinition$ + PyQgsLayoutHtml$ + PyQgsLayoutLegend$ + PyQgsLayoutMap$ + PyQgsLineSymbolLayers$ + PyQgsMapBoxGlStyleConverter$ + PyQgsMapLayerComboBox$ + PyQgsMapLayerProxyModel$ + PyQgsMemoryProvider$ + PyQgsNetworkAccessManager$ + PyQgsOGRProvider$ + PyQgsOGRProviderGpkg$ + PyQgsPainting$ + PyQgsPalLabelingCanvas$ + PyQgsPalLabelingLayout$ + PyQgsPalLabelingPlacement$ + PyQgsPlot$ + PyQgsPointCloudAttributeByRampRenderer$ + PyQgsPointCloudClassifiedRenderer$ + PyQgsPointCloudRgbRenderer$ + PyQgsProcessExecutablePt1$ + PyQgsProcessExecutablePt2$ + PyQgsProcessingAlgRunner$ + PyQgsProcessingInPlace$ + PyQgsProcessingPackageLayersAlgorithm$ + PyQgsProcessingParameters$ + PyQgsProject$ + PyQgsPythonProvider$ + PyQgsRasterFileWriter$ + PyQgsRasterLayer$ + PyQgsRasterLayerRenderer$ + PyQgsSelectiveMasking$ + PyQgsSettings$ + PyQgsSettingsEntry$ + PyQgsShapefileProvider$ + PyQgsSpatialiteProvider$ + PyQgsStyleModel$ + PyQgsSvgCache$ + PyQgsSymbolLayerReadSld$ + PyQgsTextRenderer$ + PyQgsVectorFileWriter$ + PyQgsVectorLayerCache$ + PyQgsVectorLayerEditBuffer$ + PyQgsVectorLayerEditUtils$ + PyQgsVectorLayerProfileGenerator$ + PyQgsWFSProvider$ + TestQgsRandomMarkerSymbolLayer$ + qgis_sip_uptodate$ + test_3d_3drendering$ + test_3d_layout3dmap$ + test_3d_mesh3drendering$ + test_3d_pointcloud3drendering$ + test_3d_tessellator$ + test_analysis_gcptransformer$ + test_app_advanceddigitizing$ + test_authmethod_authoauth2method$ + test_core_mapdevicepixelratio$ + test_core_ogcutils$ + test_core_openclutils$ + test_core_vectortilelayer$ + test_gui_dockwidget$ + test_gui_ogrprovidergui$ + + PyQgsDocCoverage$ + PyQgsSipCoverage$ + ) + + CMAKE_SKIP_TESTS+=( + test_core_blendmodes$ + test_core_callout$ + test_core_compositionconverter$ + test_core_dataitem$ + test_core_expression$ + test_core_gdalutils$ + test_core_labelingengine$ + test_core_layoutmap$ + test_core_layoutmapoverview$ + test_core_layoutpicture$ + test_core_linefillsymbol$ + test_core_maprendererjob$ + test_core_maprotation$ + test_core_meshlayer$ + test_core_meshlayerrenderer$ + test_core_networkaccessmanager$ + test_core_pointcloudlayerexporter$ + test_core_project$ + test_core_rastercontourrenderer$ + test_core_rasterlayer$ + test_core_simplemarker$ + test_core_tiledownloadmanager$ + test_gui_processinggui$ + test_gui_filedownloader$ + test_gui_newdatabasetablewidget$ + test_gui_queryresultwidget$ + test_analysis_processingalgspt2$ + test_analysis_meshcontours$ + test_analysis_triangulation$ + test_analysis_processing$ + test_provider_wcsprovider$ + test_app_maptoolcircularstring$ + test_app_vertextool$ + ) + + 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+=( + ProcessingGrassAlgorithmsRasterTestPt2$ + ProcessingCheckValidityAlgorithmTest$ + ProcessingGdalAlgorithmsGeneralTest$ + ProcessingGdalAlgorithmsRasterTest$ + ProcessingGdalAlgorithmsVectorTest$ + ProcessingGeneralTest$ + ProcessingGenericAlgorithmsTest$ + ProcessingGrassAlgorithmsImageryTest$ + ProcessingGrassAlgorithmsRasterTestPt1$ + ProcessingGrassAlgorithmsVectorTest$ + ProcessingGuiTest$ + ProcessingModelerTest$ + ProcessingParametersTest$ + ProcessingProjectProviderTest$ + ProcessingQgisAlgorithmsTestPt1$ + ProcessingQgisAlgorithmsTestPt2$ + ProcessingQgisAlgorithmsTestPt3$ + ProcessingQgisAlgorithmsTestPt4$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingScriptUtilsTest$ + ProcessingToolsTest$ + ) + fi + + local myctestargs=( + --output-on-failure + -j1 + ) + + xdg_environment_reset + + local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true" + virtx 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 +} + +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 +} diff --git a/sci-geosciences/qgis/qgis-3.38.0.ebuild b/sci-geosciences/qgis/qgis-3.38.0.ebuild new file mode 100644 index 000000000000..76526560ee61 --- /dev/null +++ b/sci-geosciences/qgis/qgis-3.38.0.ebuild @@ -0,0 +1,520 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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 ~x86" +fi +inherit cmake flag-o-matic python-single-r1 virtualx 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 +polar postgres python qml qt6 test webengine" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + mapserver? ( python ) + qt6? ( polar ) +" +# test? ( postgres ) + +# Disabling test suite because upstream disallow running from install path +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + >=dev-db/spatialite-4.2.0 + dev-db/sqlite:3 + dev-libs/expat + dev-libs/libzip:= + dev-libs/protobuf:= + dev-vcs/git + media-gfx/exiv2:= + >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] + sci-libs/geos + sci-libs/libspatialindex:= + >=sci-libs/proj-4.9.3:= + sys-libs/zlib + 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} + >=sci-libs/gdal-2.2.3[python,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-python/httplib2[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/owslib[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + !qt6? ( + dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5] + ) + qt6? ( + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] + ) + ') + ) + !qt6? ( + app-crypt/qca:2[qt5,ssl] + dev-libs/qtkeychain[qt5] + x11-libs/qwt:=[qt5(+),svg(+)] + >=x11-libs/qscintilla-2.10.1:=[qt5] + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtnetwork:5[ssl] + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + 3d? ( dev-qt/qt3d:5 ) + polar? ( + || ( + ( + x11-libs/qwt:5 + x11-libs/qwtpolar + ) + ( + x11-libs/qwt:6/1.5 + x11-libs/qwtpolar + ) + ( + >=x11-libs/qwt-6.2[polar(+)] + ) + ) + ) + qml? ( dev-qt/qtdeclarative:5 ) + webengine? ( dev-qt/qtwebengine:5 ) + ) + qt6? ( + app-crypt/qca:2[qt6,ssl] + dev-libs/qtkeychain[qt6] + >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] + >=x11-libs/qscintilla-2.10.1:=[qt6] + dev-qt/qttools:6[designer] + 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 + 3d? ( dev-qt/qt3d:6 ) + polar? ( x11-libs/qwt:=[polar(+)] ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) + ) +" +DEPEND="${COMMON_DEPEND} + !qt6? ( + dev-qt/qttest:5 + ) + test? ( + python? ( + app-text/qpdf + app-text/poppler[cairo,utils] + ) + ) +" +RDEPEND="${COMMON_DEPEND} + sci-geosciences/gpsbabel +" +BDEPEND="${PYTHON_DEPS} + !qt6? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) + app-alternatives/yacc + app-alternatives/lex + doc? ( app-text/doxygen ) + test? ( + python? ( + $(python_gen_cond_dep ' + !qt6? ( + dev-python/PyQt5[${PYTHON_USEDEP},testlib] + ) + qt6? ( + dev-python/PyQt6[${PYTHON_USEDEP},testlib] + ) + dev-python/nose2[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) + ) +" + +PATCHES=( + # "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch" + "${FILESDIR}/${PN}-3.36.3-qt6.patch" + "${FILESDIR}/${PN}-3.36.3-testReportDir.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 --global --add safe.directory "${S}" || die + git init -q || die + git config --local gc.auto 0 || die + git config --local user.email "la...@gentoo.org" || die + git config --local user.name "Larry the Cow" || die + git add . || die + + git commit -m "init" || 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=( + -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 + -DBUILD_WITH_QT6="$(usex qt6)" + -DWITH_ANALYSIS=ON + -DWITH_APIDOC=$(usex doc) + -DWITH_GUI=ON + -DWITH_INTERNAL_MDAL=ON # not packaged, bug 684538 + -DWITH_QSPATIALITE=ON + -DENABLE_TESTS=$(usex test) + -DWITH_3D=$(usex 3d) + -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_QWTPOLAR=$(usex polar) + -DWITH_QTWEBENGINE=$(usex webengine) + -DWITH_PDAL=$(usex pdal) + -DWITH_POSTGRESQL=$(usex postgres) + -DWITH_BINDINGS=$(usex python) + -DWITH_CUSTOM_WIDGETS=$(usex python) + -DWITH_QUICK=$(usex qml) + -DWITH_QTWEBKIT=OFF + -DWITH_DRACO=OFF + ) + + # 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_BUILD_TYPE=Release # RelWithDebInfo enables debug logging + + cmake_src_configure +} + +src_test() { + addwrite "/proc/self/mem" + addwrite "/proc/self/task/" + addwrite "/dev/fuse" + + local -x CMAKE_SKIP_TESTS=( + PyQgsAFSProvider$ + PyQgsAnnotation$ + PyQgsAuthenticationSystem$ + PyQgsAuxiliaryStorage$ + PyQgsBlockingNetworkRequest$ + PyQgsBlockingProcess$ + PyQgsCodeEditor$ + PyQgsDataItemProviderRegistry$ + PyQgsDelimitedTextProvider$ + PyQgsEditWidgets$ + PyQgsElevationProfileCanvas$ + PyQgsEmbeddedSymbolRenderer$ + PyQgsExternalStorageAwsS3$ + PyQgsExternalStorageWebDav$ + PyQgsFileDownloader$ + PyQgsFloatingWidget$ + PyQgsGeometryTest$ + PyQgsGoogleMapsGeocoder$ + PyQgsGroupLayer$ + PyQgsLayerDefinition$ + PyQgsLayoutHtml$ + PyQgsLayoutLegend$ + PyQgsLayoutMap$ + PyQgsLineSymbolLayers$ + PyQgsMapBoxGlStyleConverter$ + PyQgsMapLayerComboBox$ + PyQgsMapLayerProxyModel$ + PyQgsMemoryProvider$ + PyQgsNetworkAccessManager$ + PyQgsOGRProvider$ + PyQgsOGRProviderGpkg$ + PyQgsPainting$ + PyQgsPalLabelingCanvas$ + PyQgsPalLabelingLayout$ + PyQgsPalLabelingPlacement$ + PyQgsPlot$ + PyQgsPointCloudAttributeByRampRenderer$ + PyQgsPointCloudClassifiedRenderer$ + PyQgsPointCloudRgbRenderer$ + PyQgsProcessExecutablePt1$ + PyQgsProcessExecutablePt2$ + PyQgsProcessingAlgRunner$ + PyQgsProcessingInPlace$ + PyQgsProcessingPackageLayersAlgorithm$ + PyQgsProcessingParameters$ + PyQgsProject$ + PyQgsPythonProvider$ + PyQgsRasterFileWriter$ + PyQgsRasterLayer$ + PyQgsRasterLayerRenderer$ + PyQgsSelectiveMasking$ + PyQgsSettings$ + PyQgsSettingsEntry$ + PyQgsShapefileProvider$ + PyQgsSpatialiteProvider$ + PyQgsStyleModel$ + PyQgsSvgCache$ + PyQgsSymbolLayerReadSld$ + PyQgsTextRenderer$ + PyQgsVectorFileWriter$ + PyQgsVectorLayerCache$ + PyQgsVectorLayerEditBuffer$ + PyQgsVectorLayerEditUtils$ + PyQgsVectorLayerProfileGenerator$ + PyQgsWFSProvider$ + TestQgsRandomMarkerSymbolLayer$ + qgis_sip_uptodate$ + test_3d_3drendering$ + test_3d_layout3dmap$ + test_3d_mesh3drendering$ + test_3d_pointcloud3drendering$ + test_3d_tessellator$ + test_analysis_gcptransformer$ + test_app_advanceddigitizing$ + test_authmethod_authoauth2method$ + test_core_mapdevicepixelratio$ + test_core_ogcutils$ + test_core_openclutils$ + test_core_vectortilelayer$ + test_gui_dockwidget$ + test_gui_ogrprovidergui$ + + PyQgsDocCoverage$ + PyQgsSipCoverage$ + ) + + CMAKE_SKIP_TESTS+=( + test_core_blendmodes$ + test_core_callout$ + test_core_compositionconverter$ + test_core_dataitem$ + test_core_expression$ + test_core_gdalutils$ + test_core_labelingengine$ + test_core_layoutmap$ + test_core_layoutmapoverview$ + test_core_layoutpicture$ + test_core_linefillsymbol$ + test_core_maprendererjob$ + test_core_maprotation$ + test_core_meshlayer$ + test_core_meshlayerrenderer$ + test_core_networkaccessmanager$ + test_core_pointcloudlayerexporter$ + test_core_project$ + test_core_rastercontourrenderer$ + test_core_rasterlayer$ + test_core_simplemarker$ + test_core_tiledownloadmanager$ + test_gui_processinggui$ + test_gui_filedownloader$ + test_gui_newdatabasetablewidget$ + test_gui_queryresultwidget$ + test_analysis_processingalgspt2$ + test_analysis_meshcontours$ + test_analysis_triangulation$ + test_analysis_processing$ + test_provider_wcsprovider$ + test_app_maptoolcircularstring$ + test_app_vertextool$ + ) + + 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+=( + ProcessingGrassAlgorithmsRasterTestPt2$ + ProcessingCheckValidityAlgorithmTest$ + ProcessingGdalAlgorithmsGeneralTest$ + ProcessingGdalAlgorithmsRasterTest$ + ProcessingGdalAlgorithmsVectorTest$ + ProcessingGeneralTest$ + ProcessingGenericAlgorithmsTest$ + ProcessingGrassAlgorithmsImageryTest$ + ProcessingGrassAlgorithmsRasterTestPt1$ + ProcessingGrassAlgorithmsVectorTest$ + ProcessingGuiTest$ + ProcessingModelerTest$ + ProcessingParametersTest$ + ProcessingProjectProviderTest$ + ProcessingQgisAlgorithmsTestPt1$ + ProcessingQgisAlgorithmsTestPt2$ + ProcessingQgisAlgorithmsTestPt3$ + ProcessingQgisAlgorithmsTestPt4$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingScriptUtilsTest$ + ProcessingToolsTest$ + ) + fi + + local myctestargs=( + --output-on-failure + -j1 + ) + + xdg_environment_reset + + local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true" + virtx 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 +} + +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 +} diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild index 1c5971b726cc..76526560ee61 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-9999.ebuild @@ -25,49 +25,30 @@ HOMEPAGE="https://www.qgis.org/"; LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal polar postgres python qml test" +IUSE="3d doc examples +georeferencer grass hdf5 mapserver netcdf opencl oracle pdal +polar postgres python qml qt6 test webengine" REQUIRED_USE="${PYTHON_REQUIRED_USE} mapserver? ( python ) - test? ( postgres ) + qt6? ( polar ) " +# test? ( postgres ) # Disabling test suite because upstream disallow running from install path RESTRICT="!test? ( test )" -# At some point the dependency on qwtpolar should be -# replaced with a dependency on qwt[polar]. Currently -# it does not build with qwt-6.2[polar] though. COMMON_DEPEND=" - app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/protobuf:= - dev-libs/qtkeychain[qt5(+)] - dev-qt/designer:5 - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5[widgets] - dev-qt/qtnetwork:5[ssl] - dev-qt/qtpositioning:5 - dev-qt/qtprintsupport:5 - dev-qt/qtserialport:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 + dev-vcs/git media-gfx/exiv2:= >=sci-libs/gdal-3.0.4:=[geos,spatialite,sqlite] sci-libs/geos sci-libs/libspatialindex:= >=sci-libs/proj-4.9.3:= sys-libs/zlib - >=x11-libs/qscintilla-2.10.1:=[qt5(+)] - >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] - 3d? ( dev-qt/qt3d:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( sci-geosciences/grass:= ) hdf5? ( sci-libs/hdf5:= ) @@ -79,7 +60,6 @@ COMMON_DEPEND=" sci-libs/gdal:=[oracle] ) pdal? ( sci-libs/pdal:= ) - polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( ${PYTHON_DEPS} @@ -91,47 +71,131 @@ COMMON_DEPEND=" dev-python/numpy[${PYTHON_USEDEP}] dev-python/owslib[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[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-2.10.1[qt5(+),${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) + !qt6? ( + dev-python/PyQt5[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt5] + ) + qt6? ( + dev-python/PyQt6[designer,gui,multimedia,network,positioning,printsupport,serialport,sql,svg,widgets,${PYTHON_USEDEP}] + >=dev-python/qscintilla-python-2.10.1[qt6] + ) ') ) - qml? ( dev-qt/qtdeclarative:5 ) + !qt6? ( + app-crypt/qca:2[qt5,ssl] + dev-libs/qtkeychain[qt5] + x11-libs/qwt:=[qt5(+),svg(+)] + >=x11-libs/qscintilla-2.10.1:=[qt5] + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtnetwork:5[ssl] + dev-qt/qtpositioning:5 + dev-qt/qtprintsupport:5 + dev-qt/qtserialport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + 3d? ( dev-qt/qt3d:5 ) + polar? ( + || ( + ( + x11-libs/qwt:5 + x11-libs/qwtpolar + ) + ( + x11-libs/qwt:6/1.5 + x11-libs/qwtpolar + ) + ( + >=x11-libs/qwt-6.2[polar(+)] + ) + ) + ) + qml? ( dev-qt/qtdeclarative:5 ) + webengine? ( dev-qt/qtwebengine:5 ) + ) + qt6? ( + app-crypt/qca:2[qt6,ssl] + dev-libs/qtkeychain[qt6] + >=x11-libs/qwt-6.2.0-r3:=[qt6,svg(+)] + >=x11-libs/qscintilla-2.10.1:=[qt6] + dev-qt/qttools:6[designer] + 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 + 3d? ( dev-qt/qt3d:6 ) + polar? ( x11-libs/qwt:=[polar(+)] ) + qml? ( dev-qt/qtdeclarative:6 ) + webengine? ( dev-qt/qtwebengine:6 ) + ) " DEPEND="${COMMON_DEPEND} - dev-qt/qttest:5 + !qt6? ( + dev-qt/qttest:5 + ) + test? ( + python? ( + app-text/qpdf + app-text/poppler[cairo,utils] + ) + ) " RDEPEND="${COMMON_DEPEND} sci-geosciences/gpsbabel " BDEPEND="${PYTHON_DEPS} - dev-qt/linguist-tools:5 + !qt6? ( dev-qt/linguist-tools:5 ) + qt6? ( dev-qt/qttools:6[linguist] ) app-alternatives/yacc app-alternatives/lex doc? ( app-text/doxygen ) test? ( - $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_USEDEP},testlib] - dev-python/nose2[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ') + python? ( + $(python_gen_cond_dep ' + !qt6? ( + dev-python/PyQt5[${PYTHON_USEDEP},testlib] + ) + qt6? ( + dev-python/PyQt6[${PYTHON_USEDEP},testlib] + ) + dev-python/nose2[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ') + ) ) " +PATCHES=( + # "${FILESDIR}/${PN}-3.36.3-qt6-Fix-broken-test.patch" + "${FILESDIR}/${PN}-3.36.3-qt6.patch" + "${FILESDIR}/${PN}-3.36.3-testReportDir.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 --global --add safe.directory "${S}" || die git init -q || die - git config user.email "la...@gentoo.org" || die - git config user.name "Larry the Cow" || die + git config --local gc.auto 0 || die + git config --local user.email "la...@gentoo.org" || die + git config --local user.name "Larry the Cow" || die git add . || die + git commit -m "init" || die fi fi @@ -150,11 +214,14 @@ src_configure() { -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 + + # -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 + -DBUILD_WITH_QT6="$(usex qt6)" -DWITH_ANALYSIS=ON -DWITH_APIDOC=$(usex doc) -DWITH_GUI=ON @@ -169,6 +236,7 @@ src_configure() { -DUSE_OPENCL=$(usex opencl) -DWITH_ORACLE=$(usex oracle) -DWITH_QWTPOLAR=$(usex polar) + -DWITH_QTWEBENGINE=$(usex webengine) -DWITH_PDAL=$(usex pdal) -DWITH_POSTGRESQL=$(usex postgres) -DWITH_BINDINGS=$(usex python) @@ -193,7 +261,7 @@ src_configure() { GRASSDIR=/usr/$(get_libdir)/${grassdir} - einfo "Supported versions: ${supported_grass_versions[@]}" + einfo "Supported versions: ${supported_grass_versions[*]}" einfo "Found GRASS version: ${v[0]}*" local known_grass_version @@ -227,25 +295,194 @@ src_configure() { use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) - # bugs 612956, 648726 - addpredict /dev/dri/renderD128 - addpredict /dev/dri/renderD129 + CMAKE_BUILD_TYPE=Release # RelWithDebInfo enables debug logging cmake_src_configure } src_test() { - local myctestargs=( - # test_core_gdalprovider - see https://github.com/qgis/QGIS/pull/47887 - -E '(ProcessingGuiTest$|ProcessingQgisAlgorithmsTestPt1$|ProcessingQgisAlgorithmsTestPt2$|ProcessingQgisAlgorithmsTestPt3$|ProcessingQgisAlgorithmsTestPt4$|ProcessingGdalAlgorithmsRasterTest$|ProcessingGdalAlgorithmsVectorTest$|ProcessingGrass7AlgorithmsImageryTest$|ProcessingGrass7AlgorithmsRasterTestPt1$|ProcessingGrass7AlgorithmsRasterTestPt2$|ProcessingGrass7AlgorithmsVectorTest$|ProcessingOtbAlgorithmsTest$|test_core_callout$|test_core_compositionconverter$|test_core_expression$|test_core_gdalprovider$|test_core_gdalutils$|test_core_geonodeconnection$|test_core_imagecache$|test_core_labelingengine$|test_core_layout$|test_core_layoutcontext$|test_core_layouthtml$|test_core_layoutlabel$|test_core_layoutmanualtable$|test_core_layoutmap$|test_core_layoutmapgrid$|test_core_layoutmapoverview$|test_core_layoutmultiframe$|test_core_layoutpicture$|test_core_linefillsymbol$|test_core_mapdevicepixelratio$|test_core_maprendererjob$|test_core_meshlayer$|test_core_meshlayerrenderer$|test_c ore_networkaccessmanager$|test_core_pointpatternfillsymbol$|test_core_rastercontourrenderer$|test_core_rasterlayer$|test_core_simplemarker$|test_core_style$|test_core_svgmarker$|test_core_tiledownloadmanager$|test_core_ziplayer$|test_core_coordinatereferencesystem$|test_core_geometry$|test_gui_dualview$|test_gui_htmlwidgetwrapper$|test_gui_processinggui$|test_gui_filedownloader$|test_gui_ogrprovidergui$|test_gui_queryresultwidget$|test_gui_listwidget$|test_3d_3drendering$|test_3d_tessellator$|test_analysis_processingalgspt1$|test_analysis_processingalgspt2$|test_analysis_meshcontours$|test_analysis_triangulation$|test_analysis_processing$|test_provider_wcsprovider$|test_provider_postgresconn$|test_provider_virtualrasterprovider$|test_app_qgisappclipboard$|test_app_fieldcalculator$|test_app_maptoolcircularstring$|test_app_vertextool$|PyQgsLocalServer$|PyQgsAFSProvider$|PyQgsPythonProvider$|PyQgsAnnotation$|PyQgsAuthenticationSystem$|PyQgsAuthBasicMethod$|PyQgsDataItem$|PyQgsDelimited TextProvider$|PyQgsEmbeddedSymbolRenderer$|PyQgsExpressionBuilderWidget$|PyQgsExternalStorageWebDAV$|PyQgsGeometryTest$|PyQgsGoogleMapsGeocoder$|PyQgsImageCache$|PyQgsLayout$|PyQgsLayoutHtml$|PyQgsLayoutLegend$|PyQgsLayoutMap$|PyQgsLayoutMapGrid$|PyQgsLayoutMapOverview$|PyQgsMapClippingUtils$|PyQgsMapLayerComboBox$|PyQgsMapLayerProxyModel$|PyQgsMemoryProvider$|PyQgsOGRProviderGpkg$|PyQgsPalLabelingCanvas$|PyQgsPalLabelingLayout$|PyQgsPalLabelingPlacement$|PyQgsPointCloudAttributeByRampRenderer$|PyQgsPointCloudClassifiedRenderer$|PyQgsPointCloudExtentRenderer$|PyQgsPointCloudRgbRenderer$|PyQgsProcessExecutable$|PyQgsProcessingInPlace$|TestQgsRandomMarkerSymbolLayer$|PyQgsRasterLayer$|PyQgsRasterLayerRenderer$|PyQgsRasterResampler$|PyQgsRulebasedRenderer$|PyQgsShapefileProvider$|PyQgsSvgCache$|PyQgsOGRProvider$|PyQgsSpatialiteProvider$|PyQgsTaskManager$|PyQgsVectorFileWriter$|PyQgsVectorLayer$|PyQgsVectorLayerCache$|PyQgsVectorLayerEditBuffer$|PyQgsVectorLayerEditBufferGroup$|PyQgsVec torLayerProfileGenerator$|PyQgsVectorLayerSelectedFeatureSource$|PyQgsVectorLayerShapefile$|PyQgsVirtualLayerProvider$|PyQgsWFSProvider$|PyQgsOapifProvider$|PyQgsDBManagerGpkg$|PyQgsAuxiliaryStorage$|PyQgsFieldValidator$|PyQgsSelectiveMasking$|PyQgsPalLabelingServer$|PyQgsServerWMSGetMap$|PyQgsServerWMSGetLegendGraphic$|PyQgsServerWMSGetPrint$|PyQgsServerWMSGetPrintExtra$|PyQgsServerWMSGetPrintOutputs$|PyQgsServerWMSGetPrintAtlas$|PyQgsServerWMSDimension$|PyQgsServerAccessControlWMS$|PyQgsServerAccessControlWFS$|PyQgsServerAccessControlWFSTransactional$|PyQgsServerCacheManager$|PyQgsServerWMS$|PyQgsServerWMTS$|PyQgsServerWFS$|qgis_sipify$|qgis_sip_include$|qgis_sip_uptodate$|qgis_doxygen_order$|test_core_authmanager$)' + addwrite "/proc/self/mem" + addwrite "/proc/self/task/" + addwrite "/dev/fuse" + local -x CMAKE_SKIP_TESTS=( + PyQgsAFSProvider$ + PyQgsAnnotation$ + PyQgsAuthenticationSystem$ + PyQgsAuxiliaryStorage$ + PyQgsBlockingNetworkRequest$ + PyQgsBlockingProcess$ + PyQgsCodeEditor$ + PyQgsDataItemProviderRegistry$ + PyQgsDelimitedTextProvider$ + PyQgsEditWidgets$ + PyQgsElevationProfileCanvas$ + PyQgsEmbeddedSymbolRenderer$ + PyQgsExternalStorageAwsS3$ + PyQgsExternalStorageWebDav$ + PyQgsFileDownloader$ + PyQgsFloatingWidget$ + PyQgsGeometryTest$ + PyQgsGoogleMapsGeocoder$ + PyQgsGroupLayer$ + PyQgsLayerDefinition$ + PyQgsLayoutHtml$ + PyQgsLayoutLegend$ + PyQgsLayoutMap$ + PyQgsLineSymbolLayers$ + PyQgsMapBoxGlStyleConverter$ + PyQgsMapLayerComboBox$ + PyQgsMapLayerProxyModel$ + PyQgsMemoryProvider$ + PyQgsNetworkAccessManager$ + PyQgsOGRProvider$ + PyQgsOGRProviderGpkg$ + PyQgsPainting$ + PyQgsPalLabelingCanvas$ + PyQgsPalLabelingLayout$ + PyQgsPalLabelingPlacement$ + PyQgsPlot$ + PyQgsPointCloudAttributeByRampRenderer$ + PyQgsPointCloudClassifiedRenderer$ + PyQgsPointCloudRgbRenderer$ + PyQgsProcessExecutablePt1$ + PyQgsProcessExecutablePt2$ + PyQgsProcessingAlgRunner$ + PyQgsProcessingInPlace$ + PyQgsProcessingPackageLayersAlgorithm$ + PyQgsProcessingParameters$ + PyQgsProject$ + PyQgsPythonProvider$ + PyQgsRasterFileWriter$ + PyQgsRasterLayer$ + PyQgsRasterLayerRenderer$ + PyQgsSelectiveMasking$ + PyQgsSettings$ + PyQgsSettingsEntry$ + PyQgsShapefileProvider$ + PyQgsSpatialiteProvider$ + PyQgsStyleModel$ + PyQgsSvgCache$ + PyQgsSymbolLayerReadSld$ + PyQgsTextRenderer$ + PyQgsVectorFileWriter$ + PyQgsVectorLayerCache$ + PyQgsVectorLayerEditBuffer$ + PyQgsVectorLayerEditUtils$ + PyQgsVectorLayerProfileGenerator$ + PyQgsWFSProvider$ + TestQgsRandomMarkerSymbolLayer$ + qgis_sip_uptodate$ + test_3d_3drendering$ + test_3d_layout3dmap$ + test_3d_mesh3drendering$ + test_3d_pointcloud3drendering$ + test_3d_tessellator$ + test_analysis_gcptransformer$ + test_app_advanceddigitizing$ + test_authmethod_authoauth2method$ + test_core_mapdevicepixelratio$ + test_core_ogcutils$ + test_core_openclutils$ + test_core_vectortilelayer$ + test_gui_dockwidget$ + test_gui_ogrprovidergui$ + + PyQgsDocCoverage$ + PyQgsSipCoverage$ + ) + + CMAKE_SKIP_TESTS+=( + test_core_blendmodes$ + test_core_callout$ + test_core_compositionconverter$ + test_core_dataitem$ + test_core_expression$ + test_core_gdalutils$ + test_core_labelingengine$ + test_core_layoutmap$ + test_core_layoutmapoverview$ + test_core_layoutpicture$ + test_core_linefillsymbol$ + test_core_maprendererjob$ + test_core_maprotation$ + test_core_meshlayer$ + test_core_meshlayerrenderer$ + test_core_networkaccessmanager$ + test_core_pointcloudlayerexporter$ + test_core_project$ + test_core_rastercontourrenderer$ + test_core_rasterlayer$ + test_core_simplemarker$ + test_core_tiledownloadmanager$ + test_gui_processinggui$ + test_gui_filedownloader$ + test_gui_newdatabasetablewidget$ + test_gui_queryresultwidget$ + test_analysis_processingalgspt2$ + test_analysis_meshcontours$ + test_analysis_triangulation$ + test_analysis_processing$ + test_provider_wcsprovider$ + test_app_maptoolcircularstring$ + test_app_vertextool$ + ) + + 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+=( + ProcessingGrassAlgorithmsRasterTestPt2$ + ProcessingCheckValidityAlgorithmTest$ + ProcessingGdalAlgorithmsGeneralTest$ + ProcessingGdalAlgorithmsRasterTest$ + ProcessingGdalAlgorithmsVectorTest$ + ProcessingGeneralTest$ + ProcessingGenericAlgorithmsTest$ + ProcessingGrassAlgorithmsImageryTest$ + ProcessingGrassAlgorithmsRasterTestPt1$ + ProcessingGrassAlgorithmsVectorTest$ + ProcessingGuiTest$ + ProcessingModelerTest$ + ProcessingParametersTest$ + ProcessingProjectProviderTest$ + ProcessingQgisAlgorithmsTestPt1$ + ProcessingQgisAlgorithmsTestPt2$ + ProcessingQgisAlgorithmsTestPt3$ + ProcessingQgisAlgorithmsTestPt4$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingQgisAlgorithmsTestPt5$ + ProcessingScriptUtilsTest$ + ProcessingToolsTest$ + ) + fi + + local myctestargs=( --output-on-failure + -j1 ) - virtx cmake_src_test -j1 + xdg_environment_reset + + local -x QGIS_CONTINUOUS_INTEGRATION_RUN="true" + virtx 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 @@ -254,7 +491,7 @@ src_install() { if use examples; then docinto examples dodoc -r "${WORKDIR}"/qgis_sample_data/. - docompress -x /usr/share/doc/${PF}/examples + docompress -x "/usr/share/doc/${PF}/examples" fi if use python; then
