guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 1/8] gnu: qt: Update to 5.6.1-1.


From: David Craven
Subject: [PATCH 1/8] gnu: qt: Update to 5.6.1-1.
Date: Fri, 29 Jul 2016 10:23:50 +0200

* gnu/packages/qt.scm (qt): Update to 5.6.1-1.
---
 gnu/packages/qt.scm | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f246550..dbd6a0a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -60,7 +60,7 @@
 (define-public qt
   (package
     (name "qt")
-    (version "5.5.1")
+    (version "5.6.1-1")
     (source (origin
              (method url-fetch)
              (uri
@@ -71,8 +71,8 @@
                  "/single/qt-everywhere-opensource-src-"
                  version ".tar.xz"))
              (sha256
-               (base32
-                 "0615cn4n3n78v48lnmapqz2jizm2pzrjwvsjlnsf4awrsiiqw0kg"))
+              (base32
+               "1nrn2wivjwdxc9q03gpsi336gcl9l2axi0xjbzsha5v6akmsf26f"))
              (modules '((guix build utils)))
              (snippet
               '(begin
@@ -151,8 +151,16 @@
        ;; A more structural fix is needed.
        #:parallel-build? #f
        #:phases
-         (alist-replace
-          'configure
+       (modify-phases %standard-phases
+         (add-after 'configure 'patch-bin-sh
+           (lambda _
+             (substitute* '("qtbase/config.status"
+                            "qtbase/configure"
+                            "qtbase/mkspecs/features/qt_functions.prf"
+                            "qtbase/qmake/library/qmakebuiltins.cpp")
+                          (("/bin/sh") (which "sh")))
+             #t))
+         (replace 'configure
           (lambda* (#:key outputs #:allow-other-keys)
             (let ((out (assoc-ref outputs "out")))
               (substitute* '("configure" "qtbase/configure")
@@ -167,6 +175,10 @@
                       "-prefix" out
                       "-opensource"
                       "-confirm-license"
+                      ;; Do not build examples; if desired, these could go
+                      ;; into a separate output, but for the time being, we
+                      ;; prefer to save the space and build time.
+                      "-nomake" "examples"
                       ;; Most "-system-..." are automatic, but some use
                       ;; the bundled copy by default.
                       "-system-sqlite"
@@ -189,8 +201,7 @@
                       "-no-avx"
                       "-no-avx2"
                       "-no-mips_dsp"
-                      "-no-mips_dspr2"))))
-          %standard-phases)))
+                      "-no-mips_dspr2"))))))))
     (home-page "http://qt-project.org/";)
     (synopsis "Cross-platform GUI library")
     (description "Qt is a cross-platform application and UI framework for
-- 
2.9.0



reply via email to

[Prev in Thread] Current Thread [Next in Thread]