[PATCH 00/14] modular qt patches

[PATCH 00/14] modular qt patches

[Efraim Flashner]

Here's my batch of modular qt patches. I found a couple of issues while
I was making them. qtbase doesn't produce the binary lrelease so
qttranslations can't be built, and qtquick, which had its last release in
5.4.2, can't be found by qtquickcontrols or qtgraphicaleffects. I didn't
build qtwebengine or the ones that depended on it. When I realized 5.6.1
had been released I built all of these, minus qttools, with qtbase, in
3.25 hours, a significant decrease compared to the full bundle.

https://code.qt.io/cgit/qt/qt5.git/tree/.gitmodules?h=5.6.1 was a great
cheat-sheet for what modules needed which other ones as inputs.

Efraim Flashner (14):
  gnu: Add qtsvg.
  gnu: Add qtimageformats.
  gnu: Add qtx11extras.
  gnu: Add qtxmlpatterns.
  gnu: Add qtdeclarative.
  gnu: Add qtconnectivity.
  gnu: Add qtwebsockets.
  gnu: Add qtsensors.
  gnu: Add qtmultimedia.
  gnu: Add qtwayland.
  gnu: Add qtserialport.
  gnu: Add qtwebchannel.
  gnu: Add qtlocation.
  gnu: Add qttools.

 gnu/packages/qt.scm | 258 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 258 insertions(+)

-- 
2.8.3

[PATCH 01/14] gnu: Add qtsvg.

[Efraim Flashner]

* gnu/packages/qt.scm (qtsvg): New variable.
---
 gnu/packages/qt.scm | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c79160f..9f0a0bb 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -431,6 +431,39 @@ developers using C++ or QML, a CSS & JavaScript like language.")
 developers using C++ or QML, a CSS & JavaScript like language.")
     (license (list lgpl2.1 lgpl3))))
 
+(define-public qtsvg
+  (package (inherit qtbase)
+    (name "qtsvg")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "08ca5g46g75acy27jfnvnalmcias5hxmjp7491v3y4k9y7a4ybpi"))))
+    (propagated-inputs `())
+    (inputs
+     `(("qtbase" ,qtbase)
+       ,@(package-inputs qtbase)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda _
+             (zero? (system* "qmake"
+                             (string-append "PREFIX="
+                                            (assoc-ref %outputs "out"))))))
+         (add-before 'install 'fix-Makefiles
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out    (assoc-ref outputs "out"))
+                   (qtbase (assoc-ref inputs "qtbase")))
+               (substitute* (find-files "." "Makefile")
+                            (((string-append "INSTALL_ROOT)" qtbase))
+                             (string-append "INSTALL_ROOT)" out)))))))))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 02/14] gnu: Add qtimageformats.

[Efraim Flashner]

* gnu/packages/qt.scm (qtimageformats): New variable.
---
 gnu/packages/qt.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9f0a0bb..6298a03 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -464,6 +464,20 @@ developers using C++ or QML, a CSS & JavaScript like language.")
                             (((string-append "INSTALL_ROOT)" qtbase))
                              (string-append "INSTALL_ROOT)" out)))))))))))
 
+(define-public qtimageformats
+  (package (inherit qtsvg)
+    (name "qtimageformats")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl"))))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

Re: [PATCH 02/14] gnu: Add qtimageformats.

[Leo Famulari]

On Fri, Jun 10, 2016 at 03:10:13PM +0300, Efraim Flashner wrote:
> * gnu/packages/qt.scm (qtimageformats): New variable.

> +(define-public qtimageformats
> +  (package (inherit qtsvg)

These patches make me realize my understanding of package inheritance is
unclear.

If qtsvg is updated, but no other changes are made, will qtimageformats
(and all the other packages that inherit from qtsvg) need to be rebuilt
as well?

Looking at `guix refresh -l` and `guix gc --references` suggests the
answer is "no".

I know this is a contrived example; if qtsvg is updated, it's likely
that all the Qt packages will be updated as well.

> +    (name "qtimageformats")
> +    (version "5.6.1")
> +    (source (origin
> +             (method url-fetch)
> +             (uri (string-append "https://download.qt.io/official_releases/qt/"
> +                                 (version-major+minor version) "/" version
> +                                 "/submodules/" name "-opensource-src-"
> +                                 version ".tar.xz"))
> +             (sha256
> +              (base32
> +               "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl"))))))
> +
>  (define-public qjson
>    (package
>      (name "qjson")
> -- 
> 2.8.3
> 
> 

Re: [PATCH 02/14] gnu: Add qtimageformats.

[Andreas Enge]

On Fri, Jun 10, 2016 at 12:30:45PM -0400, Leo Famulari wrote:
> On Fri, Jun 10, 2016 at 03:10:13PM +0300, Efraim Flashner wrote:
> > +(define-public qtimageformats
> > +  (package (inherit qtsvg)
> These patches make me realize my understanding of package inheritance is
> unclear.
> 
> If qtsvg is updated, but no other changes are made, will qtimageformats
> (and all the other packages that inherit from qtsvg) need to be rebuilt
> as well?
> 
> Looking at `guix refresh -l` and `guix gc --references` suggests the
> answer is "no".

My understanding is that not the package definition, but the derivation
counts. So for instance, if the version is increased in qtsvg, this new
version also appears in qtimageformats, but if it is set back there, not
even the package definition has changed.

So this should be safe; in a sense, the inheritance from qtsvg creates a
"qt build system"; since this is so far only used internally to build qt
itself, I think it is okay to not expose it to the exterior world.

However, another question: Are all the inputs for qtbase needed for all the
other modules, too, or could the list be trimmed?

Andreas

Re: [PATCH 02/14] gnu: Add qtimageformats.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2126 bytes --]

On Sun, Jun 12, 2016 at 04:12:21PM +0200, Andreas Enge wrote:
> On Fri, Jun 10, 2016 at 12:30:45PM -0400, Leo Famulari wrote:
> > On Fri, Jun 10, 2016 at 03:10:13PM +0300, Efraim Flashner wrote:
> > > +(define-public qtimageformats
> > > +  (package (inherit qtsvg)
> > These patches make me realize my understanding of package inheritance is
> > unclear.
> > 
> > If qtsvg is updated, but no other changes are made, will qtimageformats
> > (and all the other packages that inherit from qtsvg) need to be rebuilt
> > as well?
> > 
> > Looking at `guix refresh -l` and `guix gc --references` suggests the
> > answer is "no".
> 
> My understanding is that not the package definition, but the derivation
> counts. So for instance, if the version is increased in qtsvg, this new
> version also appears in qtimageformats, but if it is set back there, not
> even the package definition has changed.
> 
> So this should be safe; in a sense, the inheritance from qtsvg creates a
> "qt build system"; since this is so far only used internally to build qt
> itself, I think it is okay to not expose it to the exterior world.
> 
> However, another question: Are all the inputs for qtbase needed for all the
> other modules, too, or could the list be trimmed?
> 
> Andreas
> 

quite possibly the inputs could be shortened, but since they're all
using qmake for configure I don't really know how to check. The best I
have for cross-distro comparison is debian:
$ apt-cache depends libqt5svg5
libqt5svg5
PreDepends: dpkg
dpkg:i386
Depends: libc6
Depends: libqt5core5a
Depends: libqt5gui5
Depends: libqt5widgets5
Depends: libstdc++6
Depends: <qtbase-abi-5-5-1>
Depends: zlib1g

I don't think I've seen anything like <qtbase-abi-5-5-1> before, but I'm
assuming its the list of inputs/depends that qtbase-5.5.1 uses in
Debian. qtcore, qtgui and qtwidgets are all outputs of qtbase.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 02/14] gnu: Add qtimageformats.

[Andreas Enge]

On Sun, Jun 12, 2016 at 11:20:24PM +0300, Efraim Flashner wrote:
> quite possibly the inputs could be shortened, but since they're all
> using qmake for configure I don't really know how to check.

You could compile the packages and use "guix gc --references" to check
which of the inputs are used.

Two basic situations could occur:
- Essentially all inputs of qtbase are also needed for the other packages.
  Then in this special case, I think it does not matter too much to have
  added a few additional inputs, which in any case will have no effect on
  the build result or on installations.
- Only qtbase is used as an input, and the occasional additional one.
  Then I would add the inputs one by one by hand, until the package builds.
I think that the first case is more likely, and would be happy with you
pushing the packages then.

Andreas

Re: [PATCH 02/14] gnu: Add qtimageformats.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 2589 bytes --]

On Tue, Jun 14, 2016 at 11:07:03AM +0200, Andreas Enge wrote:
> On Sun, Jun 12, 2016 at 11:20:24PM +0300, Efraim Flashner wrote:
> > quite possibly the inputs could be shortened, but since they're all
> > using qmake for configure I don't really know how to check.
> 
> You could compile the packages and use "guix gc --references" to check
> which of the inputs are used.
> 
> Two basic situations could occur:
> - Essentially all inputs of qtbase are also needed for the other packages.
>   Then in this special case, I think it does not matter too much to have
>   added a few additional inputs, which in any case will have no effect on
>   the build result or on installations.
> - Only qtbase is used as an input, and the occasional additional one.
>   Then I would add the inputs one by one by hand, until the package builds.
> I think that the first case is more likely, and would be happy with you
> pushing the packages then.
> 
> Andreas
> 

$ guix gc --references $(./pre-inst-env guix build qtsvg)

...

@ build-succeeded /gnu/store/1np6wm8mm9l8gljbr7qbknsbz8gz297j-qtsvg-5.6.1.drv -
   /gnu/store/8m00x5x8ykmar27s9248cmhnkdb2n54a-glibc-2.22
   /gnu/store/fikq4039zcbsa2wqlx33rq4kgp9gswk9-qtbase-5.6.1
   /gnu/store/hsxhfmjgh8m4c0pavq3gd3gcrn8zrgxj-zlib-1.2.8
   /gnu/store/lnrclizlj6kj5dag7f6fgc68nqybb941-mesa-11.0.9
   /gnu/store/v39bh3ln3ncnzhyw0kd12d46kww9747v-gcc-4.9.3-lib

$ guix gc --references $(./pre-inst-env guix build qtimageformats)

...

@ build-succeeded /gnu/store/7xsiyx1mampavj7c92by7ng8ml564grl-qtimageformats-5.6.1.drv -
     /gnu/store/39hhrf0sasq4qzmnz2nyji8xgzcwgj5h-libmng-2.0.3
     /gnu/store/8m00x5x8ykmar27s9248cmhnkdb2n54a-glibc-2.22
     /gnu/store/fikq4039zcbsa2wqlx33rq4kgp9gswk9-qtbase-5.6.1
     /gnu/store/hsxhfmjgh8m4c0pavq3gd3gcrn8zrgxj-zlib-1.2.8
     /gnu/store/lnrclizlj6kj5dag7f6fgc68nqybb941-mesa-11.0.9
     /gnu/store/v39bh3ln3ncnzhyw0kd12d46kww9747v-gcc-4.9.3-lib

It looks like they don't need the full list of inputs, so I'll run
through them and see how much it can be cleaned up. The other thing I
notice is that qtbase and these two all have references to mesa, which
makes me think it may not need to be propagated in qtbase afterall. Then
again, removing it may cause some packages that count on qt/qtbase's
mesa as an input will come up a dependancy short.


-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 03/14] gnu: Add qtx11extras.

[Efraim Flashner]

* gnu/packages/qt.scm (qtx11extras): New variable.
---
 gnu/packages/qt.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6298a03..fcc0f2e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -478,6 +478,20 @@ developers using C++ or QML, a CSS & JavaScript like language.")
               (base32
                "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl"))))))
 
+(define-public qtx11extras
+  (package (inherit qtsvg)
+    (name "qtx11extras")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0l736qiz8adrnh267xz63hv4sph6nhy90h836qfnnmv3p78ipsz8"))))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 04/14] gnu: Add qtxmlpatterns.

[Efraim Flashner]

* gnu/packages/qt.scm (qtxmlpatterns): New variable.
---
 gnu/packages/qt.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fcc0f2e..4ff5562 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -492,6 +492,30 @@ developers using C++ or QML, a CSS & JavaScript like language.")
               (base32
                "0l736qiz8adrnh267xz63hv4sph6nhy90h836qfnnmv3p78ipsz8"))))))
 
+(define-public qtxmlpatterns
+  (package (inherit qtsvg)
+    (name "qtxmlpatterns")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0q412jv3xbg7v05b8pbahifwx17gzlp96s90akh6zwhpm8i6xx34"))))
+    (arguments
+      (substitute-keyword-arguments (package-arguments qtsvg)
+        ((#:phases phases)
+         `(modify-phases ,phases
+            (add-after 'install 'install-bins
+              (lambda* (#:key outputs #:allow-other-keys)
+                (let* ((out (assoc-ref outputs "out"))
+                       (bin (string-append out "/bin")))
+                  (install-file "bin/xmlpatterns" bin)
+                  (install-file "bin/xmlpatternsvalidator" bin))))))))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 05/14] gnu: Add qtdeclarative.

[Efraim Flashner]

* gnu/packages/qt.scm (qtdeclarative): New variable.
---
 gnu/packages/qt.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4ff5562..3f10c68 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -516,6 +516,24 @@ developers using C++ or QML, a CSS & JavaScript like language.")
                   (install-file "bin/xmlpatterns" bin)
                   (install-file "bin/xmlpatternsvalidator" bin))))))))))
 
+(define-public qtdeclarative
+  (package (inherit qtsvg)
+    (name "qtdeclarative")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1d2217kxk85kpi7ls08b41hqzy26hvch8m4cgzq6km5sqi5zvz0j"))))
+    (inputs
+     `(("qtsvg" ,qtsvg)
+       ("qtxmlpatterns" ,qtxmlpatterns)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 06/14] gnu: Add qtconnectivity.

[Efraim Flashner]

* gnu/packages/qt.scm (qtconnectivity): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3f10c68..fee4d20 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -534,6 +534,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
        ("qtxmlpatterns" ,qtxmlpatterns)
        ,@(package-inputs qtsvg)))))
 
+(define-public qtconnectivity
+  (package (inherit qtsvg)
+    (name "qtconnectivity")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "06fr9321f52kf0nda9zjjfzp5694hbnx0y0v315iw28mnpvandas"))))
+    (inputs
+     `(("qtdeclarative" ,qtdeclarative)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 07/14] gnu: Add qtwebsockets.

[Efraim Flashner]

* gnu/packages/qt.scm (qtwebsockets): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fee4d20..d1bb545 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -551,6 +551,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtdeclarative" ,qtdeclarative)
        ,@(package-inputs qtsvg)))))
 
+(define-public qtwebsockets
+  (package (inherit qtsvg)
+    (name "qtwebsockets")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0fkj52i4yi6gmq4jfjgdij08cspxspac6mbpf0fknnllimmkl7jm"))))
+    (inputs
+     `(("qtdeclarative" ,qtdeclarative)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 08/14] gnu: Add qtsensors.

[Efraim Flashner]

* gnu/packages/qt.scm (qtsensors): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d1bb545..6db944f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -568,6 +568,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtdeclarative" ,qtdeclarative)
        ,@(package-inputs qtsvg)))))
 
