From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Craven Subject: [PATCH 1/8] gnu: qt: Update to 5.6.1-1. Date: Fri, 29 Jul 2016 10:23:50 +0200 Message-ID: <20160729082357.17501-1-david@craven.ch> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT36E-0006Ba-EX for guix-devel@gnu.org; Fri, 29 Jul 2016 04:24:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bT36A-0002HN-94 for guix-devel@gnu.org; Fri, 29 Jul 2016 04:24:53 -0400 Received: from so254-10.mailgun.net ([198.61.254.10]:60782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT369-0002Gu-1k for guix-devel@gnu.org; Fri, 29 Jul 2016 04:24:50 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: David Craven * 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