From unknown Tue Jun 17 08:56:04 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#68925 <68925@debbugs.gnu.org> To: bug#68925 <68925@debbugs.gnu.org> Subject: Status: [PATCH 0/8] Update proj to 9.3.1. Reply-To: bug#68925 <68925@debbugs.gnu.org> Date: Tue, 17 Jun 2025 15:56:04 +0000 retitle 68925 [PATCH 0/8] Update proj to 9.3.1. reassign 68925 guix-patches submitter 68925 Felix Gruber severity 68925 normal tag 68925 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:45:04 2024 Received: (at submit) by debbugs.gnu.org; 4 Feb 2024 16:45:04 +0000 Received: from localhost ([127.0.0.1]:49897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfc8-00087k-9U for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:45:04 -0500 Received: from lists.gnu.org ([2001:470:142::17]:43082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfc3-00086w-M3 for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:45:03 -0500 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 ) id 1rWfbl-0001bg-J8 for guix-patches@gnu.org; Sun, 04 Feb 2024 11:44:41 -0500 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rWfbj-0004Ul-CH for guix-patches@gnu.org; Sun, 04 Feb 2024 11:44:41 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4CDED240028 for ; Sun, 4 Feb 2024 17:44:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065075; bh=rQ/6FfRXYnpvor+uRPeF1IOqUmmt/JVLQE5JUrB9ktA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=AbV+uH1fiZh5tzB5mxmoVEpUzFI3rrfywVduk7fmLt2G3w4pMyT2QhExshY2NFa/v XavXus0lWRvuYe2fVzYM7medebQ+G/MJU+aSMDrdKQMVHmkLzuznM8wGiomQY875rY ag1sEIk2x1MhYJpHFFlRA+sEHKr0qtnyk10IXdLkExqCCtqRcQ8nd3ZwoUf40RVMJc Mwlh2DZh50ISXbtiQZSxo54rOv+6RBBDd2sWll47xg/4LCaj7k/HKG6QN5Jl7U6sKQ RaC9zDNXR5ZaqEHt8iKrCQY2+GareKSElgYa/giW5wgm2dmrHBlW9St/E5A7dhcvFN dB9nl05f8qY6g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb2V5HWdz9rxL; Sun, 4 Feb 2024 17:44:34 +0100 (CET) From: Felix Gruber To: guix-patches@gnu.org Subject: [PATCH 0/8] Update proj to 9.3.1. Date: Sun, 4 Feb 2024 16:43:59 +0000 Message-ID: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=felgru@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This patch set updates proj to 9.3.1 and also updates some packages that depend on proj to make sure that they still build. Felix Gruber (8): gnu: proj: Update to 9.3.1. gnu: python-pyproj: Update to 3.6.1. gnu: libgeotiff: Fix build with proj 9.3.1. gnu: geos: Update to 3.12.1. gnu: python-shapely: Update to 2.0.2. gnu: python-pyshp: Update to 2.3.1. gnu: grass: Update to 7.8.8. gnu: qgis: Fix build against proj 9.3.1. gnu/local.mk | 3 + gnu/packages/geo.scm | 62 ++++++++++++------- .../libgeotiff-fix-tests-on-i386.patch | 35 +++++++++++ ...libgeotiff-fix-tests-with-proj-9.3.0.patch | 51 +++++++++++++++ ...libgeotiff-fix-tests-with-proj-9.3.1.patch | 40 ++++++++++++ gnu/packages/python-xyz.scm | 7 +-- 6 files changed, 171 insertions(+), 27 deletions(-) create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch base-commit: abeffc82379c4f9bd2e6226ea27453b22cb4e0c8 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:48:49 2024 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:48:49 +0000 Received: from localhost ([127.0.0.1]:49906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffk-0008Ij-UQ for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:49 -0500 Received: from mout01.posteo.de ([185.67.36.65]:59881) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffg-0008He-RX for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:47 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2D31E240027 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065307; bh=prazHtby3O6YtTAcYsSgjqZd9N01euQjA7Iz7tQuqfg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: Content-Transfer-Encoding:From; b=Y50mA0NSHIC/2+MRAGYYeCNFws5t1ZFkELgD/ibt/KZF4PHBPoTcjS0nlMSuLdoJR sImnOlKRXgm03OJNzs8Uo8UV09GXE8vOcvRxZvZdsELdGjA+YPVbMukEvVEhn6g4SU Ag/1v5WSvMHV7ok6qry6NnXW2gHm6/FUCxOi4tFGNUVU4XgG/xn8vAgBByyXFVr8bB qoHQqKK/+ALXBLgrrllSCBtmWM8ADvr9mzNw9m+SQEpAyqVrv6ZAiMvpdJ03rEUs1v qrqgnlfvkg7QzrELS4RU13pr4LJZPafc2xHCTueCaVKt2I1LOFgSlDQqsk3rLzGogd ziqnfl1xs/7gA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb6y38t3z6tyV; Sun, 4 Feb 2024 17:48:26 +0100 (CET) From: Felix Gruber To: 68925@debbugs.gnu.org Subject: [PATCH 1/8] gnu: proj: Update to 9.3.1. Date: Sun, 4 Feb 2024 16:47:11 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/geo.scm (proj): Update to 9.3.1. Change-Id: I176efdba12761b81b90c8a53c362e4e66bd08fca --- gnu/packages/geo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index e053179a51..4d76095d67 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2019, 2020 Hartmut Goebel ;;; Copyright © 2020, 2022 Marius Bakke ;;; Copyright © 2020 Christopher Baines -;;; Copyright © 2020, 2021, 2022, 2023 Felix Gruber +;;; Copyright © 2020–2024 Felix Gruber ;;; Copyright © 2021, 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2021, 2023, 2024 Vinicius Monego ;;; Copyright © 2021 Clément Lassieur @@ -740,7 +740,7 @@ (define-public libspatialite (define-public proj (package (name "proj") - (version "9.2.0") + (version "9.3.1") (source (origin (method url-fetch) @@ -748,7 +748,7 @@ (define-public proj version ".tar.gz")) (sha256 (base32 - "03nm1sgvh237my7ss6kayn6887cbnayvjxrrxsrfcakkmbsida6y")))) + "1g0hkpiablvhsmw0kn5frwgdir3q7avc45p6lc1zhhhzkv5ikydh")))) (build-system cmake-build-system) (native-inputs (list googletest pkg-config)) (propagated-inputs (list curl libtiff sqlite)) ;required by proj.pc -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:48:51 2024 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:48:51 +0000 Received: from localhost ([127.0.0.1]:49910 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffm-0008J3-L2 for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:50 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffk-0008I7-Sp for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:49 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 371A4240028 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065311; bh=c8g6+wbePDyCCIUrlt+CTI+1DnMrjQrXQA8cczG9aGE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=OV0jwy/XmQx78xPG2c2/h7kEK9uDjolCUS/yTj5cG5lESE3wJTmJQbydwYYV4f16I tg/Kcs7TIcOo82/E1xB4z9G4WJXf+KXJbPDejc4e35U15OBHbRBnEdb1nDhoa6w1R5 nJhjaun7R2u1z5MC7FuyGVlmSN/JqiJj/VTNpyCRgZfDYjBNp7IMAz+XKzasi8gYtA MYhOOxE6KaDXtZojNEidRErbEijak5S8cSqvHJljydE+HzRK5E64ibPHYr/8WOIbn5 SnuRyrFT4A4mSzd9RMjUSfEdtseE9BucAbrjAjOCGW6Q9eQJ0z6NicYUzMipC+G3yZ +WhhAfVaQH2IA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb725Bxjz9rxD; Sun, 4 Feb 2024 17:48:30 +0100 (CET) From: Felix Gruber To: 68925@debbugs.gnu.org Subject: [PATCH 2/8] gnu: python-pyproj: Update to 3.6.1. Date: Sun, 4 Feb 2024 16:47:12 +0000 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/geo.scm (python-pyproj): Update to 3.6.1. [arguments]: Convert to gexp. Change-Id: I0ef2bf3da8d35b728f4ba4009caca33fa18dbad3 --- gnu/packages/geo.scm | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4d76095d67..5882271174 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -844,31 +844,36 @@ (define-public proj.4 (define-public python-pyproj (package (name "python-pyproj") - (version "3.5.0") + (version "3.6.1") (source (origin (method url-fetch) (uri (pypi-uri "pyproj" version)) (sha256 (base32 - "1xhvr0n5gb7v6x0wd7cqmc0zrky2fag7bq2shx6l2qqq3icx2ncq")))) + "1gq1spm5zdq9k8kl9cb31b9m08ybyrdggfw3sjrqyz9b9iq7raj4")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-proj-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((proj (assoc-ref inputs "proj"))) - (setenv "PROJ_DIR" proj) - (substitute* "pyproj/datadir.py" - (("(internal_datadir = ).*$" all var) - (string-append var "Path(\"" proj "/share/proj\")\n"))))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-proj-path + (lambda* (#:key #:allow-other-keys) + (let ((proj #$(this-package-input "proj"))) + (setenv "PROJ_DIR" proj) + (substitute* "pyproj/datadir.py" + (("(internal_datadir = ).*$" all var) + (string-append var "Path(\"" proj + "/share/proj\")\n"))))))))) (inputs (list proj)) (propagated-inputs (list python-certifi)) (native-inputs - (list python-cython python-numpy python-pandas python-pytest + (list python-cython + python-numpy + python-pandas + python-pytest python-xarray)) (home-page "https://github.com/pyproj4/pyproj") (synopsis -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:48:54 2024 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:48:55 +0000 Received: from localhost ([127.0.0.1]:49914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffq-0008JX-1M for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:54 -0500 Received: from mout01.posteo.de ([185.67.36.65]:46557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffn-0008IN-Dl for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:52 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B99DE240027 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065313; bh=kX6rmTDoL5SgAPdkoKPJTylpNNOVJsOeik+Mw7YdZ5I=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=J/1NYiSeVXtkextOzbJWUkQU2mkLkyUw27HS79amlyArnq6ODIQt1jWsO5/XWliyC AmHvzb9FRXXU2106WK89ibgtle8IyLatE1uvpnAJ6/HOL/RGG5VGINMeicTc5tNSeB mWxjY2CKnf3nkefK1O0f5kOfdZ0bk6D4zc5jbDZ0uQv2kGO/zezaooQv0zHQygwQi0 EezjulwWQ4nKuuPVk2OHnS94OpsVVZcO2aXzQ6PxEmlFbY8h/Ewrl2Za8M6a/5OJ37 +ZoHt2rWhlao1C1nqv6JQh/f92pPq2U3j6ppv8Ee2zL6g9XOAi4pw3CLcHRgj193Fv uayqGfyL6mUzQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb75256Nz6tv5; Sun, 4 Feb 2024 17:48:33 +0100 (CET) From: Felix Gruber To: 68925@debbugs.gnu.org Subject: [PATCH 3/8] gnu: libgeotiff: Fix build with proj 9.3.1. Date: Sun, 4 Feb 2024 16:47:13 +0000 Message-ID: <211fa5ea43e32825f49e130ca30adcac5e49401b.1707064733.git.felgru@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/geo.scm (libgeotiff): [source]: Add patches to fix build with proj 9.3.1. * gnu/local.mk: Add patch files. * gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch: New file. * gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch: New file. * gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch: New file. Change-Id: I5f09e793698b0b137888faa0f595ef06850c6160 --- gnu/local.mk | 3 ++ gnu/packages/geo.scm | 6 ++- .../libgeotiff-fix-tests-on-i386.patch | 35 +++++++++++++ ...libgeotiff-fix-tests-with-proj-9.3.0.patch | 51 +++++++++++++++++++ ...libgeotiff-fix-tests-with-proj-9.3.1.patch | 40 +++++++++++++++ 5 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbdb285695..591445a7ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1507,6 +1507,9 @@ dist_patch_DATA = \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ + %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch \ + %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ + %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5882271174..3171efa0dc 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -548,7 +548,11 @@ (define-public libgeotiff (method url-fetch) (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" version ".tar.gz")) - (patches (search-patches "libgeotiff-fix-tests-with-proj-9.1.1.patch")) + (patches + (search-patches "libgeotiff-fix-tests-with-proj-9.1.1.patch" + "libgeotiff-fix-tests-with-proj-9.3.0.patch" + "libgeotiff-fix-tests-with-proj-9.3.1.patch" + "libgeotiff-fix-tests-on-i386.patch")) (sha256 (base32 "1mjmgv48x51ppax5dnb6lq7z600czxll53bx6jbzqwd4m93i7aq5")) (modules '((guix build utils))) diff --git a/gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch b/gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch new file mode 100644 index 0000000000..e84f726a3d --- /dev/null +++ b/gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch @@ -0,0 +1,35 @@ +From 9990160268fafb71751d4f3a9ad724df70cb9451 Mon Sep 17 00:00:00 2001 +From: Bas Couwenberg +Date: Fri, 1 Dec 2023 10:35:46 +0100 +Subject: [PATCH] Fix test failure on i386. + +--- +https://github.com/OSGeo/libgeotiff/pull/107 + + test/testlistgeo | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/test/testlistgeo b/test/testlistgeo +index 48e92eb..ceec2e6 100755 +--- a/test/testlistgeo ++++ b/test/testlistgeo +@@ -218,6 +218,9 @@ echo "" >>${OUT} + sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp + mv ${OUT}.tmp ${OUT} + ++sed "s/ProjCenterLongGeoKey: 46.437229 ( 46d26'14.02\"E)/ProjCenterLongGeoKey: 46.437229 ( 46d26'14.03\"E)/" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++ + sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized + + sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp +@@ -230,6 +233,9 @@ mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp + mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + ++sed "s/ProjCenterLongGeoKey: 46.437229 ( 46d26'14.02\"E)/ProjCenterLongGeoKey: 46.437229 ( 46d26'14.03\"E)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized ++ + # do 'diff' with distribution results + # after cleaning for avoid spurios result due + # to different build dir diff --git a/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch new file mode 100644 index 0000000000..5d381d78e2 --- /dev/null +++ b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch @@ -0,0 +1,51 @@ +From 3806fdab4a17f44641a2113faec778e756e2be3d Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Tue, 29 Aug 2023 19:04:25 +0200 +Subject: [PATCH] Fix 'make check' to pass with PROJ 9.3 (fixes #89) + +--- +https://github.com/OSGeo/libgeotiff/pull/90 + + test/testlistgeo | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/test/testlistgeo b/test/testlistgeo +index 9a41e74..48e92eb 100755 +--- a/test/testlistgeo ++++ b/test/testlistgeo +@@ -218,14 +218,24 @@ echo "" >>${OUT} + sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp + mv ${OUT}.tmp ${OUT} + +-sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp ++sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized ++ ++sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++ ++sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized ++sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + + # do 'diff' with distribution results + # after cleaning for avoid spurios result due + # to different build dir + sed -e "s/Testing listgeo .*test/Testing listgeo ..\/test/" -i ${OUT} + echo "diff ${OUT} with testlistgeo_out.dist" +-diff -u ${OUT} testlistgeo_out.dist.tmp ++diff -u ${OUT} testlistgeo_out.dist.normalized + if [ $? -ne 0 ] ; then + echo "" + echo "PROBLEMS HAVE OCCURRED" +@@ -236,7 +246,7 @@ else + echo "TEST OK" + echo "test file ${OUT} removed" + echo +- rm testlistgeo_out.dist.tmp ++ rm testlistgeo_out.dist.normalized + /bin/rm -f ${OUT} + exit 0 + fi diff --git a/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch new file mode 100644 index 0000000000..e9a28d1fcd --- /dev/null +++ b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch @@ -0,0 +1,40 @@ +From 4f90e57fa1cac7afdd57e5f649775cb24aa15612 Mon Sep 17 00:00:00 2001 +From: Bas Couwenberg +Date: Fri, 1 Dec 2023 08:23:20 +0100 +Subject: [PATCH] Fix test failure with PROJ 9.3.1. + +Closes: #104 +--- +https://github.com/OSGeo/libgeotiff/pull/105 + + test/testlistgeo | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/test/testlistgeo b/test/testlistgeo +index 48e92eb..4331cc3 100755 +--- a/test/testlistgeo ++++ b/test/testlistgeo +@@ -218,6 +218,11 @@ echo "" >>${OUT} + sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp + mv ${OUT}.tmp ${OUT} + ++sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/g" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++ + sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized + + sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp +@@ -230,6 +235,11 @@ mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp + mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + ++sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized ++sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized ++ + # do 'diff' with distribution results + # after cleaning for avoid spurios result due + # to different build dir -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:48:57 2024 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:48:57 +0000 Received: from localhost ([127.0.0.1]:49918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffs-0008Jw-UP for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:57 -0500 Received: from mout01.posteo.de ([185.67.36.65]:33965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffq-0008Ii-2Q for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:55 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 61F6D240027 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065316; bh=Kh2N5ze6PEyS8OphjCXcKTHmoHlwUyQYNbnyBGKsv5M=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=VBEGPqDl7bVRJ0ktu/6csGOIFadM2KQDmGIrmLd5TaRWKKaUJy0J8+IeoZA+Ddd4X xPfUfLpI7NVymItjWwKzTEyIqEha1nSqERgix59KE/XILT31yrFr0caAXx6MaAZRbv lkOP1ZX5wW67BXv/eCOHxy5Eq2urH77gaihFBNOOFzL3UVwa0WZclj9YMaGxVZvZHO X2uvmFinnBSsBYbEM2zLoUfH0zhUIARMTwsbskPuGOYX7wsb87EGNBemefNhA2/Cw5 8eHsdKhhWzsGsCp7JfoPhhLzwDrxLikQlb2zGVPYx4CVmcluu5aGsSNAHv1ZvSbKJ9 zjeCxNYxO8liw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb776RdSz9rxL; Sun, 4 Feb 2024 17:48:35 +0100 (CET) From: Felix Gruber To: 68925@debbugs.gnu.org Subject: [PATCH 4/8] gnu: geos: Update to 3.12.1. Date: Sun, 4 Feb 2024 16:47:14 +0000 Message-ID: <47fe14f1cce5c7b89b3954364bf4b2353a8e17b7.1707064733.git.felgru@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/geo.scm (geos): Update to 3.12.1. [arguments]: Update 'patch-test-shebangs. Change-Id: I4c5a7dd0ce0e95f813474ff4841a844e63451d24 --- gnu/packages/geo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3171efa0dc..6135451c16 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -434,7 +434,7 @@ (define-public memphis (define-public geos (package (name "geos") - (version "3.11.2") + (version "3.12.1") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geos/geos-" @@ -442,7 +442,7 @@ (define-public geos ".tar.bz2")) (sha256 (base32 - "1k744nwfa5sj4amzsdjxgac83wh6xfb9xi7z5bka7ic1jik7gw5i")))) + "00qdk9a4048pzfj2rhzkfw3lvm642znf6kr4x29i3d94494pxsnn")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -450,7 +450,7 @@ (define-public geos 'unpack 'patch-test-shebangs (lambda _ (substitute* '("tests/xmltester/testrunner.sh" - "tests/geostest/testrunner.sh") + "tests/xmltester/safe_to_xml.sh") (("/bin/sh") (which "sh")))))))) (inputs (list glib)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:49:05 2024 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:49:05 +0000 Received: from localhost ([127.0.0.1]:49938 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfg1-0008LR-Ac for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:49:05 -0500 Received: from mout02.posteo.de ([185.67.36.66]:43481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffy-0008Ju-Hx for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:49:03 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 44EB6240104 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065324; bh=k1c7HYCzYj6HLdX9F2ptc+Uu/8JUGHUOvo+EY6AFs/Y=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=dUHLBC1SkBmOgO65WZB6NKQ46IibJK0AYGf4wg38SRlWd0Z6dfvXqOY28Zd4oy2GX GfKNMTFE/tNt9k2FvRPqJn5rs8DQs2/gJ6gq8PfBs33Gz8Brtp1LYWkF1DrcSmVxKA B4zcJ2/81CP+WRTk6NYvwsaZLtKuEXKztiEnL72UMBim2Jv+mgPIY42xXOvnssMHUW s5BFk2J9epS4f4yrYbAxG3YGH7P3I5nmq6L5ujlbpEe6wcH9/i3aKOWFb/Jh4LFR+j kwchJtT4ix+nd95XMvBZ1hMIdG9jNjwVRQDH+m3ewhGe7z+9r51Ym/jOItD3FFUH0D UWvwx6/Q1Ve7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb7H4QzSz6txQ; Sun, 4 Feb 2024 17:48:43 +0100 (CET) From: Felix Gruber To: 68925@debbugs.gnu.org Subject: [PATCH 5/8] gnu: python-shapely: Update to 2.0.2. Date: Sun, 4 Feb 2024 16:47:15 +0000 Message-ID: <5492a421b1c753de816a6586765b11042e6ac0b8.1707064733.git.felgru@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , jgart Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/python-xyz.scm (python-shapely): Update to 2.0.2. [native-inputs]: Remove python-pytest-cov. Change-Id: I4358c16d53c97a0cd38e3689d65ead770b2e997c --- gnu/packages/python-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c68b17b0ab..a645c45a4c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2265,13 +2265,13 @@ (define-public python-rasterio (define-public python-shapely (package (name "python-shapely") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (pypi-uri "shapely" version)) (sha256 - (base32 "14v88k0y7qhp8n5clip6w96pkdzrfqa2hsjkhpy9gkifwyiv39k6")))) + (base32 "1rs90q4ys5cav0hz1dq72wq2mk4aqlqqbfjrnb2zzfkiq42cq4qp")))) (build-system pyproject-build-system) (arguments (list @@ -2282,8 +2282,7 @@ (define-public python-shapely ;; Cython extensions have to be built before running the tests. (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs - (list python-cython python-matplotlib python-pytest - python-pytest-cov)) + (list python-cython python-matplotlib python-pytest)) (inputs (list geos)) (propagated-inputs -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:49:09 2024 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:49:09 +0000 Received: from localhost ([127.0.0.1]:49942 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfg4-0008Lh-LJ for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:49:08 -0500 Received: from mout02.posteo.de ([185.67.36.66]:45619) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfg3-0008KP-5t for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:49:07 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 7E9C2240103 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065329; bh=NqFtDn3YzJp6f86PMUGAlghQ2IPu5TqFQwkKgORaQss=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=esBfPh8ZmE0im/yXm0auD/0TggpOADftUey9ebYg32vkyM8+mbGWEl6LqPkmSShgW pWNAbGNnl0FJs9Oo/Twt7Nld280gR/NJONWREOIJMlQsN5arv0hgpnWW3DxOEzvemw F90/1qQhHTWg+CjwRs7ypPhboDA50KAyWU+a7ZoSE2g/Ak/PIxL1XXA3ecVU4QCWXM 6qe+MT9GI4ZwLDiFJ1hzjmom8pnPLozJdqia4yrCwgRmP43WW0Dw0l08Cm3ix8W1kK lXdwN73PILrTDtjTAvyktBsDBV//m23Z/A7Slsd8cojwLJ1WcjPX17bEfLPfMFvznY h2GTTfgEccj4A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb7N6sbnz9rxL; Sun, 4 Feb 2024 17:48:48 +0100 (CET) From: Felix Gruber To: 68925@debbugs.gnu.org Subject: [PATCH 6/8] gnu: python-pyshp: Update to 2.3.1. Date: Sun, 4 Feb 2024 16:47:16 +0000 Message-ID: <561a6d13739b151640ae4dbd7b827e544b54e9ec.1707064733.git.felgru@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/geo.scm (python-pyshp): Update to 2.3.1. [arguments]: Disable test that requires network access. Change-Id: Iba7bd8191c17ecf255375a8443319b449057e094 --- gnu/packages/geo.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 6135451c16..6648dc2d25 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1323,7 +1323,7 @@ (define-public gdal (define-public python-pyshp (package (name "python-pyshp") - (version "2.1.3") + (version "2.3.1") (source (origin (method git-fetch) @@ -1332,8 +1332,13 @@ (define-public python-pyshp (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0jsraqzq82pw19wvx84x7w5cs8agr44a9b5y0jjw540wim4xa73r")))) + (base32 "02pbr091p8v4kfv1p6p2aa4asgm9r74dc12r35lvgmhs9y163z69")))) (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; This test requires internet access. + '(list "--deselect" "test_shapefile.py::test_reader_url"))) (native-inputs (list python-pytest python-pytest-runner)) (home-page "https://github.com/GeospatialPython/pyshp") -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:49:11 2024 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:49:11 +0000 Received: from localhost ([127.0.0.1]:49946 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfg7-0008Lv-1t for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:49:11 -0500 Received: from mout02.posteo.de ([185.67.36.66]:49695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfg5-0008L5-3f for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:49:09 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 6F6A6240104 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065331; bh=YnXq1LgPDsvZ8R+e85MU6qCcdqHwCZXg/Dku48ef1dM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=phU5kwL1TDnJl05D4+/Em0NxHp/vZ19fyuPZ16ebZiLRIjpjsAedRrseE9CO2HwUi Q5UYTOCDApF0Q2hW/ytGnznSihVHL86x/5ILcWNDg0E4SJ5PCDQJ8m0pnFq8i3B15w 1gSvZpfdi4W29rUCCPUQ8mLHoSwvIZ+yl7qR5bezQdmclyREIXZfa0fRSeaT/bhKZf g75sAgSFeHDFhYUKffqPcL7AgHQ+BcV/nJY1baE526rC1hvycaJWmAO2sWRBQ20WMr cpsxrHCLBSsn4OdWaS4uD6ovEjBLzGeDTMCsVpK+32qR77IJN9LnFbvfgknLGgyNFN tLpAnZf9X3mTA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb7R0Kmlz6tv5; Sun, 4 Feb 2024 17:48:51 +0100 (CET) From: Felix Gruber To: 68925@debbugs.gnu.org Subject: [PATCH 7/8] gnu: grass: Update to 7.8.8. Date: Sun, 4 Feb 2024 16:47:17 +0000 Message-ID: <893f6beffb62e77a569426c5be77b0269253af28.1707064733.git.felgru@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/geo.scm (grass): Update to 7.8.8. Change-Id: Ife86e2f770e1a3bbc907e9baf25253dbff7e5653 --- gnu/packages/geo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 6648dc2d25..702e15c8f8 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2587,7 +2587,7 @@ (define-public openorienteering-mapper (license license:gpl3+))) (define-public grass - (let* ((version "7.8.7") + (let* ((version "7.8.8") (majorminor (string-join (list-head (string-split version #\.) 2) "")) (grassxx (string-append "grass" majorminor))) (package @@ -2599,7 +2599,7 @@ (define-public grass (uri (string-append "https://grass.osgeo.org/" grassxx "/source/grass-" version ".tar.gz")) (sha256 - (base32 "0sbz0ba9p963phvd0gmvfqq1fg4ixpipzcjbf20ys86qavjppzsg")))) + (base32 "1gpfbppfajc8d6b9alw9fdzgaa83w26kl6fff1395bc9gal215ms")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Feb 04 11:49:13 2024 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:49:13 +0000 Received: from localhost ([127.0.0.1]:49950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfg9-0008MA-Cv for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:49:13 -0500 Received: from mout01.posteo.de ([185.67.36.65]:35607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWfg7-0008LZ-Kw for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:49:11 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id EFC2B240027 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065334; bh=fjbJHEaHkB2nhh+0RNR4aSk8WOY3gVXKxzVW3aO3Y9o=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=Nv1nDn2ysyZMYHwvZ3K00cwQC33325uMOoJw1WdQJec8eg1Uy0ASoPWgo7i6T11pO b5imiOHJ2Pix+BkIZEHd3lz/EzTCWmArtEThyKahbHgizTHM47JGTZEx/A/TbqP4J3 v2GAYAh9MlBNC82dtvikhpTOygiqoAkIfZPLqq+wZkJTanetedeMD/He5rs4NF23ZM f+NBj9zaPq6YXfjDwawKPtoqiaxo5KmzYP03j7+LIfHbmygKYC76/5KbUx/DyxGeqz HgPDgzp8BcfA9K0hzqc0EVcrRjfzu5r/VKA70xLjCnum7M/8/MrObnihTSRO1atv+j 95HG5h32acVwQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb7T3K2xz9rxK; Sun, 4 Feb 2024 17:48:53 +0100 (CET) From: Felix Gruber To: 68925@debbugs.gnu.org Subject: [PATCH 8/8] gnu: qgis: Fix build against proj 9.3.1. Date: Sun, 4 Feb 2024 16:47:18 +0000 Message-ID: <7b07c1466c139066fa11ef4a9222e50c0f94ae65.1707064733.git.felgru@posteo.net> In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925 Cc: Felix Gruber X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/geo.scm (qgis): Fix build against proj 9.3.1. [arguments]: Disable newly broken tests test_core_overlayexpression and PyQgsProjectionSelectionWidgets. Change-Id: If80c1d86b00f4d9481ada17b99962754b5efdc92 --- gnu/packages/geo.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 702e15c8f8..7ceb3cd54a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2873,6 +2873,7 @@ (define-public qgis "test_core_pointcloudlayerexporter" "test_core_projectstorage" "test_core_coordinatereferencesystem" + "test_core_overlayexpression" "test_gui_queryresultwidget" "test_provider_copcprovider" "test_provider_eptprovider" @@ -2896,6 +2897,7 @@ (define-public qgis "PyQgsOGRProviderGpkg" "PyQgsProcessExecutablePt1" "PyQgsProcessExecutablePt2" + "PyQgsProjectionSelectionWidgets" "PyQgsProviderConnectionGpkg" "PyQgsProviderConnectionSpatialite" "PyQgsOGRProvider" -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 07 12:36:50 2024 Received: (at 68925-done) by debbugs.gnu.org; 7 Feb 2024 17:36:50 +0000 Received: from localhost ([127.0.0.1]:57837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXlqs-0004Bc-7X for submit@debbugs.gnu.org; Wed, 07 Feb 2024 12:36:50 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rXlqp-0004BM-P3 for 68925-done@debbugs.gnu.org; Wed, 07 Feb 2024 12:36:48 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D47C4240101 for <68925-done@debbugs.gnu.org>; Wed, 7 Feb 2024 18:36:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707327387; bh=Ztxm0iE/cdsfut99injfhR1x8yhvJFbSpJV+KCzdG5Q=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=ar7CKYzRDZLZUTOvB0oCnSFZu76oxemh8llBeRwHHllm1/rN+a/hCMq9HTP/07Wv/ Lm0WExT9ztSXBKO7Gxy6vdev24Sg3QCuiXnccXUftHIbXNqFm+hybGPtb/o3Roo+JM ekImfWoy4Z0mA1RJJPGeIUHzxC4Av2gN0OshCAr7vuZlXki0RSfDzxExbd9lxmbT1H BSGTwwgEVqYTq+KpGy408Dg3HR8ncEun+63CtOemvU8RANsB5660h1rH5AV+GK0ujd 6kaXqR6sD++CJdm3SsRS8taSGKkXecDJSpW1wO3zxBZReyeFJA37Z8L+C8yS+HreaN bnpg7OvMCAbYQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TVS2z0wyVz6txP; Wed, 7 Feb 2024 18:36:26 +0100 (CET) References: From: Guillaume Le Vaillant To: Felix Gruber Subject: Re: [bug#68925] [PATCH 0/8] Update proj to 9.3.1. Date: Wed, 07 Feb 2024 17:35:48 +0000 In-reply-to: Message-ID: <874jekjhwm.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 68925-done Cc: 68925-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Patches applied as 4c1a7678b2d0ef801ae1ac03af449db3ab9fe9bc and following. Thanks. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCZcO/mQ8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j99bAD/VDyhVoug2iuDuMtnWBzckgPBV6mu3GtpUMnX X5pE1c4A/AsUy0S9Gd4+ZQI+1kPeSY+7EX9xSbC5u9tJ2P9kiUwi =P9SP -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Jun 17 08:56:04 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 07 Mar 2024 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator