nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: qt: Update to 5.2.0. 

* gnu/packages/qt.scm (qt): Update to 5.2.0.
This commit is contained in:
Andreas Enge 2013-12-14 23:16:46 +01:00
parent 6447738c01
commit f198ffd097
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/qt.scm
View File

@ -20,6 +20,7 @@
#:use-module ((guix licenses) #:select (lgpl2.1 x11-style)) #:use-module ((guix licenses) #:select (lgpl2.1 x11-style))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
@ -66,17 +67,17 @@ X11 (yet).")
(define-public qt (define-public qt
(package (package
(name "qt") (name "qt")
(version "5.1.1") (version "5.2.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/"
(string-copy version 0 (string-rindex version #\.)) (string-copy version 0 (string-rindex version #\.))
"/" version "/" version
"/single/qt-everywhere-opensource-src-" "/single/qt-everywhere-opensource-src-"
version ".tar.gz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1xl6n4ai0yfknaiawgyr0cyixk0d2j4262k13mmyj993nlnp81ac")))) "0cch2mjk33x1511sqvvbfcxixpj64cfhq7kgszd422qzl3x2m8q0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("mesa" ,mesa))) `(("mesa" ,mesa)))
@ -88,9 +89,7 @@ X11 (yet).")
("freetype" ,freetype) ("freetype" ,freetype)
("glib" ,glib) ("glib" ,glib)
("icu4c" ,icu4c) ("icu4c" ,icu4c)
;; FIXME: Switch to current libjpeg with qt 5.1.2, see ("libjpeg" ,libjpeg)
;; https://qt.gitorious.org/qt/qt/commit/2a9ea11f4dea51f9e75036aab8e7a23f0eb4bd1f/diffs
("libjpeg" ,libjpeg-8)
("libpng" ,libpng) ("libpng" ,libpng)
("libx11" ,libx11) ("libx11" ,libx11)
("libxi" ,libxi) ("libxi" ,libxi)
@ -161,6 +160,8 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(base32 (base32
"0f51dbgn1dcck8pqimls2qyf1pfmsmyknh767cvw87c3d218ywpb")) "0f51dbgn1dcck8pqimls2qyf1pfmsmyknh767cvw87c3d218ywpb"))
(patches (list (search-patch "qt4-tests.patch"))))) (patches (list (search-patch "qt4-tests.patch")))))
(inputs `(,@(alist-delete "libjpeg" (package-inputs qt))
("libjepg" ,libjpeg-8)))
(arguments (arguments
`(#:phases `(#:phases
(alist-replace (alist-replace