+(define-public qtsensors
+  (package (inherit qtsvg)
+    (name "qtsensors")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0bll7ll6s5g8w89knyrc0famjwqyfzwpn512m1f96bf6xwacs967"))))
+    (inputs
+     `(("qtdeclarative" ,qtdeclarative)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 09/14] gnu: Add qtmultimedia.

[Efraim Flashner]

* gnu/packages/qt.scm (qtmultimedia): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6db944f..962fa81 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -585,6 +585,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtdeclarative" ,qtdeclarative)
        ,@(package-inputs qtsvg)))))
 
+(define-public qtmultimedia
+  (package (inherit qtsvg)
+    (name "qtmultimedia")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "058523c2qra3d8fq46ygcndnkrbwlh316zy28s2cr5pjr5gmnjyj"))))
+    (inputs
+     `(("qtdeclarative" ,qtdeclarative)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 10/14] gnu: Add qtwayland.

[Efraim Flashner]

* gnu/packages/qt.scm (qtwayland): New variable.
---
 gnu/packages/qt.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 962fa81..cd38eb3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -35,6 +35,7 @@
   #:use-module (gnu packages databases)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnuzilla)
@@ -602,6 +603,24 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtdeclarative" ,qtdeclarative)
        ,@(package-inputs qtsvg)))))
 
+(define-public qtwayland
+  (package (inherit qtsvg)
+    (name "qtwayland")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1jgghjfrg0wwyfzfwgwhagwxz9k936ylv3w2l9bwlpql8rgm8d11"))))
+    (inputs
+     `(("qtdeclarative" ,qtdeclarative)
+       ("wayland" ,wayland)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 11/14] gnu: Add qtserialport.

[Efraim Flashner]

* gnu/packages/qt.scm (qtserialport): New variable.
---
 gnu/packages/qt.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index cd38eb3..e026b89 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -621,6 +621,20 @@ developers using C++ or QML, a CSS & JavaScript like language.")
        ("wayland" ,wayland)
        ,@(package-inputs qtsvg)))))
 
+(define-public qtserialport
+  (package (inherit qtsvg)
+    (name "qtserialport")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "1hp63cgqhps6y1k041lzhcb2b0rcpcmszabnn293q5ilbvla4x0b"))))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 12/14] gnu: Add qtwebchannel.

[Efraim Flashner]

* gnu/packages/qt.scm (qtwebchannel): New variable.
---
 gnu/packages/qt.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e026b89..1590c11 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -635,6 +635,24 @@ developers using C++ or QML, a CSS & JavaScript like language.")
               (base32
                "1hp63cgqhps6y1k041lzhcb2b0rcpcmszabnn293q5ilbvla4x0b"))))))
 
+(define-public qtwebchannel
+  (package (inherit qtsvg)
+    (name "qtwebchannel")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "01q80917a1048hdhaii4v50dqs84h16lc9w3v99r9xvspk8vab7q"))))
+    (inputs
+     `(("qtdeclarative" ,qtdeclarative)
+       ("qtwebsockets" ,qtwebsockets)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

[PATCH 13/14] gnu: Add qtlocation.

[Efraim Flashner]

* gnu/packages/qt.scm (qtlocation): New variable.
---
 gnu/packages/qt.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1590c11..4c8a8aa 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -653,6 +653,25 @@ developers using C++ or QML, a CSS & JavaScript like language.")
        ("qtwebsockets" ,qtwebsockets)
        ,@(package-inputs qtsvg)))))
 
