mirror of
https://codeberg.org/guix/guix.git
synced 2026-01-25 12:05:19 -06:00
gnu: qmapshack: Update to 1.18.0 and build with Qt6.
* gnu/packages/geo.scm (qmapshack): Update to 1.18.0. [qtbase]: Add field. [inputs]: Remove curl, qtbase-5, qtdeclarative-5, qtlocation-5, qtwebchannel-5, qtwebengine-5, quazip-5, sqlite, and zlib; add qt5compat, qtpositioning, qttools, qtwebengine, and quazip. [native-inputs]: Remove qttools-5. [arguments]<#:phases>: Adapt to Qt6 and gexps. Change-Id: I1e593033b56e30a430dc8f79e46619cab85a3bc9
This commit is contained in:
parent
798f28ab0d
commit
96e37a6742
1 changed files with 18 additions and 20 deletions
|
|
@ -2925,7 +2925,7 @@ data.")
|
|||
(define-public qmapshack
|
||||
(package
|
||||
(name "qmapshack")
|
||||
(version "1.17.1")
|
||||
(version "1.18.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
|
@ -2934,36 +2934,34 @@ data.")
|
|||
(commit (string-append "V_" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1ckadklk67dp1pvkacfkr8379g2pwk73q85jfzm8viclcqmfvb62"))))
|
||||
(base32 "04r2m7qwzqwgnwhi15999n0w7fmddjcmdv8mxm8c0flrjw8zmkpq"))))
|
||||
(build-system qt-build-system)
|
||||
(native-inputs
|
||||
(list pkg-config qttools-5))
|
||||
(list pkg-config))
|
||||
(inputs
|
||||
(list curl
|
||||
gdal
|
||||
(list gdal
|
||||
libjpeg-turbo
|
||||
proj
|
||||
qtbase-5
|
||||
qtdeclarative-5
|
||||
qtlocation-5
|
||||
qtwebchannel-5
|
||||
qtwebengine-5
|
||||
quazip-5
|
||||
routino
|
||||
sqlite ; See wrap phase
|
||||
zlib))
|
||||
qt5compat
|
||||
qtpositioning
|
||||
qttools
|
||||
qtwebengine
|
||||
quazip
|
||||
routino))
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
(list
|
||||
#:qtbase qtbase
|
||||
#:tests? #f ;no tests
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-cmake-modules
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(lambda _
|
||||
(substitute* "CMakeLists.txt"
|
||||
(("find_package\\(Qt5PrintSupport REQUIRED\\)" all)
|
||||
(string-append all "\nfind_package(Qt5Positioning REQUIRED)")))
|
||||
(("find_package\\(Qt6PrintSupport REQUIRED\\)" all)
|
||||
(string-append all "\nfind_package(Qt6Positioning REQUIRED)")))
|
||||
(substitute* "cmake/Modules/FindROUTINO.cmake"
|
||||
(("/usr/local")
|
||||
(assoc-ref inputs "routino"))))))))
|
||||
#$(this-package-input "routino"))))))))
|
||||
(synopsis "GPS mapping application")
|
||||
(description
|
||||
"QMapShack can be used to plan your next outdoor trip or to visualize and
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue