[PATCH 0/9] Add more qtmodules

[PATCH 0/9] Add more qtmodules

[Efraim Flashner]

I figured we could use some more Qt modules, so I packaged up a couple. Qt3d
bundles assimp and I'm still working on unbundling that, and even so I'm not
happy about how it references another graphics library, so that one is going
to need some more time. I also haven't looked at qtwebengine, since it bundles
chromium. Of the remaining, qtwebview depends on qtwebengine, qtactiveqt is
windows only, and I didn't look at qt{android,mac,windows}.

While I was working on them, I realized that the test suite wasn't really
being run. I patched qtsvg to run the test suite (and therefor propagate to
all the other qt modules), but everything started breaking, due to network
tests, javascript dependencies, etc., so I've moved that to a separate branch
locally to work on more later. However, I do think it would be be better to
enable the tests in qtsvg and then disable them on most of the modules, so
that way they're ready to be fixed and enabled without waiting for me to
get around to it. Thoughts?

Efraim Flashner (9):
  gnu: Add qtdeclarative-render2d.
  gnu: Add qtserialbus.
  gnu: Add qtgamepad.
  gnu: Add qtscxml.
  gnu: Add qtpurchasing.
  gnu: Add qtcanvas3d.
  gnu: Add qtcharts.
  gnu: Add qtdatavis3d.
  gnu: Add qt3d.

 gnu/packages/qt.scm | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 1 deletion(-)

-- 
2.11.0

[PATCH] gnu: Add python-pypump.

[Efraim Flashner]

* gnu/packages/pumpio.scm (python-pypump): New variable.
---
 gnu/packages/pumpio.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/pumpio.scm b/gnu/packages/pumpio.scm
index a74d474..f834884 100644
--- a/gnu/packages/pumpio.scm
+++ b/gnu/packages/pumpio.scm
@@ -23,7 +23,9 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix build-system python)
   #:use-module (gnu packages aspell)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages web))
 
@@ -66,3 +68,40 @@
     (description "Pumpa is a simple pump.io client written in C++ and Qt.")
     (home-page "https://pumpa.branchable.com/")
     (license gpl3+)))
+
+(define-public python-pypump
+  (package
+    (name "python-pypump")
+    (version "0.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "PyPump" version))
+        (sha256
+         (base32
+          "0100b8r76hwh4lbiwb2dji6jccpi4hgi2ns7qdgb3lwfidnya3ha"))))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ; FIXME: can't find test directory.
+    (inputs
+     `(("python-dateutil-2" ,python-dateutil-2)
+       ("python-requests" ,python-requests)
+       ("python-requests-oauthlib" ,python-requests-oauthlib)))
+    (home-page "https://github.com/xray7224/PyPump")
+    (synopsis "Python Pump.io library")
+    (description "Python Pump.io library")
+    (license gpl3+)
+    (properties `((python2-variant . ,(delay python2-pypump))))))
+
+(define-public python2-pypump
+  (let ((pypump (package-with-python2
+                  (strip-python2-variant python-pypump))))
+    (package (inherit pypump)
+      (inputs
+       `(("python2-ndg-httpsclient" ,python2-ndg-httpsclient)
+         ("python2-pyasn1" ,python2-pyasn1)
+         ("python2-pyopenssl" ,python2-pyopenssl)
+         ,@(package-inputs pypump)))
+      (native-inputs
+       `(("python2-mock" ,python2-mock)
+         ("python2-setuptools" ,python2-setuptools)
+         ,@(package-native-inputs pypump))))))
-- 
2.10.0

[PATCH 1/9] gnu: Add qtdeclarative-render2d.

