all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nikolay Korotkiy <sikmir@gmail.com>
To: 52818@debbugs.gnu.org
Cc: Nikolay Korotkiy <sikmir@gmail.com>
Subject: [bug#52818] [PATCH] gnu: qmapshack: Update to 1.16.1.
Date: Mon, 27 Dec 2021 18:00:12 +0300	[thread overview]
Message-ID: <30fd06ec14656286d7c0c3326b7db093a0fe2773.1640617212.git.sikmir@gmail.com> (raw)

* 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





             reply	other threads:[~2021-12-27 15:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-27 15:00 Nikolay Korotkiy [this message]
2021-12-27 15:02 ` [bug#52818] [PATCH] gnu: proj: Fix version number Nikolay Korotkiy
2021-12-28  0:17   ` Leo Famulari
2021-12-28  0:15 ` bug#52818: [PATCH] gnu: qmapshack: Update to 1.16.1 Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=30fd06ec14656286d7c0c3326b7db093a0fe2773.1640617212.git.sikmir@gmail.com \
    --to=sikmir@gmail.com \
    --cc=52818@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.