[bug#52818] [PATCH] gnu: qmapshack: Update to 1.16.1.

[bug#52818] [PATCH] gnu: qmapshack: Update to 1.16.1.

[Nikolay Korotkiy]

* gnu/packages/geo.scm (qmapshack): Update to 1.16.1.
---
 gnu/packages/geo.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index e837b9989d..f7866d4b4b 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1818,7 +1818,7 @@ (define-public routino
 (define-public qmapshack
   (package
     (name "qmapshack")
-    (version "1.15.2")
+    (version "1.16.1")
     (source
      (origin
        (method git-fetch)
@@ -1827,7 +1827,7 @@ (define-public qmapshack
              (commit (string-append "V_" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7"))))
+        (base32 "184fqmsfzr3b333ssizjk6gvv7mncmygq8dj5r7rsvs5md26z2ys"))))
     (build-system qt-build-system)
     (native-inputs
      (list pkg-config qttools))
@@ -1840,7 +1840,7 @@ (define-public qmapshack
            qtlocation
            qtwebchannel
            qtwebengine
-           quazip-0
+           quazip
            routino
            sqlite ; See wrap phase
            zlib))
@@ -1855,12 +1855,7 @@ (define-public qmapshack
                 (string-append all "\nfind_package(Qt5Positioning REQUIRED)")))
              (substitute* "cmake/Modules/FindROUTINO.cmake"
                (("/usr/local")
-                (assoc-ref inputs "routino")))
-             ;; The following fixes are included as patches in the sources
-             ;; of QMapShack, but they are not applied by default, for
-             ;; some reason...
-             (invoke "patch" "-p1" "-i" "FindPROJ4.patch")
-             (invoke "patch" "-p1" "-i" "FindQuaZip5.patch"))))))
+                (assoc-ref inputs "routino"))))))))
     (synopsis "GPS mapping application")
     (description
      "QMapShack can be used to plan your next outdoor trip or to visualize and
-- 
2.34.0

[bug#52818] [PATCH] gnu: proj: Fix version number.

[Nikolay Korotkiy]

* gnu/packages/geo.scm (proj): Set to 7.2.1 instead of 7.2.0.
---
 gnu/packages/geo.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index f7866d4b4b..8e5965c97c 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -517,7 +517,13 @@ (define-public proj
          "050apzdn0isxpsblys1shrl9ccli5vd32kgswlgx1imrbwpg915k"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-DUSE_EXTERNAL_GTEST=ON")))
+     `(#:configure-flags '("-DUSE_EXTERNAL_GTEST=ON")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-version
+           (lambda _
+             (substitute* "CMakeLists.txt"
+               (("MAJOR 7 MINOR 2 PATCH 0") "MAJOR 7 MINOR 2 PATCH 1")))))))
     (inputs
      (list curl libjpeg-turbo libtiff sqlite))
     (native-inputs
-- 
2.34.0

bug#52818: [PATCH] gnu: qmapshack: Update to 1.16.1.

[Leo Famulari]

On Mon, Dec 27, 2021 at 06:00:12PM +0300, Nikolay Korotkiy wrote:
> * gnu/packages/geo.scm (qmapshack): Update to 1.16.1.

Thanks! Pushed as 4db16b9cbca1d14d83c06d54cfce4772390f6176

[bug#52818] [PATCH] gnu: proj: Fix version number.

[Leo Famulari]

On Mon, Dec 27, 2021 at 06:02:04PM +0300, Nikolay Korotkiy wrote:
> * gnu/packages/geo.scm (proj): Set to 7.2.1 instead of 7.2.0.

Thanks! Pushed as d42718f8eafabbfa8e0e8415bc5aa7919d9326be