GNU bug report logs - #56427
[PATCH 0/6] Update a bunch of geographical packages.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56427 in the body.
You can then email your comments to 56427 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 0/6] Update a bunch of geographical packages.
Date: Wed,  6 Jul 2022 18:11:39 +0000

Felix Gruber (6):
  gnu: libgeotiff: Update to 1.7.1.
  gnu: geos: Update to 3.10.2.
  gnu: grass: Update to 7.8.7.
  gnu: pcb2gcode: Update to 2.4.0.
  gnu: saga: Update to 8.2.1.
  gnu: qgis: Disable failing tests.

 gnu/local.mk                                  |  1 -
 gnu/packages/engineering.scm                  | 12 ++--
 gnu/packages/geo.scm                          | 43 +++++++------
 ...otiff-adapt-test-script-for-proj-6.2.patch | 63 -------------------
 4 files changed, 32 insertions(+), 87 deletions(-)
 delete mode 100644 gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch

-- 
2.30.2

Message #8 received at 56427 <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: 56427 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 1/6] gnu: libgeotiff: Update to 1.7.1.
Date: Wed,  6 Jul 2022 18:14:04 +0000

* gnu/packages/geo.scm (libgeotiff): Update to 1.7.1.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/geo.scm                          |  8 +--
 ...otiff-adapt-test-script-for-proj-6.2.patch | 63 -------------------
 3 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index faad6cc6b2..7a6769fa2f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1390,7 +1390,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/libcroco-CVE-2020-12825.patch		\
   %D%/packages/patches/libcyaml-libyaml-compat.patch		\
   %D%/packages/patches/libexpected-nofetch.patch                \
