Nicolas Graves <ngraves@HIDDEN>
to control <at> debbugs.gnu.org
.
Full text available.Received: (at 70952) by debbugs.gnu.org; 14 May 2024 20:03:23 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 14 16:03:23 2024 Received: from localhost ([127.0.0.1]:41236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s6yMr-0004Y8-Ae for submit <at> debbugs.gnu.org; Tue, 14 May 2024 16:03:23 -0400 Received: from 4.mo584.mail-out.ovh.net ([178.32.98.131]:42049) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1s6yMk-0004Xe-Ue for 70952 <at> debbugs.gnu.org; Tue, 14 May 2024 16:03:17 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.17.160]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 4Vf6jW60Wsz1K34 for <70952 <at> debbugs.gnu.org>; Tue, 14 May 2024 20:03:11 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-97zb6 (unknown [10.108.54.28]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7D8141FD57; Tue, 14 May 2024 20:03:11 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-97zb6 with ESMTPSA id TvC2FH/DQ2bICAIAV4QBvA (envelope-from <ngraves@HIDDEN>); Tue, 14 May 2024 20:03:11 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S00113dcdb4c-0836-43df-8b50-5a378a015a8b, FB6FD368DB1A33EEB5BF94B3542A6D01FB5CDC61) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves <ngraves@HIDDEN> To: 70952 <at> debbugs.gnu.org Subject: [PATCH 3/3] gnu: qgis: Update to 3.34.6. Date: Tue, 14 May 2024 22:01:22 +0200 Message-ID: <20240514200303.28321-3-ngraves@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240514200303.28321-1-ngraves@HIDDEN> References: <20240514200303.28321-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14086978162804843234 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdegiedgudegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeggeefkeeuledvvdegfeefveehffdugefhhfelhfekteekgeegieevveejhfejtdenucffohhmrghinhepqhhgihhsrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutdejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdelhedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70952 Cc: ngraves@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/geo.scm (qgis): Update to 3.34.6. [arguments]<#:phases>: Update failing tests list. [inputs]: Add draco, freexl, librttopo, minizip, pdal, qt3d-5. Change-Id: If453a6c7451a63ab7b03f3cd0f36aef844acfb15 --- gnu/packages/geo.scm | 90 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 76 insertions(+), 14 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 88f92631092..134174470f0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2900,14 +2900,14 @@ (define-public saga (define-public qgis (package (name "qgis") - (version "3.30.1") + (version "3.34.6") (source (origin (method url-fetch) (uri (string-append "https://qgis.org/downloads/qgis-" version ".tar.bz2")) (sha256 - (base32 "0mdgqyqr3nswp5qfpjrpr35lxizcrz73a1gs3ddxsd1xr9amzb5s")))) + (base32 "1zqyyrbv53vrrh372g503qh8kmy2dlsxcck28khhkh2262m5qfap")))) (build-system cmake-build-system) (arguments (list @@ -2925,7 +2925,6 @@ (define-public qgis ;; Disable tests that require network access "PyQgsExternalStorageAwsS3" "PyQgsExternalStorageWebDav" - "qgis_filedownloader" "test_core_networkaccessmanager" "test_core_tiledownloadmanager" "test_gui_filedownloader" @@ -2950,9 +2949,9 @@ (define-public qgis "ProcessingOtbAlgorithmsTest" ;; TODO: Find why the following tests fail "ProcessingQgisAlgorithmsTestPt1" + "ProcessingQgisAlgorithmsTestPt2" "ProcessingQgisAlgorithmsTestPt3" "ProcessingQgisAlgorithmsTestPt4" - "ProcessingGdalAlgorithmsRasterTest" "ProcessingGdalAlgorithmsVectorTest" "ProcessingGrass7AlgorithmsImageryTest" "ProcessingGrass7AlgorithmsRasterTestPt1" @@ -2965,28 +2964,27 @@ (define-public qgis "test_core_gdalutils" "test_core_labelingengine" "test_core_layoutpicture" - "test_core_layouttable" - "test_core_pointcloudlayerexporter" - "test_core_projectstorage" + "test_core_project" "test_core_coordinatereferencesystem" "test_core_overlayexpression" "test_gui_queryresultwidget" - "test_provider_copcprovider" "test_provider_eptprovider" - "test_analysis_processingalgspt1" "test_analysis_processingalgspt2" + "test_analysis_processingpdalalgs" "test_analysis_processing" "test_app_gpsintegration" + "test_3d_mesh3drendering" "PyQgsAnnotation" + "PyQgsAnnotationLayer" + "PyQgsAnnotationLineItem" + "PyQgsAnnotationLineTextItem" + "PyQgsAnnotationPolygonItem" "PyQgsAuthenticationSystem" - "PyQgsConnectionRegistry" "PyQgsDatumTransform" "PyQgsFileUtils" "PyQgsGeometryTest" "PyQgsGoogleMapsGeocoder" - "PyQgsGroupLayer" "PyQgsHashLineSymbolLayer" - "PyQgsLayerMetadataProviderPython" "PyQgsLayoutHtml" "PyQgsLineSymbolLayers" "PyQgsMapLayer" @@ -2997,13 +2995,71 @@ (define-public qgis "PyQgsProviderConnectionGpkg" "PyQgsProviderConnectionSpatialite" "PyQgsOGRProvider" - "PyQgsSettingsTreeNode" "PyQgsTextRenderer" "PyQgsVectorFileWriter" - "PyQgsVectorLayerEditBuffer" "PyQgsVirtualLayerProvider" "PyQgsAuxiliaryStorage" "PyQgsSelectiveMasking" + "PyPythonRepr" + "PyQgsAnimatedMarkerSymbolLayer" + "PyQgsPythonProvider" + "PyQgsCategorizedSymbolRenderer" + "PyQgsColorRampLegendNode" + "PyQgsEmbeddedSymbolRenderer" + "PyQgsFillSymbolLayers" + "PyQgsGeometryGeneratorSymbolLayer" + "PyQgsGpsLogger" + "PyQgsGraduatedSymbolRenderer" + "PyQgsHighlight" + "PyQgsInterpolatedLineSymbolLayer" + "PyQgsJsonUtils" + "PyQgsLayerTreeView" + "PyQgsLayoutAtlas" + "PyQgsLayoutElevationProfile" + "PyQgsLayoutPageCollection" + "PyQgsLayoutItem" + "PyQgsLayoutLegend" + "PyQgsLayoutMap" + "PyQgsLayoutPage" + "PyQgsLineburstSymbolLayer" + "PyQgsMapCanvas" + "PyQgsMapCanvasAnnotationItem" + "PyQgsMapHitTest" + "PyQgsMarkerLineSymbolLayer" + "PyQgsMergedFeatureRenderer" + "PyQgsMeshLayerProfileGenerator" + "PyQgsPalLabelingPlacement" + "PyQgsPointCloudAttributeByRampRenderer" + "PyQgsPointCloudExtentRenderer" + "PyQgsPointCloudLayerProfileGenerator" + "PyQgsPointClusterRenderer" + "PyQgsPointDisplacementRenderer" + "PyQgsProfileExporter" + "PyQgsProfileRequest" + "TestQgsRandomMarkerSymbolLayer" + "PyQgsRasterAttributeTable" + "PyQgsRasterFileWriterTask" + "PyQgsRasterLayer" + "PyQgsRasterLayerProfileGenerator" + "PyQgsRasterColorRampShader" + "PyQgsRasterLineSymbolLayer" + "PyQgsRasterPipe" + "PyQgsSingleSymbolRenderer" + "PyQgsSimpleFillSymbolLayer" + "PyQgsSimpleLineSymbolLayer" + "PyQgsSymbolLayer" + "PyQgsRasterRendererCreateSld" + "PyQgsSymbolLayerCreateSld" + "PyQgsArrowSymbolLayer" + "PyQgsSymbolExpressionVariables" + "PyQgsStyleModel" + "PyQgsSymbol" + "PyQgsSymbolLayerUtils" + "PyQgsTextFormatWidget" + "PyQgsVectorFieldMarkerSymbolLayer" + "PyQgsVectorLayer" + "PyQgsVectorLayerProfileGenerator" + "PyQgsVectorLayerRenderer" "qgis_sipify" "qgis_sip_include" "qgis_sip_uptodate")) @@ -3068,19 +3124,24 @@ (define-public qgis `("GISBASE" = (,grass-dir))))))))) (inputs (list bash-minimal + draco exiv2 expat + freexl gdal geos gpsbabel grass gsl hdf5 + librttopo libspatialindex libspatialite libxml2 libzip + minizip netcdf + pdal postgresql proj protobuf @@ -3102,6 +3163,7 @@ (define-public qgis python-urllib3 qca qscintilla + qt3d-5 qtbase-5 qtdeclarative-5 qtkeychain -- 2.41.0
guix-patches@HIDDEN
:bug#70952
; Package guix-patches
.
Full text available.Received: (at 70952) by debbugs.gnu.org; 14 May 2024 20:03:21 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 14 16:03:21 2024 Received: from localhost ([127.0.0.1]:41233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s6yMo-0004Xx-Tm for submit <at> debbugs.gnu.org; Tue, 14 May 2024 16:03:21 -0400 Received: from 1.mo575.mail-out.ovh.net ([46.105.41.146]:50439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1s6yMj-0004Xd-3g for 70952 <at> debbugs.gnu.org; Tue, 14 May 2024 16:03:15 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.109.176.72]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4Vf6jV4tGmz1Kv8 for <70952 <at> debbugs.gnu.org>; Tue, 14 May 2024 20:03:10 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-rrfpv (unknown [10.110.178.140]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 687651FDD4; Tue, 14 May 2024 20:03:10 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-rrfpv with ESMTPSA id N0SXFX7DQ2azKgMAbzhEVA (envelope-from <ngraves@HIDDEN>); Tue, 14 May 2024 20:03:10 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0049eb53199-f89e-4c4f-b558-6323e6b40b3a, FB6FD368DB1A33EEB5BF94B3542A6D01FB5CDC61) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves <ngraves@HIDDEN> To: 70952 <at> debbugs.gnu.org Subject: [PATCH 2/3] gnu: qgis: Improve package style. Date: Tue, 14 May 2024 22:01:21 +0200 Message-ID: <20240514200303.28321-2-ngraves@HIDDEN> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240514200303.28321-1-ngraves@HIDDEN> References: <20240514200303.28321-1-ngraves@HIDDEN> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14086696687807619810 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdegiedgudegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeggeefkeeuledvvdegfeefveehffdugefhhfelhfekteekgeegieevveejhfejtdenucffohhmrghinhepqhhgihhsrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugeeirddvtdekpdefjedrheelrddugedvrddutddunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejtdelhedvseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70952 Cc: ngraves@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/geo.scm (qgis)[arguments]<#:phases>: Extract ignored-tests to make them more readable. Re-indent. Change-Id: I2373bba49b9d21ff7dfa0014cf34fafa0e1f3175 --- gnu/packages/geo.scm | 301 ++++++++++++++++++++++--------------------- 1 file changed, 151 insertions(+), 150 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 745239cf664..88f92631092 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2921,7 +2921,93 @@ (define-public qgis #:configure-flags #~(list "-DWITH_QTWEBKIT=NO") #:phases - #~(let* ((grass-version #$(package-version (this-package-input "grass"))) + #~(let* ((ignored-tests (list + ;; Disable tests that require network access + "PyQgsExternalStorageAwsS3" + "PyQgsExternalStorageWebDav" + "qgis_filedownloader" + "test_core_networkaccessmanager" + "test_core_tiledownloadmanager" + "test_gui_filedownloader" + "test_provider_wcsprovider" + ;; Disable tests that need OGR built with + ;; libspatialite support + "PyQgsAttributeTableModel" + "PyQgsOGRProviderSqlite" + "PyQgsWFSProvider" + "PyQgsOapifProvider" + ;; Disable tests that need Python compiled + ;; with loadable SQLite extensions. + "PyQgsFieldFormattersTest" + "PyQgsSpatialiteProvider" + "PyQgsLayerDependencies" + "PyQgsDBManagerGpkg" + "PyQgsDBManagerSpatialite" + ;; Disable tests that need poppler (with Cairo) + "PyQgsLayoutExporter" + "PyQgsPalLabelingLayout" + ;; Disable tests that need Orfeo ToolBox + "ProcessingOtbAlgorithmsTest" + ;; TODO: Find why the following tests fail + "ProcessingQgisAlgorithmsTestPt1" + "ProcessingQgisAlgorithmsTestPt3" + "ProcessingQgisAlgorithmsTestPt4" + "ProcessingGdalAlgorithmsRasterTest" + "ProcessingGdalAlgorithmsVectorTest" + "ProcessingGrass7AlgorithmsImageryTest" + "ProcessingGrass7AlgorithmsRasterTestPt1" + "ProcessingGrass7AlgorithmsRasterTestPt2" + "ProcessingGrass7AlgorithmsVectorTest" + "test_core_authconfig" + "test_core_authmanager" + "test_core_compositionconverter" + "test_core_expression" + "test_core_gdalutils" + "test_core_labelingengine" + "test_core_layoutpicture" + "test_core_layouttable" + "test_core_pointcloudlayerexporter" + "test_core_projectstorage" + "test_core_coordinatereferencesystem" + "test_core_overlayexpression" + "test_gui_queryresultwidget" + "test_provider_copcprovider" + "test_provider_eptprovider" + "test_analysis_processingalgspt1" + "test_analysis_processingalgspt2" + "test_analysis_processing" + "test_app_gpsintegration" + "PyQgsAnnotation" + "PyQgsAuthenticationSystem" + "PyQgsConnectionRegistry" + "PyQgsDatumTransform" + "PyQgsFileUtils" + "PyQgsGeometryTest" + "PyQgsGoogleMapsGeocoder" + "PyQgsGroupLayer" + "PyQgsHashLineSymbolLayer" + "PyQgsLayerMetadataProviderPython" + "PyQgsLayoutHtml" + "PyQgsLineSymbolLayers" + "PyQgsMapLayer" + "PyQgsOGRProviderGpkg" + "PyQgsProcessExecutablePt1" + "PyQgsProcessExecutablePt2" + "PyQgsProjectionSelectionWidgets" + "PyQgsProviderConnectionGpkg" + "PyQgsProviderConnectionSpatialite" + "PyQgsOGRProvider" + "PyQgsSettingsTreeNode" + "PyQgsTextRenderer" + "PyQgsVectorFileWriter" + "PyQgsVectorLayerEditBuffer" + "PyQgsVirtualLayerProvider" + "PyQgsAuxiliaryStorage" + "PyQgsSelectiveMasking" + "qgis_sipify" + "qgis_sip_include" + "qgis_sip_uptodate")) + (grass-version #$(package-version (this-package-input "grass"))) (grass-majorminor (string-join (list-head (string-split grass-version #\.) 2) @@ -2929,142 +3015,57 @@ (define-public qgis (grass-dir (string-append #$(this-package-input "grass") "/grass" grass-majorminor))) (modify-phases %standard-phases - ;; Configure correct path to PyQt5 SIP directory - (add-after 'unpack 'configure-pyqt5-sip-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((sip-dir (string-append - (assoc-ref inputs "python-pyqt+qscintilla") - "/lib/python" - (python:python-version (assoc-ref inputs "python")) - "/site-packages/PyQt5/bindings"))) - (substitute* "cmake/FindPyQt5.py" - (("sip_dir = cfg.default_sip_dir") - (string-append "sip_dir = \"" sip-dir "\""))) - (substitute* "cmake/FindPyQt5.cmake" - (("SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)") - (string-append "SET(PYQT5_SIP_DIR \"" sip-dir "\")")))) - (substitute* (list "tests/code_layout/test_qt_imports.sh" - "tests/code_layout/test_qgsscrollarea.sh") - (("\\$\\(git rev-parse --show-toplevel\\)") - (getcwd))))) - (replace 'check - (lambda* (#:key inputs outputs tests? parallel-tests? - #:allow-other-keys) - (if tests? - (begin - (setenv "HOME" "/tmp") - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - (setenv "TRAVIS" "true") - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (setenv "GISBASE" grass-dir) - (invoke "ctest" - "-j" (if parallel-tests? - (number->string (parallel-job-count)) - "1") - "-E" (string-join - '(;; Disable tests that require network access - "PyQgsExternalStorageAwsS3" - "PyQgsExternalStorageWebDav" - "qgis_filedownloader" - "test_core_networkaccessmanager" - "test_core_tiledownloadmanager" - "test_gui_filedownloader" - "test_provider_wcsprovider" - ;; Disable tests that need OGR built with - ;; libspatialite support - "PyQgsAttributeTableModel" - "PyQgsOGRProviderSqlite" - "PyQgsWFSProvider" - "PyQgsOapifProvider" - ;; Disable tests that need Python compiled - ;; with loadable SQLite extensions. - "PyQgsFieldFormattersTest" - "PyQgsSpatialiteProvider" - "PyQgsLayerDependencies" - "PyQgsDBManagerGpkg" - "PyQgsDBManagerSpatialite" - ;; Disable tests that need poppler (with Cairo) - "PyQgsLayoutExporter" - "PyQgsPalLabelingLayout" - ;; Disable tests that need Orfeo ToolBox - "ProcessingOtbAlgorithmsTest" - ;; TODO: Find why the following tests fail - "ProcessingQgisAlgorithmsTestPt1" - "ProcessingQgisAlgorithmsTestPt3" - "ProcessingQgisAlgorithmsTestPt4" - "ProcessingGdalAlgorithmsRasterTest" - "ProcessingGdalAlgorithmsVectorTest" - "ProcessingGrass7AlgorithmsImageryTest" - "ProcessingGrass7AlgorithmsRasterTestPt1" - "ProcessingGrass7AlgorithmsRasterTestPt2" - "ProcessingGrass7AlgorithmsVectorTest" - "test_core_authconfig" - "test_core_authmanager" - "test_core_compositionconverter" - "test_core_expression" - "test_core_gdalutils" - "test_core_labelingengine" - "test_core_layoutpicture" - "test_core_layouttable" - "test_core_pointcloudlayerexporter" - "test_core_projectstorage" - "test_core_coordinatereferencesystem" - "test_core_overlayexpression" - "test_gui_queryresultwidget" - "test_provider_copcprovider" - "test_provider_eptprovider" - "test_analysis_processingalgspt1" - "test_analysis_processingalgspt2" - "test_analysis_processing" - "test_app_gpsintegration" - "PyQgsAnnotation" - "PyQgsAuthenticationSystem" - "PyQgsConnectionRegistry" - "PyQgsDatumTransform" - "PyQgsFileUtils" - "PyQgsGeometryTest" - "PyQgsGoogleMapsGeocoder" - "PyQgsGroupLayer" - "PyQgsHashLineSymbolLayer" - "PyQgsLayerMetadataProviderPython" - "PyQgsLayoutHtml" - "PyQgsLineSymbolLayers" - "PyQgsMapLayer" - "PyQgsOGRProviderGpkg" - "PyQgsProcessExecutablePt1" - "PyQgsProcessExecutablePt2" - "PyQgsProjectionSelectionWidgets" - "PyQgsProviderConnectionGpkg" - "PyQgsProviderConnectionSpatialite" - "PyQgsOGRProvider" - "PyQgsSettingsTreeNode" - "PyQgsTextRenderer" - "PyQgsVectorFileWriter" - "PyQgsVectorLayerEditBuffer" - "PyQgsVirtualLayerProvider" - "PyQgsAuxiliaryStorage" - "PyQgsSelectiveMasking" - "qgis_sipify" - "qgis_sip_include" - "qgis_sip_uptodate") - "|"))) - (format #t "test suite not run~%")))) - (add-after 'install 'wrap-python - (assoc-ref python:%standard-phases 'wrap)) - (add-after 'wrap-python 'wrap-qt - (lambda* (#:key outputs inputs #:allow-other-keys) - (wrap-qt-program "qgis" #:output #$output #:inputs inputs))) - (add-after 'wrap-qt 'wrap-gis - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; TODO: Find if there is a way to get SAGA to work. - ;; Currently QGIS says "version of SAGA not supported". - ;; Disable it for now. - (wrap-program (string-append #$output "/bin/qgis") - ;; `("PATH" ":" prefix - ;; (,(dirname (search-input-file inputs "/bin/saga_cmd")))) - `("QGIS_PREFIX_PATH" = (,#$output)) - `("GISBASE" = (,grass-dir))))))))) + ;; Configure correct path to PyQt5 SIP directory + (add-after 'unpack 'configure-pyqt5-sip-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((sip-dir (string-append + (assoc-ref inputs "python-pyqt+qscintilla") + "/lib/python" + (python:python-version (assoc-ref inputs "python")) + "/site-packages/PyQt5/bindings"))) + (substitute* "cmake/FindPyQt5.py" + (("sip_dir = cfg.default_sip_dir") + (string-append "sip_dir = \"" sip-dir "\""))) + (substitute* "cmake/FindPyQt5.cmake" + (("\ +SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)") + (string-append "SET(PYQT5_SIP_DIR \"" sip-dir "\")")))) + (substitute* (list "tests/code_layout/test_qt_imports.sh" + "tests/code_layout/test_qgsscrollarea.sh") + (("\\$\\(git rev-parse --show-toplevel\\)") + (getcwd))))) + (replace 'check + (lambda* (#:key inputs outputs tests? parallel-tests? + #:allow-other-keys) + (if tests? + (begin + (setenv "HOME" "/tmp") + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (setenv "TRAVIS" "true") + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (setenv "GISBASE" grass-dir) + (invoke "ctest" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + "-E" (string-join ignored-tests "|"))) + (format #t "test suite not run~%")))) + (add-after 'install 'wrap-python + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'wrap-python 'wrap-qt + (lambda* (#:key inputs #:allow-other-keys) + (wrap-qt-program "qgis" #:output #$output #:inputs inputs))) + (add-after 'wrap-qt 'wrap-gis + (lambda* (#:key inputs #:allow-other-keys) + ;; TODO: Find if there is a way to get SAGA to work. + ;; Currently QGIS says "version of SAGA not supported". + ;; Disable it for now. + (wrap-program (string-append #$output "/bin/qgis") + ;; `("PATH" ":" prefix + ;; (,(dirname (search-input-file inputs "/bin/saga_cmd")))) + `("QGIS_PREFIX_PATH" = (,#$output)) + `("GISBASE" = (,grass-dir))))))))) (inputs (list bash-minimal exiv2 @@ -3114,19 +3115,19 @@ (define-public qgis (list zstd "lib"))) (native-inputs (append - (list bison - flex - perl - perl-yaml-tiny - pkg-config - python-mock - python-nose2 - python-pyqt-builder - qttools-5) - (if (supported-package? shellcheck) - (list shellcheck) - '()) - (list xorg-server-for-tests))) + (list bison + flex + perl + perl-yaml-tiny + pkg-config + python-mock + python-nose2 + python-pyqt-builder + qttools-5) + (if (supported-package? shellcheck) + (list shellcheck) + '()) + (list xorg-server-for-tests))) (home-page "https://qgis.org") (synopsis "Geographical information system") (description "QGIS is an easy to use Geographical Information -- 2.41.0
guix-patches@HIDDEN
:bug#70952
; Package guix-patches
.
Full text available.Received: (at 70952) by debbugs.gnu.org; 14 May 2024 20:03:19 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 14 16:03:18 2024 Received: from localhost ([127.0.0.1]:41231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s6yMm-0004Xq-BQ for submit <at> debbugs.gnu.org; Tue, 14 May 2024 16:03:18 -0400 Received: from 5.mo576.mail-out.ovh.net ([46.105.43.105]:34731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1s6yMi-0004Xc-Nv for 70952 <at> debbugs.gnu.org; Tue, 14 May 2024 16:03:15 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.176.72]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id 4Vf6jT4RDVz1kZJ for <70952 <at> debbugs.gnu.org>; Tue, 14 May 2024 20:03:09 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zqfx9 (unknown [10.110.113.175]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 51D421FD2E; Tue, 14 May 2024 20:03:09 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-zqfx9 with ESMTPSA id JExnEH3DQ2ZIHyUAQs/XxA (envelope-from <ngraves@HIDDEN>); Tue, 14 May 2024 20:03:09 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002e40fa65f-8294-40b9-98bd-393d120b9e30, FB6FD368DB1A33EEB5BF94B3542A6D01FB5CDC61) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves <ngraves@HIDDEN> To: 70952 <at> debbugs.gnu.org Subject: [PATCH 1/3] gnu: qgis: Improve package style. Date: Tue, 14 May 2024 22:01:20 +0200 Message-ID: <20240514200303.28321-1-ngraves@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14086415211998077666 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdegiedgudegfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtleehvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70952 Cc: ngraves@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * gnu/packages/geo.scm (qgis)[arguments]: Use gexp. Change-Id: Ib72ae48ca0895109548e676c6da2d80ac2e1eca6 --- gnu/packages/geo.scm | 57 +++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 7da0a7d7ef5..745239cf664 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2910,17 +2910,25 @@ (define-public qgis (base32 "0mdgqyqr3nswp5qfpjrpr35lxizcrz73a1gs3ddxsd1xr9amzb5s")))) (build-system cmake-build-system) (arguments - `(#:modules ((guix build cmake-build-system) + (list + #:modules '((guix build cmake-build-system) ((guix build python-build-system) #:prefix python:) (guix build qt-utils) (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules + #:imported-modules `(,@%cmake-build-system-modules (guix build python-build-system) (guix build qt-utils)) - #:configure-flags - '("-DWITH_QTWEBKIT=NO") - #:phases - (modify-phases %standard-phases + #:configure-flags + #~(list "-DWITH_QTWEBKIT=NO") + #:phases + #~(let* ((grass-version #$(package-version (this-package-input "grass"))) + (grass-majorminor (string-join + (list-head + (string-split grass-version #\.) 2) + "")) + (grass-dir (string-append #$(this-package-input "grass") + "/grass" grass-majorminor))) + (modify-phases %standard-phases ;; Configure correct path to PyQt5 SIP directory (add-after 'unpack 'configure-pyqt5-sip-path (lambda* (#:key inputs #:allow-other-keys) @@ -2942,21 +2950,14 @@ (define-public qgis (replace 'check (lambda* (#:key inputs outputs tests? parallel-tests? #:allow-other-keys) - (when tests? + (if tests? + (begin (setenv "HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") (setenv "TRAVIS" "true") (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (let* ((out (assoc-ref outputs "out")) - (grass-version ,(package-version grass)) - (grass-majorminor (string-join - (list-head - (string-split grass-version #\.) 2) - "")) - (grass (string-append (assoc-ref inputs "grass") - "/grass" grass-majorminor))) - (setenv "GISBASE" grass)) + (setenv "GISBASE" grass-dir) (invoke "ctest" "-j" (if parallel-tests? (number->string (parallel-job-count)) @@ -3047,31 +3048,23 @@ (define-public qgis "qgis_sipify" "qgis_sip_include" "qgis_sip_uptodate") - "|"))))) + "|"))) + (format #t "test suite not run~%")))) (add-after 'install 'wrap-python (assoc-ref python:%standard-phases 'wrap)) (add-after 'wrap-python 'wrap-qt (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "qgis" #:output out #:inputs inputs)))) + (wrap-qt-program "qgis" #:output #$output #:inputs inputs))) (add-after 'wrap-qt 'wrap-gis (lambda* (#:key inputs outputs #:allow-other-keys) ;; TODO: Find if there is a way to get SAGA to work. ;; Currently QGIS says "version of SAGA not supported". ;; Disable it for now. - (let* ((out (assoc-ref outputs "out")) - ;;(saga (string-append (assoc-ref inputs "saga") "/bin")) - (grass-version ,(package-version grass)) - (grass-majorminor (string-join - (list-head - (string-split grass-version #\.) 2) - "")) - (grass (string-append (assoc-ref inputs "grass") - "/grass" grass-majorminor))) - (wrap-program (string-append out "/bin/qgis") - ;;`("PATH" ":" prefix (,saga)) - `("QGIS_PREFIX_PATH" = (,out)) - `("GISBASE" = (,grass))))))))) + (wrap-program (string-append #$output "/bin/qgis") + ;; `("PATH" ":" prefix + ;; (,(dirname (search-input-file inputs "/bin/saga_cmd")))) + `("QGIS_PREFIX_PATH" = (,#$output)) + `("GISBASE" = (,grass-dir))))))))) (inputs (list bash-minimal exiv2 -- 2.41.0
guix-patches@HIDDEN
:bug#70952
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 14 May 2024 19:59:45 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 14 15:59:44 2024 Received: from localhost ([127.0.0.1]:41201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s6yJK-0004SK-DP for submit <at> debbugs.gnu.org; Tue, 14 May 2024 15:59:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:52200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>) id 1s6yJH-0004S9-Hi for submit <at> debbugs.gnu.org; Tue, 14 May 2024 15:59:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ngraves@HIDDEN>) id 1s6yJF-0001gq-Su for guix-patches@HIDDEN; Tue, 14 May 2024 15:59:37 -0400 Received: from 19.mo582.mail-out.ovh.net ([188.165.56.177]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ngraves@HIDDEN>) id 1s6yJB-0000T8-2v for guix-patches@HIDDEN; Tue, 14 May 2024 15:59:35 -0400 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.140.5]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Vf6dG1JDDz1JCt for <guix-patches@HIDDEN>; Tue, 14 May 2024 19:59:30 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-4sltp (unknown [10.111.182.237]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BBBE01FD46; Tue, 14 May 2024 19:59:29 +0000 (UTC) Received: from ngraves.fr ([37.59.142.102]) by ghost-submission-6684bf9d7b-4sltp with ESMTPSA id giNZIaHCQ2bHAwIAF11Vwg (envelope-from <ngraves@HIDDEN>); Tue, 14 May 2024 19:59:29 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-102R00435e5ee78-69ab-4fea-a697-7bf5c4299663, FB6FD368DB1A33EEB5BF94B3542A6D01FB5CDC61) smtp.auth=ngraves@HIDDEN X-OVh-ClientIp: 81.67.146.208 From: Nicolas Graves <ngraves@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH 0/3] gnu: qgis: Update to 3.34.6. Date: Tue, 14 May 2024 21:58:20 +0200 Message-ID: <20240514195926.21459-1-ngraves@HIDDEN> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 14024772190161003234 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrvdegiedgudegvdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=188.165.56.177; envelope-from=ngraves@HIDDEN; helo=19.mo582.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: ngraves@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) This patch series updates qgis to last LTS version 3.34.6. It depends on 70319 v2. Nicolas Graves (3): gnu: qgis: Improve package style. gnu: qgis: Improve package style. gnu: qgis: Update to 3.34.6. gnu/packages/geo.scm | 400 ++++++++++++++++++++++++------------------- 1 file changed, 228 insertions(+), 172 deletions(-) -- 2.41.0
Nicolas Graves <ngraves@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#70952
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.