* [PATCH 1/2] gnu: qt: Update to 5.4.0.
@ 2015-01-03 6:36 宋文武
2015-01-03 6:36 ` [PATCH 2/2] gnu: qt: Add more inputs 宋文武
2015-01-03 19:16 ` [PATCH 1/2] gnu: qt: Update to 5.4.0 Ludovic Courtès
0 siblings, 2 replies; 9+ messages in thread
From: 宋文武 @ 2015-01-03 6:36 UTC (permalink / raw)
To: guix-devel
* gnu/packages/qt.scm (qt): Update to 5.4.0.
[origin]: Add snippet.
---
gnu/packages/qt.scm | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 30b772d..42df933 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -81,7 +82,7 @@ X11 (yet).")
(define-public qt
(package
(name "qt")
- (version "5.3.2")
+ (version "5.4.0")
(source (origin
(method url-fetch)
(uri (string-append "http://download.qt-project.org/official_releases/qt/"
@@ -91,7 +92,14 @@ X11 (yet).")
version ".tar.xz"))
(sha256
(base32
- "1w4v53889kqpwxw45wcqz5bi6zx8xp434jpafk1vlmyb8hrzjnvz"))))
+ "176351k8ngczb324i8bbkrsz9pby7cvy2qnixfjwybzxp53xzndj"))
+ (snippet
+ '(begin
+ ;; Remove broken symlinks.
+ (delete-file "qtwebengine/src/3rdparty/chromium/third_party/\
+mesa/src/src/gallium/state_trackers/d3d1x/w32api")
+ (delete-file "qtwebengine/src/3rdparty/chromium/third_party/\
+webrtc/tools/e2e_quality/audio/perf")))))
(build-system gnu-build-system)
(propagated-inputs
`(("mesa" ,mesa)))
@@ -129,7 +137,9 @@ X11 (yet).")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(substitute* '("configure" "qtbase/configure")
- (("/bin/pwd") (which "pwd")))
+ (("/bin/pwd") (which "pwd")))
+ (substitute* "qtbase/src/corelib/global/global.pri"
+ (("/bin/ls") (which "ls")))
;; do not pass "--enable-fast-install", which makes the
;; configure process fail
(zero? (system*
--
2.1.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] gnu: qt: Add more inputs.
2015-01-03 6:36 [PATCH 1/2] gnu: qt: Update to 5.4.0 宋文武
@ 2015-01-03 6:36 ` 宋文武
2015-01-03 19:16 ` [PATCH 1/2] gnu: qt: Update to 5.4.0 Ludovic Courtès
1 sibling, 0 replies; 9+ messages in thread
From: 宋文武 @ 2015-01-03 6:36 UTC (permalink / raw)
To: guix-devel
* gnu/packages/qt.scm (qt): Add inputs libxcomposite, libxml2, libxslt,
mtdev, pcre, eudev. Add native-inputs bison, flex, gperf, python-2, ruby.
---
gnu/packages/qt.scm | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 42df933..bb61d86 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -27,19 +27,24 @@
#:use-module (gnu packages bison)
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages flex)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gperf)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
#:use-module (gnu packages linux)
#:use-module (gnu packages databases)
#:use-module (gnu packages openssl)
+ #:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages ruby)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xdisorg)
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages xml))
(define-public libxkbcommon
(package
@@ -113,14 +118,18 @@ webrtc/tools/e2e_quality/audio/perf")))))
("libjpeg" ,libjpeg)
("libpng" ,libpng)
("libx11" ,libx11)
+ ("libxcomposite" ,libxcomposite)
("libxi" ,libxi)
("libxkbcommon" ,libxkbcommon)
+ ("libxml2" ,libxml2)
("libxrender" ,libxrender)
+ ("libxslt" ,libxslt)
+ ("mtdev" ,mtdev)
("mysql" ,mysql)
("openssl" ,openssl)
("pulseaudio" ,pulseaudio)
- ("python-wrapper" ,python-wrapper)
- ("ruby" ,ruby)
+ ("pcre" ,pcre)
+ ("udev" ,eudev)
("xcb-util" ,xcb-util)
("xcb-util-image" ,xcb-util-image)
("xcb-util-keysyms" ,xcb-util-keysyms)
@@ -128,8 +137,13 @@ webrtc/tools/e2e_quality/audio/perf")))))
("xcb-util-wm" ,xcb-util-wm)
("zlib" ,zlib)))
(native-inputs
- `(("perl" ,perl)
- ("pkg-config" ,pkg-config)))
+ `(("bison" ,bison)
+ ("flex" ,flex)
+ ("gperf" ,gperf)
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-2)
+ ("ruby" ,ruby)))
(arguments
`(#:phases
(alist-replace
--
2.1.2
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: qt: Update to 5.4.0.
2015-01-03 6:36 [PATCH 1/2] gnu: qt: Update to 5.4.0 宋文武
2015-01-03 6:36 ` [PATCH 2/2] gnu: qt: Add more inputs 宋文武
@ 2015-01-03 19:16 ` Ludovic Courtès
2015-01-03 22:45 ` Andreas Enge
` (2 more replies)
1 sibling, 3 replies; 9+ messages in thread
From: Ludovic Courtès @ 2015-01-03 19:16 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <iyzsong@gmail.com> skribis:
> * gnu/packages/qt.scm (qt): Update to 5.4.0.
> [origin]: Add snippet.
[...]
> * gnu/packages/qt.scm (qt): Add inputs libxcomposite, libxml2, libxslt,
> mtdev, pcre, eudev. Add native-inputs bison, flex, gperf, python-2, ruby.
LGTM. If you’re unsure whether this breaks applications, we can put it
on a separate branch and have Hydra build it. WDYT?
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: qt: Update to 5.4.0.
2015-01-03 19:16 ` [PATCH 1/2] gnu: qt: Update to 5.4.0 Ludovic Courtès
@ 2015-01-03 22:45 ` Andreas Enge
2015-01-04 1:07 ` 宋文武
2015-01-04 13:08 ` 宋文武
2015-01-11 12:04 ` 宋文武
2 siblings, 1 reply; 9+ messages in thread
From: Andreas Enge @ 2015-01-03 22:45 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Hello,
On Sat, Jan 03, 2015 at 08:16:02PM +0100, Ludovic Courtès wrote:
> > * gnu/packages/qt.scm (qt): Add inputs libxcomposite, libxml2, libxslt,
> > mtdev, pcre, eudev. Add native-inputs bison, flex, gperf, python-2, ruby.
actually, did you check whether each of these are actually found and used
during the build of qt? I seem to recall that I tried one or two of them
and they were not found.
Andreas
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: qt: Update to 5.4.0.
2015-01-03 22:45 ` Andreas Enge
@ 2015-01-04 1:07 ` 宋文武
0 siblings, 0 replies; 9+ messages in thread
From: 宋文武 @ 2015-01-04 1:07 UTC (permalink / raw)
To: Andreas Enge; +Cc: Guix-devel
[-- Attachment #1: Type: text/plain, Size: 593 bytes --]
2015-01-04 6:45 GMT+08:00 Andreas Enge <andreas@enge.fr>:
> Hello,
>
> On Sat, Jan 03, 2015 at 08:16:02PM +0100, Ludovic Courtès wrote:
> > > * gnu/packages/qt.scm (qt): Add inputs libxcomposite, libxml2, libxslt,
> > > mtdev, pcre, eudev. Add native-inputs bison, flex, gperf, python-2,
> ruby.
>
> actually, did you check whether each of these are actually found and used
> during the build of qt? I seem to recall that I tried one or two of them
> and they were not found.
>
Actually, it failed at qtwebengine, and pcre not used..
I'll check more.
>
> Andreas
>
>
[-- Attachment #2: Type: text/html, Size: 1135 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: qt: Update to 5.4.0.
2015-01-03 19:16 ` [PATCH 1/2] gnu: qt: Update to 5.4.0 Ludovic Courtès
2015-01-03 22:45 ` Andreas Enge
@ 2015-01-04 13:08 ` 宋文武
2015-01-05 1:22 ` 宋文武
2015-01-11 12:04 ` 宋文武
2 siblings, 1 reply; 9+ messages in thread
From: 宋文武 @ 2015-01-04 13:08 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Ludovic Courtès <ludo@gnu.org> writes:
> 宋文武 <iyzsong@gmail.com> skribis:
>
>> * gnu/packages/qt.scm (qt): Update to 5.4.0.
>> [origin]: Add snippet.
>
> [...]
>
>> * gnu/packages/qt.scm (qt): Add inputs libxcomposite, libxml2, libxslt,
>> mtdev, pcre, eudev. Add native-inputs bison, flex, gperf, python-2, ruby.
>
> LGTM. If you’re unsure whether this breaks applications, we can put it
> on a separate branch and have Hydra build it. WDYT?
That's great, I have push it to the wip-qt branch.
>
> Thanks,
> Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: qt: Update to 5.4.0.
2015-01-04 13:08 ` 宋文武
@ 2015-01-05 1:22 ` 宋文武
0 siblings, 0 replies; 9+ messages in thread
From: 宋文武 @ 2015-01-05 1:22 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: Guix-devel
[-- Attachment #1: Type: text/plain, Size: 748 bytes --]
2015-01-04 21:08 GMT+08:00 宋文武 <iyzsong@gmail.com>:
> Ludovic Courtès <ludo@gnu.org> writes:
>
> > 宋文武 <iyzsong@gmail.com> skribis:
> >
> >> * gnu/packages/qt.scm (qt): Update to 5.4.0.
> >> [origin]: Add snippet.
> >
> > [...]
> >
> >> * gnu/packages/qt.scm (qt): Add inputs libxcomposite, libxml2, libxslt,
> >> mtdev, pcre, eudev. Add native-inputs bison, flex, gperf, python-2,
> ruby.
> >
> > LGTM. If you’re unsure whether this breaks applications, we can put it
> > on a separate branch and have Hydra build it. WDYT?
> = That's great, I have push it to the wip-qt branch.
Yes, please let Hydra build it :)
It take too long to build qt5 on my laptop.
>
>
> > Thanks,
> > Ludo’.
>
[-- Attachment #2: Type: text/html, Size: 1640 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: qt: Update to 5.4.0.
2015-01-03 19:16 ` [PATCH 1/2] gnu: qt: Update to 5.4.0 Ludovic Courtès
2015-01-03 22:45 ` Andreas Enge
2015-01-04 13:08 ` 宋文武
@ 2015-01-11 12:04 ` 宋文武
2015-01-12 9:19 ` Ludovic Courtès
2 siblings, 1 reply; 9+ messages in thread
From: 宋文武 @ 2015-01-11 12:04 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
Ludovic Courtès <ludo@gnu.org> writes:
> 宋文武 <iyzsong@gmail.com> skribis:
>
>> * gnu/packages/qt.scm (qt): Update to 5.4.0.
>> [origin]: Add snippet.
>
> [...]
>
>> * gnu/packages/qt.scm (qt): Add inputs libxcomposite, libxml2, libxslt,
>> mtdev, pcre, eudev. Add native-inputs bison, flex, gperf, python-2, ruby.
>
> LGTM. If you’re unsure whether this breaks applications, we can put it
> on a separate branch and have Hydra build it. WDYT?
Hi, I have just pushed qt update to master.
The wip-qt branch can be delete.
>
> Thanks,
> Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] gnu: qt: Update to 5.4.0.
2015-01-11 12:04 ` 宋文武
@ 2015-01-12 9:19 ` Ludovic Courtès
0 siblings, 0 replies; 9+ messages in thread
From: Ludovic Courtès @ 2015-01-12 9:19 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <iyzsong@gmail.com> skribis:
> Hi, I have just pushed qt update to master.
>
> The wip-qt branch can be delete.
Somebody took care of it. Thank you!
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-01-12 9:20 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-03 6:36 [PATCH 1/2] gnu: qt: Update to 5.4.0 宋文武
2015-01-03 6:36 ` [PATCH 2/2] gnu: qt: Add more inputs 宋文武
2015-01-03 19:16 ` [PATCH 1/2] gnu: qt: Update to 5.4.0 Ludovic Courtès
2015-01-03 22:45 ` Andreas Enge
2015-01-04 1:07 ` 宋文武
2015-01-04 13:08 ` 宋文武
2015-01-05 1:22 ` 宋文武
2015-01-11 12:04 ` 宋文武
2015-01-12 9:19 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.