;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module (gnu packages which)
+ #:use-module (gnu packages base)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages compression)
#:use-module (gnu packages docbook)
- #:use-module (gnu packages geeqie) ;exiv2
+ #:use-module (gnu packages image)
#:use-module (gnu packages xml)
#:use-module (gnu packages gtk)
#:use-module (gnu packages qt))
(define-public gpsbabel
(package
(name "gpsbabel")
- (version "1.5.0")
+ (version "1.5.2")
(source (origin
(method url-fetch)
;; XXX: Downloads from gpsbabel.org are hidden behind a POST, so
version ".orig.tar.gz"))
(sha256
(base32
- "1pd01kra9l5ihy1by87qia0mpbpcif7g5yg7r9z2bnw7711jm3yb"))))
+ "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--with-zlib=system")
- #:phases (alist-cons-before
- 'configure 'pre-configure
- (lambda _
- (chdir "gpsbabel"))
- ;; TODO: "make doc" requires Docbook & co.
- %standard-phases)
+ `(#:configure-flags
+ '("--with-zlib=system"
+ ;; XXX Use -fPIC to work around build problems with Qt, GCC 5, and
+ ;; recent binutils:
+ ;; https://codereview.qt-project.org/#/c/111787/
+ "CXXFLAGS=-std=gnu++11 -fPIC")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'pre-configure
+ (lambda _
+ (chdir "gpsbabel"))))
+ ;; TODO: "make doc" requires Docbook & co.
;; On i686, 'raymarine.test' fails because of a rounding error:
;; <http://hydra.gnu.org/build/133040>. As a workaround, disable tests
;; on these platforms.
- #:tests? ,(not (string-prefix? "i686" (%current-system)))))
+ ;; FIXME: On x86_64 with -std=gnu++11 tests also fail due to rounding
+ ;; error.
+ #:tests? #f))
(inputs
`(("expat" ,expat)
("zlib" ,zlib)
- ("qt4" ,qt-4)))
+ ("qtbase" ,qtbase)
+ ("qttools" ,qttools)))
(native-inputs
`(("which" ,which)
("libxml2" ,libxml2))) ;'xmllint' needed for the KML tests