diff options
| author | Andreas Enge <andreas@enge.fr> | 2025-08-09 19:25:21 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-08-09 19:27:08 +0200 |
| commit | 96e37a6742f7ddd0aff69f84ed17667601797c1a (patch) | |
| tree | d6231346a6511f38e533e31a6a769bddcef4f010 /gnu | |
| parent | 798f28ab0d85e05c10ebf8f27cab9f17d3139fce (diff) | |
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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/geo.scm | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8aeaded89bd..ecb324d7382 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -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 |