[Efraim Flashner]

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 15beb8037..bb3635a25 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
@@ -910,6 +910,27 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtdeclarative-render2d
+  (package (inherit qtsvg)
+    (name "qtdeclarative-render2d")
+    (version "5.7.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
+               "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"))
+             (modules '((guix build utils)))
+             (snippet
+              '(delete-file-recursively "tools/opengldummy/3rdparty"))))
+    (native-inputs `())
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 2/9] gnu: Add qtserialbus.

[Efraim Flashner]

* gnu/packages/qt.scm (qtserialbus): 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 bb3635a25..5f21be66c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -781,6 +781,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("eudev" ,eudev)))))
 
+(define-public qtserialbus
+  (package (inherit qtsvg)
+    (name "qtserialbus")
+    (version "5.7.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
+               "0mxi43l2inpbar8rmg21qjg33bv3f1ycxjgvzjf12ncnybhdnzkj"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtserialport" ,qtserialport)))))
+
 (define-public qtwebchannel
   (package (inherit qtsvg)
     (name "qtwebchannel")
-- 
2.11.0

[PATCH 3/9] gnu: Add qtgamepad.

[Efraim Flashner]

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5f21be66c..23872c1ef 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -55,6 +55,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages sdl)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
@@ -948,6 +949,30 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtgamepad
+  (package (inherit qtsvg)
+    (name "qtgamepad")
+    (version "5.7.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
+               "10lijbsg9xx5ddbbjymdgl41nxz99yn1qgiww2kkggxwwdjj2axv"))))
+    (native-inputs
+     `(("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("fontconfig" ,fontconfig)
+       ("freetype" ,freetype)
+       ("libxrender" ,libxrender)
+       ("sdl2" ,sdl2)
+       ("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 4/9] gnu: Add qtscxml.

[Efraim Flashner]

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 23872c1ef..821fea1c3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -973,6 +973,26 @@ developers using C++ or QML, a CSS & JavaScript like language.")
        ("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtscxml
+  (package (inherit qtsvg)
+    (name "qtscxml")
+    (version "5.7.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
+               "135kknqdmib2cjryfmvfgv7a2qx9pyba3m7i7nkbc5d742r4mbcx"))
+             (modules '((guix build utils)))
+             (snippet
+              '(delete-file-recursively "tests/3rdparty"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 5/9] gnu: Add qtpurchasing.

[Efraim Flashner]

* gnu/packages/qt.scm (qtpurchasing): 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 821fea1c3..d8acfe3a6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -993,6 +993,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtpurchasing
+  (package (inherit qtsvg)
+    (name "qtpurchasing")
+    (version "5.7.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
+               "0hkvrgafz1hx9q4yc3nskv3pd3fszghvvd5a7mj33ynf55wpb57n"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 6/9] gnu: Add qtcanvas3d.

[Efraim Flashner]

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index d8acfe3a6..04da5ee94 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1010,6 +1010,27 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtcanvas3d
+  (package (inherit qtsvg)
+    (name "qtcanvas3d")
+    (version "5.7.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
+               "1d5xpq3mhjg4ipxzap7s2vnlfcd02d3yq720npv10xxp2ww0i1x8"))
+             (modules '((guix build utils)))
+             (snippet
+              '(delete-file-recursively "examples/canvas3d/3rdparty"))))
+    (native-inputs `())
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 7/9] gnu: Add qtcharts.

[Efraim Flashner]

* gnu/packages/qt.scm (qtcharts): 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 04da5ee94..c1164b20f 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1031,6 +1031,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtcharts
+  (package (inherit qtsvg)
+    (name "qtcharts")
+    (version "5.7.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
+               "1qrzcddwff2hxsbxrraff16j4abah2zkra2756s1mvydj9lyxzl5"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

[PATCH 8/9] gnu: Add qtdatavis3d.

[Efraim Flashner]

* gnu/packages/qt.scm (qtdatavis3d): 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 c1164b20f..eb00fe769 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1048,6 +1048,23 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))))
 
+(define-public qtdatavis3d
+  (package (inherit qtsvg)
+    (name "qtdatavis3d")
+    (version "5.7.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
+               "1y00p0wyj5cw9c2925y537vpmmg9q3kpf7qr1s7sv67dvvf8bzqv"))))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))))
+
 (define-public python-sip
   (package
     (name "python-sip")
-- 
2.11.0

Re: [PATCH] gnu: Add python-pypump.

[Efraim Flashner]

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

On Mon, Jan 09, 2017 at 12:03:39PM +0200, Efraim Flashner wrote:
> * gnu/packages/pumpio.scm (python-pypump): New variable.
> ---
>  gnu/packages/pumpio.scm | 39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
> 

Ignore this one, I included it by accident, and I've never tested it.

-- 
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: 833 bytes --]

Re: [PATCH 0/9] Add more qtmodules

[Leo Famulari]

On Mon, Jan 09, 2017 at 12:03:38PM +0200, Efraim Flashner wrote:
> While I was working on them, I realized that the test suite wasn't really
> being run. I patched qtsvg to run the test suite (and therefor propagate to
> all the other qt modules), but everything started breaking, due to network
> tests, javascript dependencies, etc., so I've moved that to a separate branch
> locally to work on more later. However, I do think it would be be better to
> enable the tests in qtsvg and then disable them on most of the modules, so
> that way they're ready to be fixed and enabled without waiting for me to
> get around to it. Thoughts?

Sounds like a good plan.

> Efraim Flashner (9):
>   gnu: Add qtdeclarative-render2d.
>   gnu: Add qtserialbus.
>   gnu: Add qtgamepad.
>   gnu: Add qtscxml.
>   gnu: Add qtpurchasing.
>   gnu: Add qtcanvas3d.
>   gnu: Add qtcharts.
>   gnu: Add qtdatavis3d.

These LGTM overall.

>   gnu: Add qt3d.

This one doesn't seem to have been sent.

Re: [PATCH 0/9] Add more qtmodules

[Efraim Flashner]

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

On Mon, Jan 09, 2017 at 06:11:20PM -0500, Leo Famulari wrote:
> On Mon, Jan 09, 2017 at 12:03:38PM +0200, Efraim Flashner wrote:
> > While I was working on them, I realized that the test suite wasn't really
> > being run. I patched qtsvg to run the test suite (and therefor propagate to
> > all the other qt modules), but everything started breaking, due to network
> > tests, javascript dependencies, etc., so I've moved that to a separate branch
> > locally to work on more later. However, I do think it would be be better to
> > enable the tests in qtsvg and then disable them on most of the modules, so
> > that way they're ready to be fixed and enabled without waiting for me to
> > get around to it. Thoughts?
> 
> Sounds like a good plan.
> 
> > Efraim Flashner (9):
> >   gnu: Add qtdeclarative-render2d.
> >   gnu: Add qtserialbus.
> >   gnu: Add qtgamepad.
> >   gnu: Add qtscxml.
> >   gnu: Add qtpurchasing.
> >   gnu: Add qtcanvas3d.
> >   gnu: Add qtcharts.
> >   gnu: Add qtdatavis3d.
> 
> These LGTM overall.
> 
> >   gnu: Add qt3d.
> 
> This one doesn't seem to have been sent.

I moved it to the end of my patch set and didn't upload it, I'm still
working on getting assimp unbundled

-- 
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: 833 bytes --]