diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/gps.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
| download | guix-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz | |
Merge branch 'staging' into 'core-updates'.
Conflicts: gnu/local.mk gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/gl.scm gnu/packages/glib.scm gnu/packages/guile.scm gnu/packages/node.scm gnu/packages/openldap.scm gnu/packages/package-management.scm gnu/packages/python-xyz.scm gnu/packages/python.scm gnu/packages/tls.scm gnu/packages/vpn.scm gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/gps.scm')
| -rw-r--r-- | gnu/packages/gps.scm | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 3b3e038cc8..4fa3bcef19 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -6,6 +6,8 @@ ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> +;;; Copyright © 2021 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> +;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,24 +53,25 @@ (define-public gpsbabel (package (name "gpsbabel") - (version "1.5.4") + (version "1.7.0") (source (origin - (method url-fetch) - ;; XXX: Downloads from gpsbabel.org are hidden behind a POST, so - ;; get it from elsewhere. - (uri (string-append - "mirror://debian/pool/main/g/gpsbabel/gpsbabel_" - version ".orig.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/gpsbabel/gpsbabel") + (commit (string-append + "gpsbabel_" + (string-replace-substring version "." "_"))))) + (file-name (git-file-name name version)) (sha256 (base32 - "19hykxhyl567gf8qcrl33qhv95w0g4vxw9r3h9b8d8plx9bnaf8l")) - (patches (search-patches - "gpsbabel-minizip.patch" - ;; XXX: Remove this patch on the next release. - "gpsbabel-qstring.patch")) + "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy")) + (patches (search-patches "gpsbabel-fix-i686-test.patch")) (modules '((guix build utils))) (snippet '(begin + (delete-file-recursively "zlib") + (substitute* "Makefile.in" + ((" zlib/z.*\\.h") "")) ;; Delete files under GPL-compatible licences but never used ;; on GNU systems, rather than bloating the LICENSE field. (delete-file "gui/serial_mac.cc") ; Apple MIT @@ -78,17 +81,12 @@ ;; TODO: "make doc" requires Docbook & co. (arguments `(#:configure-flags - '("--with-zlib=system") - ;; On i686, 'raymarine.test' fails because of a rounding error: - ;; <http://hydra.gnu.org/build/133040>. As a workaround, disable tests - ;; on these platforms. - ;; FIXME: On x86_64 with -std=gnu++11 tests also fail due to rounding - ;; error. - #:tests? #f)) + '("--with-zlib=system"))) (inputs `(("expat" ,expat) - ("zlib" ,zlib) - ("qtbase" ,qtbase))) + ("libusb" ,libusb) + ("qtbase" ,qtbase) + ("zlib" ,zlib))) (native-inputs `(("which" ,which) ("qttools" ,qttools) @@ -184,7 +182,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (define-public gpxsee (package (name "gpxsee") - (version "7.36") + (version "7.37") (source (origin (method git-fetch) (uri (git-reference @@ -193,7 +191,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (file-name (git-file-name name version)) (sha256 (base32 - "18vsw6hw6kn5wmr4iarhx1v8q455j60fhf0hq69jkfyarl56b99j")))) + "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8")))) (build-system gnu-build-system) (arguments '(#:phases |