+(define-public qtlocation
+  (package (inherit qtsvg)
+    (name "qtlocation")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0qahs7a2n3l4h0bl8bnwci9mzy1vra3zncnzr40csic9ys67ddfk"))))
+    (inputs
+     `(("qtdeclarative" ,qtdeclarative)
+       ;("qtquickcontrols" ,qtquickcontrols)
+       ("qtserialport" ,qtserialport)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

Re: [PATCH 13/14] gnu: Add qtlocation.

[Leo Famulari]

On Fri, Jun 10, 2016 at 03:10:24PM +0300, Efraim Flashner wrote:
> * gnu/packages/qt.scm (qtlocation): New variable.

> +    (inputs
> +     `(("qtdeclarative" ,qtdeclarative)
> +       ;("qtquickcontrols" ,qtquickcontrols)

Left over from something?

[PATCH 14/14] gnu: Add qttools.

[Efraim Flashner]

* gnu/packages/qt.scm (qttools): New variable.
---
 gnu/packages/qt.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 4c8a8aa..56a41df 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -672,6 +672,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
        ("qtserialport" ,qtserialport)
        ,@(package-inputs qtsvg)))))
 
+(define-public qttools
+  (package (inherit qtsvg)
+    (name "qttools")
+    (version "5.6.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "https://download.qt.io/official_releases/qt/"
+                                 (version-major+minor version) "/" version
+                                 "/submodules/" name "-opensource-src-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0wbzq60d7lkvlb7b5lqcw87qgy6kyjz1npjavz8f4grdxsaqi8vp"))))
+    (inputs
+     `(("qtdeclarative" ,qtdeclarative)
+       ,@(package-inputs qtsvg)))))
+
 (define-public qjson
   (package
     (name "qjson")
-- 
2.8.3

Re: [PATCH 00/14] modular qt patches

[Andreas Enge]

Hello,

one other question: Would there be a good source for descriptions to adapt
them for each module?

Andreas

Re: [PATCH 00/14] modular qt patches

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]

On Sun, Jun 12, 2016 at 04:13:21PM +0200, Andreas Enge wrote:
> Hello,
> 
> one other question: Would there be a good source for descriptions to adapt
> them for each module?
> 
> Andreas
> 

I haven't checked if there's a good upstream source, but a good
addition to the description could be: "This provides the qtsvg module"
(for qtsvg), or "This package provides the qtconcurrent, qtcore, qtdbus,
qtgui, qtopenglextensions, qtplatformheaders, qtplatformsupport,
qtprintsupport, qtsql, qttest, qtwidgets, qtxml modules." (for qtbase).

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 00/14] modular qt patches

[Andreas Enge]

On Tue, Jun 14, 2016 at 01:58:58PM +0300, Efraim Flashner wrote:
> I haven't checked if there's a good upstream source, but a good
> addition to the description could be: "This provides the qtsvg module"
> (for qtsvg), or "This package provides the qtconcurrent, qtcore, qtdbus,
> qtgui, qtopenglextensions, qtplatformheaders, qtplatformsupport,
> qtprintsupport, qtsql, qttest, qtwidgets, qtxml modules." (for qtbase).

The first one is a bit redundant, the second one useful. Maybe other packages
will also provide more than one module, then this text would be helpful.
I would suggest to capitalise them as in the library names, such as
"Qt5Concurrent" etc.. What do you think?

Concerning Mesa, I agree that it should probably not be propagated by
qtbase.

Andreas