unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 1/8] gnu: qt: Update to 5.6.1-1.
@ 2016-07-29  8:23 David Craven
  2016-07-29  8:23 ` [PATCH 2/8] gnu: Use define-public to export packages David Craven
                   ` (8 more replies)
  0 siblings, 9 replies; 35+ messages in thread
From: David Craven @ 2016-07-29  8:23 UTC (permalink / raw)
  To: guix-devel; +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

^ permalink raw reply related	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2016-09-11 16:35 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-29  8:23 [PATCH 1/8] gnu: qt: Update to 5.6.1-1 David Craven
2016-07-29  8:23 ` [PATCH 2/8] gnu: Use define-public to export packages David Craven
2016-07-29 15:35   ` Ludovic Courtès
2016-07-29  8:23 ` [PATCH 3/8] gnu: Remove trailing periods from synopsis David Craven
2016-07-29 15:38   ` Ludovic Courtès
2016-07-29  8:23 ` [PATCH 4/8] gnu: freedesktop: Add libinput-minimal David Craven
2016-07-29 11:25   ` Vincent Legoll
2016-07-29 12:53     ` David Craven
2016-07-29 13:13       ` Vincent Legoll
2016-07-29 15:40   ` Ludovic Courtès
2016-07-29  8:23 ` [PATCH 5/8] gnu: xorg: Add xf86-video-qxl David Craven
2016-07-29 15:42   ` Ludovic Courtès
2016-07-29  8:23 ` [PATCH 6/8] gnu: Order module imports in (gnu packages qemu) alphabetically David Craven
2016-07-29 15:44   ` Ludovic Courtès
2016-07-29 16:26     ` David Craven
2016-07-29  8:23 ` [PATCH 7/8] gnu: qemu: Enable spice support David Craven
2016-07-29 19:10   ` Ludovic Courtès
2016-07-29 19:12     ` David Craven
2016-07-30 12:47     ` Ludovic Courtès
2016-07-29  8:23 ` [PATCH 8/8] services: Add spice vdagent service David Craven
2016-07-29 19:16   ` Ludovic Courtès
2016-07-29 19:20     ` David Craven
2016-07-30 10:29       ` David Craven
2016-07-30 22:41         ` Ludovic Courtès
2016-07-31 18:14           ` David Craven
2016-08-01 12:01             ` Ludovic Courtès
2016-07-29 19:20 ` [PATCH 1/8] gnu: qt: Update to 5.6.1-1 Ludovic Courtès
2016-07-29 19:23   ` David Craven
2016-07-30  8:57   ` Andreas Enge
2016-07-30 22:44     ` Code formatting Ludovic Courtès
2016-07-31 10:34       ` Danny Milosavljevic
2016-07-31 10:37         ` Andreas Enge
2016-07-31 10:59         ` Ludovic Courtès
2016-09-11 16:35           ` Andreas Enge
     [not found] ` <20160729101510.GA30683@solar>
     [not found]   ` <CAL1_im=qJ3=0P=c6OhL9wW2rz4wJY3cFubute0dHWyr5ymjhsA@mail.gmail.com>
     [not found]     ` <CAL1_im=EbMqBufpsW2eMxYZdLWVDtmq4TD1HDKvAQ_u_RpdjXw@mail.gmail.com>
     [not found]       ` <20160729180053.GA1301@solar>
2016-07-30  8:53         ` [PATCH 1/8] gnu: qt: Update to 5.6.1-1 Andreas Enge

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).