-  %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch		\
   %D%/packages/patches/libgit2-mtime-0.patch			\
   %D%/packages/patches/libgnome-encoding.patch			\
   %D%/packages/patches/libgnomeui-utf8.patch			\
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index d8e642f349..2310100c09 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -342,18 +342,14 @@ and driving.")
 (define-public libgeotiff
   (package
     (name "libgeotiff")
-    (version "1.5.1")
+    (version "1.7.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-"
                            version ".tar.gz"))
-       (patches (search-patches
-                 ;; See libgeotiff 1.5.1 issue
-                 ;; https://github.com/OSGeo/libgeotiff/issues/22
-                 "libgeotiff-adapt-test-script-for-proj-6.2.patch"))
        (sha256
-        (base32 "0b31mlzcv5b1y7jdvb7p0pa3xradrg3x5g32ym911lbhq4rrgsgr"))
+        (base32 "1mjmgv48x51ppax5dnb6lq7z600czxll53bx6jbzqwd4m93i7aq5"))
        (modules '((guix build utils)))
        (snippet
         '(begin
diff --git a/gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch b/gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch
deleted file mode 100644
index 746610c095..0000000000
--- a/gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault <at> spatialys.com>
-Date: Wed, 4 Sep 2019 16:11:37 +0200
-Subject: [PATCH 1/2] Adapt test script for PROJ 6.2 EPSG database (fixes #22)
-
----
- libgeotiff/test/testlistgeo          | 8 +++++++-
- libgeotiff/test/testlistgeo_out.dist | 4 ++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/libgeotiff/test/testlistgeo b/libgeotiff/test/testlistgeo
-index 7fb4a2f..571f5d0 100755
---- a/test/testlistgeo
-+++ b/test/testlistgeo
-@@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> ${OUT}
- $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT}
- echo "" >>${OUT}
- 
-+# Normalize for results depending on the exact version of PROJ / EPSG database
-+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
- 
- # do 'diff' with distribution results
- echo "diff ${OUT} with testlistgeo_out.dist"
--diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist
-+diff -u ${OUT} testlistgeo_out.dist.tmp
- if [ $? -ne 0 ] ; then
-     echo  ""
-     echo "PROBLEMS HAVE OCCURRED"
-@@ -224,6 +229,7 @@ else
-     echo "TEST OK"
-     echo "test file ${OUT} removed"
-     echo
-+    rm testlistgeo_out.dist.tmp
-     /bin/rm -f ${OUT}
-     exit 0
- fi
-diff --git a/libgeotiff/test/testlistgeo_out.dist b/libgeotiff/test/testlistgeo_out.dist
-index 68a948c..c157f00 100644
---- a/test/testlistgeo_out.dist
-+++ b/test/testlistgeo_out.dist
-@@ -1738,11 +1738,11 @@ Geotiff_Information:
-    Keyed_Information:
-       GTModelTypeGeoKey (Short,1): ModelTypeProjected
-       GTRasterTypeGeoKey (Short,1): RasterPixelIsArea
--      ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe)
-+      ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA Europe)
-       End_Of_Keys.
-    End_Of_Geotiff.
- 
--PCS = 3035 (ETRS89 / LAEA Europe)
-+PCS = 3035 (ETRS89-extended / LAEA Europe)
- Projection = 19986 (Europe Equal Area 2001)
- Projection Method: CT_LambertAzimEqualArea
-    ProjCenterLatGeoKey: 52.000000 ( 52d 0' 0.00"N)
-
-From 15af10648c4cb7b4c55cbe08caaf9884c1d156d9 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault <at> spatialys.com>
-Date: Wed, 4 Sep 2019 19:13:11 +0200
-Subject: [PATCH 2/2] appveyor.yml: build vcpkg from source to fix issue with
- VS2015
-- 
2.30.2

Message #11 received at 56427 <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: 56427 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 3/6] gnu: grass: Update to 7.8.7.
Date: Wed,  6 Jul 2022 18:14:06 +0000

* gnu/packages/geo.scm (grass): Update to 7.8.7.
---
 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 039fd55f3c..30810bf10f 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2225,7 +2225,7 @@ orienteering sport.")
     (license license:gpl3+)))
 
 (define-public grass
-  (let* ((version "7.8.6")
+  (let* ((version "7.8.7")
          (majorminor (string-join (list-head (string-split version #\.) 2) ""))
          (grassxx (string-append "grass" majorminor)))
     (package
@@ -2237,7 +2237,7 @@ orienteering sport.")
          (uri (string-append "https://grass.osgeo.org/" grassxx
                              "/source/grass-" version ".tar.gz"))
          (sha256
-          (base32 "1glk74ly3j0x8ymn4jp73s6y8qv7p3g5nv4gvb6l9qqplyq1fpnq"))))
+          (base32 "0sbz0ba9p963phvd0gmvfqq1fg4ixpipzcjbf20ys86qavjppzsg"))))
       (build-system gnu-build-system)
       (inputs
        `(("bzip2" ,bzip2)
-- 
2.30.2

Message #14 received at 56427 <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: 56427 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 2/6] gnu: geos: Update to 3.10.2.
Date: Wed,  6 Jul 2022 18:14:05 +0000

* gnu/packages/geo.scm (geos): Update to 3.10.2.
  [build-system]: Use cmake-build-system.
  [arguments]: Remove trailing #t in 'patch-test-shebangs phase.
  [homepage]: Change to https://libgeos.org/.
---
 gnu/packages/geo.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 2310100c09..039fd55f3c 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -216,7 +216,7 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.")
 (define-public geos
   (package
     (name "geos")
-    (version "3.8.1")
+    (version "3.10.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://download.osgeo.org/geos/geos-"
@@ -224,8 +224,8 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.")
                                   ".tar.bz2"))
               (sha256
                (base32
-                "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22"))))
-    (build-system gnu-build-system)
+                "05apyh6dvv15fax4xvxa0kr622h4y08w9p3274mlqsrqmjcwbfsh"))))
+    (build-system cmake-build-system)
     (arguments `(#:phases
                  (modify-phases %standard-phases
                    (add-after
@@ -233,11 +233,10 @@ OpenStreetMap written in C using eXpat, Cairo and GLib.")
                     (lambda _
                       (substitute* '("tests/xmltester/testrunner.sh"
                                      "tests/geostest/testrunner.sh")
-                        (("/bin/sh") (which "sh")))
-                      #t)))))
+                        (("/bin/sh") (which "sh"))))))))
     (inputs
      (list glib))
-    (home-page "https://geos.osgeo.org/")
+    (home-page "https://libgeos.org/")
     (synopsis "Geometry Engine for Geographic Information Systems")
     (description
      "GEOS provides a spatial object model and fundamental geometric
-- 
2.30.2

Message #17 received at 56427 <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: 56427 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 5/6] gnu: saga: Update to 8.2.1.
Date: Wed,  6 Jul 2022 18:14:08 +0000

* gnu/packages/geo.scm (saga): Update to 8.2.1.
  [build-system]: Use cmake-build-system.
  [arguments]: Set tests? to #f as there are no tests.
  Add phase for changing into saga-gis directory which contains the
  actual source code.
---
 gnu/packages/geo.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 30810bf10f..dea8da73f5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2348,7 +2348,7 @@ visualization.")
 (define-public saga
   (package
     (name "saga")
-    (version "7.9.0")
+    (version "8.2.1")
     (source
      (origin
        (method url-fetch)
@@ -2356,8 +2356,8 @@ visualization.")
                            (version-major version) "/SAGA%20-%20" version
                            "/saga-" version ".tar.gz"))
        (sha256
-        (base32 "1n051yxxkylly0k9rlkx2ih3j2lf9d4csg00sm7161r7nhjvggd1"))))
-    (build-system gnu-build-system)
+        (base32 "008izjs6gvj09abxf16ssl1xy0ay3ljq4jswbggp6wiiq459minv"))))
+    (build-system cmake-build-system)
     (native-inputs
      (list pkg-config swig))
     (inputs
@@ -2377,7 +2377,12 @@ visualization.")
            vigra
            wxwidgets))
     (arguments
-     '(#:configure-flags '("--enable-python")))
+     '(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'cd-to-source-dir
+           (lambda _
+             (chdir "saga-gis"))))))
     (synopsis "System for Automated Geoscientific Analyses")
     (description
      "SAGA (System for Automated Geoscientific Analyses) is a Geographic
-- 
2.30.2

Message #20 received at 56427 <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: 56427 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 4/6] gnu: pcb2gcode: Update to 2.4.0.
Date: Wed,  6 Jul 2022 18:14:07 +0000

* gnu/packages/engineering.scm (pcb2gcode): Update to 2.4.0.
---
 gnu/packages/engineering.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index fe8ab13298..bcfc929814 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -34,6 +34,7 @@
 ;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon <at> gmail.com>
 ;;; Copyright © 2022 Greg Hogan <code <at> greghogan.com>
 ;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom <at> gmail.com>
+;;; Copyright © 2022 Felix Gruber <felgru <at> posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2854,20 +2855,23 @@ data structures and to operate on them.")
     (license license:gpl3+)))
 
 (define-public pcb2gcode
+  ;; Take some additional commits after v2.4.0 to fix build against
+  ;; geos 3.10.1.
+  (let ((commit "ae41f9fe41e57ee5d0cced6c3b3c8aea9c3f5392"))
     (package
      (name "pcb2gcode")
-     (version "2.1.0")
+      (version (git-version "2.4.0" "1" commit))
      (source
       (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/pcb2gcode/pcb2gcode")
-             (commit (string-append "v" version))
+             (commit commit)
              (recursive? #t)))
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0nzglcyh6ban27cc73j4l7w7r9k38qivq0jz8iwnci02pfalw4ry"))))
+         "1r1qmvpn5ffi2xpq2gigwsk8kn79s4s2ywfvicwf8i7rzwhkdf17"))))
      (build-system gnu-build-system)
      (inputs
       (list boost
@@ -2884,7 +2888,7 @@ data structures and to operate on them.")
 and drilling of PCBs.  It takes Gerber files as input and outputs G-code files
 for the milling of PCBs.  It also includes an autoleveller for the automatic
 dynamic calibration of the milling depth.")
-     (license license:gpl3+)))
+     (license license:gpl3+))))
 
 (define-public syscall-intercept
   ;; Upstream provides no tag. Also, last version update is 4 years old.
-- 
2.30.2

Message #23 received at 56427 <at> debbugs.gnu.org (full text, mbox):

From: Felix Gruber <felgru <at> posteo.net>
To: 56427 <at> debbugs.gnu.org
Cc: Felix Gruber <felgru <at> posteo.net>
Subject: [PATCH 6/6] gnu: qgis: Disable failing tests.
Date: Wed,  6 Jul 2022 18:14:09 +0000

* gnu/packages/geo.scm (qgis)[arguments]: Disable tests that fail after
  upgrading geos to 3.10.1.
---
 gnu/packages/geo.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index dea8da73f5..cf51d5ec59 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2503,12 +2503,14 @@ growing set of geoscientific methods.")
                              "PyQgsLayoutHtml"
                              "PyQgsLayoutLegend"
                              "PyQgsLayoutMapGrid"
+                             "PyQgsMapClippingUtils"
                              "PyQgsMapLayer"
                              "PyQgsMetadataBase"
                              "PyQgsOGRProvider"
                              "PyQgsOGRProviderGpkg"
                              "PyQgsOapifProvider"
                              "PyQgsPalLabelingLayout"
+                             "PyQgsProcessingInPlace"
                              "PyQgsProject"
                              "PyQgsProviderConnectionGpkg"
                              "PyQgsProviderConnectionPostgres"
@@ -2545,6 +2547,7 @@ growing set of geoscientific methods.")
                              "qgis_layoutlabeltest"
                              "qgis_layoutmanualtabletest"
                              "qgis_layoutmapgridtest"
+                             "qgis_layoutmapoverviewtest"
                              "qgis_layoutmaptest"
                              "qgis_layoutmultiframetest"
                              "qgis_layoutpicturetest"
@@ -2552,6 +2555,7 @@ growing set of geoscientific methods.")
                              "qgis_layouttest"
                              "qgis_mapdevicepixelratiotest"
                              "qgis_maprendererjobtest"
+                             "qgis_meshcontourstest"
                              "qgis_ogrproviderguitest"
                              "qgis_painteffecttest"
                              "qgis_pallabelingtest"
@@ -2565,7 +2569,8 @@ growing set of geoscientific methods.")
                              "qgis_svgmarkertest"
                              "qgis_taskmanagertest"
                              "qgis_wcsprovidertest"
-                             "qgis_ziplayertest")
+                             "qgis_ziplayertest"
+                             "TestQgsRandomMarkerSymbolLayer")
                            "|")))))
          (add-after 'install 'wrap-python
            (assoc-ref python:%standard-phases 'wrap))
-- 
2.30.2

Message #28 received at 56427-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Felix Gruber <felgru <at> posteo.net>
Cc: 56427-done <at> debbugs.gnu.org
Subject: Re: bug#56427: [PATCH 0/6] Update a bunch of geographical packages.
Date: Mon, 18 Jul 2022 00:03:27 +0200

Hi,

Felix Gruber <felgru <at> posteo.net> skribis:

>   gnu: libgeotiff: Update to 1.7.1.
>   gnu: geos: Update to 3.10.2.
>   gnu: grass: Update to 7.8.7.
>   gnu: pcb2gcode: Update to 2.4.0.
>   gnu: saga: Update to 8.2.1.
>   gnu: qgis: Disable failing tests.

Applied, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.