From f198ffd0975d0c7204c261cc47d5ea0c42c124db Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Sat, 14 Dec 2013 23:16:46 +0100
Subject: gnu: qt: Update to 5.2.0.

* gnu/packages/qt.scm (qt): Update to 5.2.0.
---
 gnu/packages/qt.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6aa467acef..c858956411 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -20,6 +20,7 @@ (define-module (gnu packages qt)
   #:use-module ((guix licenses) #:select (lgpl2.1 x11-style))
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix build utils)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages bison)
@@ -66,17 +67,17 @@ (define-public libxkbcommon
 (define-public qt
   (package
     (name "qt")
-    (version "5.1.1")
+    (version "5.2.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "http://download.qt-project.org/official_releases/qt/"
                                  (string-copy version 0 (string-rindex version #\.))
                                  "/" version
                                  "/single/qt-everywhere-opensource-src-"
-                                 version ".tar.gz"))
+                                 version ".tar.xz"))
              (sha256
               (base32
-               "1xl6n4ai0yfknaiawgyr0cyixk0d2j4262k13mmyj993nlnp81ac"))))
+               "0cch2mjk33x1511sqvvbfcxixpj64cfhq7kgszd422qzl3x2m8q0"))))
     (build-system gnu-build-system)
     (propagated-inputs
      `(("mesa" ,mesa)))
@@ -88,9 +89,7 @@ (define-public qt
        ("freetype" ,freetype)
        ("glib" ,glib)
        ("icu4c" ,icu4c)
-       ;; FIXME: Switch to current libjpeg with qt 5.1.2, see
-       ;; https://qt.gitorious.org/qt/qt/commit/2a9ea11f4dea51f9e75036aab8e7a23f0eb4bd1f/diffs
-       ("libjpeg" ,libjpeg-8)
+       ("libjpeg" ,libjpeg)
        ("libpng" ,libpng)
        ("libx11" ,libx11)
        ("libxi" ,libxi)
@@ -161,6 +160,8 @@ (define-public qt-4
               (base32
                "0f51dbgn1dcck8pqimls2qyf1pfmsmyknh767cvw87c3d218ywpb"))
              (patches (list (search-patch "qt4-tests.patch")))))
+    (inputs `(,@(alist-delete "libjpeg" (package-inputs qt))
+              ("libjepg" ,libjpeg-8)))
     (arguments
      `(#:phases
          (alist-replace
-- 
cgit v1.2.3