gnu: qt: Update to 5.4.0.

* gnu/packages/qt.scm (qt): Update to 5.4.0.
  [origin]: Add snippet.
This commit is contained in:
宋文武 2015-01-03 14:12:01 +08:00
parent cd287ba162
commit 5b490ab52f

View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -81,7 +82,7 @@ (define-public libxkbcommon
(define-public qt (define-public qt
(package (package
(name "qt") (name "qt")
(version "5.3.2") (version "5.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.qt-project.org/official_releases/qt/" (uri (string-append "http://download.qt-project.org/official_releases/qt/"
@ -91,7 +92,14 @@ (define-public qt
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1w4v53889kqpwxw45wcqz5bi6zx8xp434jpafk1vlmyb8hrzjnvz")))) "176351k8ngczb324i8bbkrsz9pby7cvy2qnixfjwybzxp53xzndj"))
(snippet
'(begin
;; Remove broken symlinks.
(delete-file "qtwebengine/src/3rdparty/chromium/third_party/\
mesa/src/src/gallium/state_trackers/d3d1x/w32api")
(delete-file "qtwebengine/src/3rdparty/chromium/third_party/\
webrtc/tools/e2e_quality/audio/perf")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("mesa" ,mesa))) `(("mesa" ,mesa)))
@ -129,7 +137,9 @@ (define-public qt
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* '("configure" "qtbase/configure") (substitute* '("configure" "qtbase/configure")
(("/bin/pwd") (which "pwd"))) (("/bin/pwd") (which "pwd")))
(substitute* "qtbase/src/corelib/global/global.pri"
(("/bin/ls") (which "ls")))
;; do not pass "--enable-fast-install", which makes the ;; do not pass "--enable-fast-install", which makes the
;; configure process fail ;; configure process fail
(zero? (system* (zero? (system*