3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00

gnu: qmapshack: Update to 1.16.1.

* gnu/packages/geo.scm (qmapshack): Update to 1.16.1.
[inputs]: Replace quazip-0 with quazip.
[arguments]: Remove custom patching in the 'fix-cmake-modules' build phase.

Signed-off-by: Leo Famulari <leo@famulari.name>
This commit is contained in:
Nikolay Korotkiy 2021-12-27 18:00:12 +03:00 committed by Leo Famulari
parent 2815693d69
commit 4db16b9cbc
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08

View file

@ -1818,7 +1818,7 @@ using the dataset of topographical information collected by
(define-public qmapshack (define-public qmapshack
(package (package
(name "qmapshack") (name "qmapshack")
(version "1.15.2") (version "1.16.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -1827,7 +1827,7 @@ using the dataset of topographical information collected by
(commit (string-append "V_" version)))) (commit (string-append "V_" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7")))) (base32 "184fqmsfzr3b333ssizjk6gvv7mncmygq8dj5r7rsvs5md26z2ys"))))
(build-system qt-build-system) (build-system qt-build-system)
(native-inputs (native-inputs
(list pkg-config qttools)) (list pkg-config qttools))
@ -1840,7 +1840,7 @@ using the dataset of topographical information collected by
qtlocation qtlocation
qtwebchannel qtwebchannel
qtwebengine qtwebengine
quazip-0 quazip
routino routino
sqlite ; See wrap phase sqlite ; See wrap phase
zlib)) zlib))
@ -1855,12 +1855,7 @@ using the dataset of topographical information collected by
(string-append all "\nfind_package(Qt5Positioning REQUIRED)"))) (string-append all "\nfind_package(Qt5Positioning REQUIRED)")))
(substitute* "cmake/Modules/FindROUTINO.cmake" (substitute* "cmake/Modules/FindROUTINO.cmake"
(("/usr/local") (("/usr/local")
(assoc-ref inputs "routino"))) (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"))))))
(synopsis "GPS mapping application") (synopsis "GPS mapping application")
(description (description
"QMapShack can be used to plan your next outdoor trip or to visualize and "QMapShack can be used to plan your next outdoor trip or to visualize and