GNU bug report logs - #52818
[PATCH] gnu: qmapshack: Update to 1.16.1.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Nikolay Korotkiy <sikmir <at> gmail.com>
Subject: bug#52818: closed (Re: [bug#52818] [PATCH] gnu: qmapshack: Update
 to 1.16.1.)
Date: Tue, 28 Dec 2021 00:16:02 +0000

[Message part 1 (text/plain, inline)]

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 52818 <at> debbugs.gnu.org.

-- 
52818: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=52818
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Leo Famulari <leo <at> famulari.name>
To: Nikolay Korotkiy <sikmir <at> gmail.com>
Cc: 52818-done <at> debbugs.gnu.org
Subject: Re: [bug#52818] [PATCH] gnu: qmapshack: Update to 1.16.1.
Date: Mon, 27 Dec 2021 19:15:03 -0500

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

[Message part 3 (message/rfc822, inline)]

From: Nikolay Korotkiy <sikmir <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: Nikolay Korotkiy <sikmir <at> gmail.com>
Subject: [PATCH] gnu: qmapshack: Update to 1.16.1.
Date: Mon, 27 Dec 2021 18:00:12 +0300

* 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

Previous Next

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