Patches to add: DOtherSide, fluid, font-google-roboto

Patches to add: DOtherSide, fluid, font-google-roboto

[ng0]

Seeing that the cargo build-system still needs some time and I'm a very early user, here's the non-rust patches splitt off from the chain, rebased into master.

Guix lint reported nothing on them.

[PATCH 1/3] gnu: Add dotherside.

[ng0]

* gnu/packages/qt.scm (dotherside): New variable.
---
 gnu/packages/qt.scm | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 15beb8037..41aa10291 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3,7 +3,7 @@
 ;;; 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 © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
 ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1313,3 +1313,37 @@ embed content from the World Wide Web into your Qt application.  At the same
 time Web content can be enhanced with native controls.")
 
     (license license:lgpl2.1+)))
+
+(define-public dotherside
+  (package
+    (name "dotherside")
+    (version "0.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/filcuc/DOtherSide/"
+                           "archive/v" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0pqlrvy4ajjir80ra79ka3n0rjj0ir0f0m91cq86iz3nnw8w148z"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("qttools" ,qttools)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (home-page "https://github.com/frankosterfeld/qtkeychain")
+    (synopsis "C language library for creating bindings for the Qt QML language")
+    (description
+     "DOtherSide is a C language library for creating bindings for the
+QT QML language.  The following features are implementable from
+a binding language:
+@itemize
+@item Creating custom QObject
+@item Creating custom QAbstractListModels
+@item Creating custom properties, signals and slots
+@item Creating from QML QObject defined in the binded language
+@item Creating from Singleton QML QObject defined in the binded language
+@end itemize\n")
+    (license license:lgpl3)))
-- 
2.11.0

[PATCH 2/3] gnu: Add fluid.

[ng0]

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 41aa10291..8cd701293 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -46,6 +46,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages pciutils)
@@ -1347,3 +1348,33 @@ a binding language:
 @item Creating from Singleton QML QObject defined in the binded language
 @end itemize\n")
     (license license:lgpl3)))
+
+(define-public fluid
+  (package
+    (name "fluid")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/lirios/fluid/releases/download/"
+                           "v" version "/" name "-" version ".tar.xz"))
+       (file-name (string-append name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0m6mijlnizgvmh0z2wcrmkfl5cdrylxz3d7bqii8dasmm0q8f68y"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f)) ; 3 tests want a connection to the display.
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtsvg" ,qtsvg)
+       ("qtquickcontrols2" ,qtquickcontrols2)))
+    (home-page "https://github.com/lirios/fluid")
+    (synopsis "Library for QtQuick applications")
+    (description
+     "Fluid is a collection of cross-platform QtQuick components for
+building fluid and dynamic applications.")
+    (license license:mpl2.0)))
-- 
2.11.0

[PATCH 3/3] gnu: Add font-google-roboto.

[ng0]

* gnu/packages/fonts.scm (font-google-roboto): New variable.
---
 gnu/packages/fonts.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f01b83155..d2832218a 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
 ;;; Copyright © 2016 Jookia <166291@gmail.com>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
@@ -703,6 +703,49 @@ languages with a consistent look and aesthetic.  It's goal is to have no Unicode
 symbols unable to be displayed properly.")
     (license license:silofl1.1)))
 
+(define-public font-google-roboto
+  (package
+    (name "font-google-roboto")
+    (version "2.136")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/google/roboto/releases/download/"
+                           "v" version "/roboto-hinted.zip"))
+       (file-name (string-append name "-" version ".zip"))
+       (sha256
+        (base32
+         "0spscx08fad7i8qs7icns96iwcapniq8lwwqqvbf7bamvs8qfln4"))))
+    (native-inputs `(("unzip" ,unzip)))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+
+                   (let ((PATH (string-append (assoc-ref %build-inputs
+                                                         "unzip")
+                                              "/bin"))
+                         (font-dir (string-append %output
+                                                  "/share/fonts/truetype")))
+                     (setenv "PATH" PATH)
+                     (system* "unzip" (assoc-ref %build-inputs "source"))
+
+                     (mkdir-p font-dir)
+                     (chdir "roboto-hinted")
+                     (for-each (lambda (ttf)
+                                 (copy-file ttf
+                                            (string-append font-dir "/" ttf)))
+                               (find-files "." "\\.ttf$"))))))
+    (home-page "https://github.com/google/roboto")
+    (synopsis "The Roboto family of fonts")
+    (description
+     "Roboto is Google’s signature family of fonts, the default font on Android
+and Chrome OS, and the recommended font for the
+visual language \"Material Design\".")
+    (license license:asl2.0)))
+
 (define-public font-un
   (package
     (name "font-un")
-- 
2.11.0

Re: [PATCH 2/3] gnu: Add fluid.

[Danny Milosavljevic]

Hi,

> +     `(#:tests? #f)) ; 3 tests want a connection to the display.

Please set the QT_QPA_PLATFORM environment variable. and let the tests run:

  (setenv "QT_QPA_PLATFORM" "offscreen")

Or does this not work for some reason?

Otherwise OK!

P.S. What do you all think about putting that setenv into the cmake-build-system? I can't think of any Qt project where I don't want to set this for tests. On non-Qt projects it would do nothing even if set.

Re: [PATCH 2/3] gnu: Add fluid.

[David Craven]

Or it could go into a separate build-system. There are quite a few kde
phases that could go in there. Either way, I'm fine with it.

fluid, dotherside, roboto. v2

[ng0]

 [PATCH 2/3] gnu: Add fluid.

The testphase runs in a way that nothing can find the fluid modules.

[PATCH 1/3] gnu: Add dotherside.

[ng0]

* gnu/packages/qt.scm (dotherside): New variable.
---
 gnu/packages/qt.scm | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 15beb8037..41aa10291 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -3,7 +3,7 @@
 ;;; 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 © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
 ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -1313,3 +1313,37 @@ embed content from the World Wide Web into your Qt application.  At the same
 time Web content can be enhanced with native controls.")
 
     (license license:lgpl2.1+)))
+
+(define-public dotherside
+  (package
+    (name "dotherside")
+    (version "0.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/filcuc/DOtherSide/"
+                           "archive/v" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0pqlrvy4ajjir80ra79ka3n0rjj0ir0f0m91cq86iz3nnw8w148z"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("qttools" ,qttools)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (home-page "https://github.com/frankosterfeld/qtkeychain")
+    (synopsis "C language library for creating bindings for the Qt QML language")
+    (description
+     "DOtherSide is a C language library for creating bindings for the
+QT QML language.  The following features are implementable from
+a binding language:
+@itemize
+@item Creating custom QObject
+@item Creating custom QAbstractListModels
+@item Creating custom properties, signals and slots
+@item Creating from QML QObject defined in the binded language
+@item Creating from Singleton QML QObject defined in the binded language
+@end itemize\n")
+    (license license:lgpl3)))
-- 
2.11.0

[PATCH 2/3] gnu: Add fluid.

[ng0]

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 41aa10291..e180f9cf6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -46,6 +46,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages pciutils)
@@ -1347,3 +1348,38 @@ a binding language:
 @item Creating from Singleton QML QObject defined in the binded language
 @end itemize\n")
     (license license:lgpl3)))
+
+(define-public fluid
+  (package
+    (name "fluid")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/lirios/fluid/releases/download/"
+                           "v" version "/" name "-" version ".tar.xz"))
+       (file-name (string-append name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0m6mijlnizgvmh0z2wcrmkfl5cdrylxz3d7bqii8dasmm0q8f68y"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f ; XXX: The tests do not find the fluid module.
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'setenv
+                     (lambda _
+                       (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtsvg" ,qtsvg)
+       ("qtquickcontrols2" ,qtquickcontrols2)))
+    (home-page "https://github.com/lirios/fluid")
+    (synopsis "Library for QtQuick applications")
+    (description
+     "Fluid is a collection of cross-platform QtQuick components for
+building fluid and dynamic applications.")
+    (license license:mpl2.0)))
-- 
2.11.0

[PATCH 3/3] gnu: Add font-google-roboto.

[ng0]

* gnu/packages/fonts.scm (font-google-roboto): New variable.
---
 gnu/packages/fonts.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f01b83155..d2832218a 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016, 2017 ng0 <ng0@libertad.pw>
 ;;; Copyright © 2016 Jookia <166291@gmail.com>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
@@ -703,6 +703,49 @@ languages with a consistent look and aesthetic.  It's goal is to have no Unicode
 symbols unable to be displayed properly.")
     (license license:silofl1.1)))
 
+(define-public font-google-roboto
+  (package
+    (name "font-google-roboto")
+    (version "2.136")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/google/roboto/releases/download/"
+                           "v" version "/roboto-hinted.zip"))
+       (file-name (string-append name "-" version ".zip"))
+       (sha256
+        (base32
+         "0spscx08fad7i8qs7icns96iwcapniq8lwwqqvbf7bamvs8qfln4"))))
+    (native-inputs `(("unzip" ,unzip)))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+
+                   (let ((PATH (string-append (assoc-ref %build-inputs
+                                                         "unzip")
+                                              "/bin"))
+                         (font-dir (string-append %output
+                                                  "/share/fonts/truetype")))
+                     (setenv "PATH" PATH)
+                     (system* "unzip" (assoc-ref %build-inputs "source"))
+
+                     (mkdir-p font-dir)
+                     (chdir "roboto-hinted")
+                     (for-each (lambda (ttf)
+                                 (copy-file ttf
+                                            (string-append font-dir "/" ttf)))
+                               (find-files "." "\\.ttf$"))))))
+    (home-page "https://github.com/google/roboto")
+    (synopsis "The Roboto family of fonts")
+    (description
+     "Roboto is Google’s signature family of fonts, the default font on Android
+and Chrome OS, and the recommended font for the
+visual language \"Material Design\".")
+    (license license:asl2.0)))
+
 (define-public font-un
   (package
     (name "font-un")
-- 
2.11.0

Re: [PATCH 3/3] gnu: Add font-google-roboto.

[Ludovic Courtès]

ng0 <ng0@libertad.pw> skribis:

> * gnu/packages/fonts.scm (font-google-roboto): New variable.

Applied, thanks!

Re: [PATCH 1/3] gnu: Add dotherside.

[Ludovic Courtès]

ng0 <ng0@libertad.pw> skribis:

> * gnu/packages/qt.scm (dotherside): New variable.

Applied, thanks!

Re: [PATCH 2/3] gnu: Add fluid.

[Ludovic Courtès]

Hi!

ng0 <ng0@libertad.pw> skribis:

> * gnu/packages/qt.scm (fluid): New variable.

I think it’s best to put it in kde.scm or some other place; it feels
wrong to import (gnu packages kde-frameworks) in (gnu packages qt).

> +(define-public fluid
> +  (package
> +    (name "fluid")
> +    (version "0.9.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/lirios/fluid/releases/download/"
> +                           "v" version "/" name "-" version ".tar.xz"))
> +       (file-name (string-append name "-" version ".tar.xz"))
> +       (sha256
> +        (base32
> +         "0m6mijlnizgvmh0z2wcrmkfl5cdrylxz3d7bqii8dasmm0q8f68y"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:tests? #f ; XXX: The tests do not find the fluid module.
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'build 'setenv
> +                     (lambda _
> +                       (setenv "QT_QPA_PLATFORM" "offscreen"))))))

Please add as a comment why this is needed, and add this phase before
‘check’ for clarity.  Also add #t as the return value.

I removed the #:tests? #f as Danny suggested, but the tests are failing
in a way that suggests there’s something wrong:

--8<---------------cut here---------------start------------->8---
Test project /tmp/guix-build-fluid-0.9.0.drv-0/build
    Start 1: tst_controls
1/3 Test #1: tst_controls .....................***Failed    0.05 sec
file:///tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml:17:1: module "Fluid.Controls" is not installed 
     import Fluid.Controls 1.0 
     ^
********* Start testing of tst_controls *********
Config: Using QtTest library 5.7.1, Qt 5.7.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 4.9.4)
QWARN  : tst_controls::tst_icon::compile() 
  /tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml produced 1 error(s):
    /tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml:17,1: module "Fluid.Controls" is not installed
  Working directory: /tmp/guix-build-fluid-0.9.0.drv-0/build/tests/auto/controls
  View: QQuickView, import paths:
    '/tmp/guix-build-fluid-0.9.0.drv-0/build/tests/auto/controls'
    'qrc:/qt-project.org/imports'
    '/gnu/store/0v50sh1lgkwkhxxq1v37ayxr15vayn6k-qtdeclarative-5.7.1/qml'
    '/gnu/store/31mn2qgx5gh3zg3pk4w0j2a89jrkqnyv-qtquickcontrols2-5.7.1/qml'
  Plugin paths:
    '.'

FAIL!  : tst_controls::tst_icon::compile() module "Fluid.Controls" is not installed
--8<---------------cut here---------------end--------------->8---

Could you check what’s going on?

Thanks you!

Ludo’.

Re: [PATCH 2/3] gnu: Add fluid.

[Efraim Flashner]

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

On Mon, Jan 09, 2017 at 10:32:52AM +0100, Ludovic Courtès wrote:
> Hi!
> 
> ng0 <ng0@libertad.pw> skribis:
> 
> > * gnu/packages/qt.scm (fluid): New variable.
> 
> I think it’s best to put it in kde.scm or some other place; it feels
> wrong to import (gnu packages kde-frameworks) in (gnu packages qt).
> 
> > +(define-public fluid
> > +  (package
> > +    (name "fluid")
> > +    (version "0.9.0")
> > +    (source
> > +     (origin
> > +       (method url-fetch)
> > +       (uri (string-append "https://github.com/lirios/fluid/releases/download/"
> > +                           "v" version "/" name "-" version ".tar.xz"))
> > +       (file-name (string-append name "-" version ".tar.xz"))
> > +       (sha256
> > +        (base32
> > +         "0m6mijlnizgvmh0z2wcrmkfl5cdrylxz3d7bqii8dasmm0q8f68y"))))
> > +    (build-system cmake-build-system)
> > +    (arguments
> > +     `(#:tests? #f ; XXX: The tests do not find the fluid module.
> > +       #:phases
> > +       (modify-phases %standard-phases
> > +         (add-before 'build 'setenv
> > +                     (lambda _
> > +                       (setenv "QT_QPA_PLATFORM" "offscreen"))))))
> 
> Please add as a comment why this is needed, and add this phase before
> ‘check’ for clarity.  Also add #t as the return value.
> 
> I removed the #:tests? #f as Danny suggested, but the tests are failing
> in a way that suggests there’s something wrong:
> 
> --8<---------------cut here---------------start------------->8---
> Test project /tmp/guix-build-fluid-0.9.0.drv-0/build
>     Start 1: tst_controls
> 1/3 Test #1: tst_controls .....................***Failed    0.05 sec
> file:///tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml:17:1: module "Fluid.Controls" is not installed 
>      import Fluid.Controls 1.0 
>      ^
> ********* Start testing of tst_controls *********
> Config: Using QtTest library 5.7.1, Qt 5.7.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 4.9.4)
> QWARN  : tst_controls::tst_icon::compile() 
>   /tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml produced 1 error(s):
>     /tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml:17,1: module "Fluid.Controls" is not installed
>   Working directory: /tmp/guix-build-fluid-0.9.0.drv-0/build/tests/auto/controls
>   View: QQuickView, import paths:
>     '/tmp/guix-build-fluid-0.9.0.drv-0/build/tests/auto/controls'
>     'qrc:/qt-project.org/imports'
>     '/gnu/store/0v50sh1lgkwkhxxq1v37ayxr15vayn6k-qtdeclarative-5.7.1/qml'
>     '/gnu/store/31mn2qgx5gh3zg3pk4w0j2a89jrkqnyv-qtquickcontrols2-5.7.1/qml'
>   Plugin paths:
>     '.'
> 
> FAIL!  : tst_controls::tst_icon::compile() module "Fluid.Controls" is not installed
> --8<---------------cut here---------------end--------------->8---
> 
> Could you check what’s going on?

I've been working a bit with the tests in the qt modules, and
qtdeclarative, for instance, can't find qtquick, which is part of
qtdeclarative. Debian adds: (for qtdeclarative)

----
QML2_IMPORT_PATH=$(CURDIR)/test_root/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/qml \
HOME=$(CURDIR) LD_LIBRARY_PATH=$(CURDIR)/lib
----

to the test phase so that the tests can find what was just built. I
would suggest trying either running the tests after 'install (which
probably won't make a difference), or setting an environmental variable
or patching the source to change where Some-Important-Qt-Import-Path™ is.


> 
> Thanks you!
> 
> Ludo’.
> 

-- 
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 2/3] gnu: Add fluid.

[ng0]

Ludovic Courtès <ludo@gnu.org> writes:

> Hi!
>
> ng0 <ng0@libertad.pw> skribis:
>
>> * gnu/packages/qt.scm (fluid): New variable.
>
> I think it’s best to put it in kde.scm or some other place; it feels
> wrong to import (gnu packages kde-frameworks) in (gnu packages qt).

Okay, I will move it to kde-frameworks. It's somewhat Qt related
as far (and as little) as I understand Material Design, but it
doesn't matter to me where the package is.

>> +(define-public fluid
>> +  (package
>> +    (name "fluid")
>> +    (version "0.9.0")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append "https://github.com/lirios/fluid/releases/download/"
>> +                           "v" version "/" name "-" version ".tar.xz"))
>> +       (file-name (string-append name "-" version ".tar.xz"))
>> +       (sha256
>> +        (base32
>> +         "0m6mijlnizgvmh0z2wcrmkfl5cdrylxz3d7bqii8dasmm0q8f68y"))))
>> +    (build-system cmake-build-system)
>> +    (arguments
>> +     `(#:tests? #f ; XXX: The tests do not find the fluid module.
>> +       #:phases
>> +       (modify-phases %standard-phases
>> +         (add-before 'build 'setenv
>> +                     (lambda _
>> +                       (setenv "QT_QPA_PLATFORM" "offscreen"))))))
>
> Please add as a comment why this is needed, and add this phase before
> ‘check’ for clarity.  Also add #t as the return value.

Okay.

> I removed the #:tests? #f as Danny suggested, but the tests are failing
> in a way that suggests there’s something wrong:
>
> --8<---------------cut here---------------start------------->8---
> Test project /tmp/guix-build-fluid-0.9.0.drv-0/build
>     Start 1: tst_controls
> 1/3 Test #1: tst_controls .....................***Failed    0.05 sec
> file:///tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml:17:1: module "Fluid.Controls" is not installed 
>      import Fluid.Controls 1.0 
>      ^
> ********* Start testing of tst_controls *********
> Config: Using QtTest library 5.7.1, Qt 5.7.1 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 4.9.4)
> QWARN  : tst_controls::tst_icon::compile() 
>   /tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml produced 1 error(s):
>     /tmp/guix-build-fluid-0.9.0.drv-0/fluid-0.9.0/tests/auto/controls/tst_icon.qml:17,1: module "Fluid.Controls" is not installed
>   Working directory: /tmp/guix-build-fluid-0.9.0.drv-0/build/tests/auto/controls
>   View: QQuickView, import paths:
>     '/tmp/guix-build-fluid-0.9.0.drv-0/build/tests/auto/controls'
>     'qrc:/qt-project.org/imports'
>     '/gnu/store/0v50sh1lgkwkhxxq1v37ayxr15vayn6k-qtdeclarative-5.7.1/qml'
>     '/gnu/store/31mn2qgx5gh3zg3pk4w0j2a89jrkqnyv-qtquickcontrols2-5.7.1/qml'
>   Plugin paths:
>     '.'
>
> FAIL!  : tst_controls::tst_icon::compile() module "Fluid.Controls" is not installed
> --8<---------------cut here---------------end--------------->8---
>
> Could you check what’s going on?

I know, and I have no idea. I'd rather let someone with more Qt
experience work on this, but I will give it a try.

> Thanks you!
>
> Ludo’.
>

Thanks for reviewing
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

fluid, v2

[ng0]

[PATCH] gnu: Add fluid.

This patch, when entering the phase after install will fail with:
ERROR: In procedure string-append: Wrong type (expecting string): #f

[PATCH] gnu: Add fluid.

[ng0]

* gnu/packages/kde-frameworks.scm (fluid): New variable.
---
 gnu/packages/kde-frameworks.scm | 57 +++++++++++++++++++++++++++++++++++++++++
 gnu/packages/qt.scm             |  1 +
 2 files changed, 58 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 94145fb95..224b35666 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
+;;; Copyright © 2017 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2896,3 +2897,59 @@ script engines.")
 
 (define kinit-bootstrap
   ((package-input-rewriting `((,kdbusaddons . ,kdbusaddons-bootstrap))) kinit))
+
+(define-public fluid
+  (package
+    (name "fluid")
+    (version "0.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/lirios/fluid/releases/download/"
+                           "v" version "/" name "-" version ".tar.xz"))
+       (file-name (string-append name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0m6mijlnizgvmh0z2wcrmkfl5cdrylxz3d7bqii8dasmm0q8f68y"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'check 'set-path-for-check
+           ;; The tests do not find the fluid module.
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (qtb (assoc-ref inputs "qtbase"))
+                    (qtd (assoc-ref inputs "qtdeclarative"))
+                    (qts (assoc-ref inputs "qtsvg"))
+                    (qtq (assoc-ref inputs "qtquickcontrol2")))
+               (setenv "PATH" (string-append (getenv "PATH")
+                                             ":" bin ":" qtb ":"
+                                             qtd ":" qtd ":" qts
+                                             ":" qtq))
+               (setenv "QML2_IMPORT_PATH"
+                       (string-append (getcwd)
+                                      "/test_root/usr/lib/"
+                                      "qt5/qml"))
+               (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib"))
+               (setenv "HOME" (getcwd))
+               (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output
+               (setenv "QT_QPA_PLATFORM" "offscreen"))
+             #t))
+         (add-after 'install 'check
+           ;; Swap check and install phases and set paths to installed binaries.
+           (assoc-ref %standard-phases 'check)))))
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtsvg" ,qtsvg)
+       ("qtquickcontrols2" ,qtquickcontrols2)))
+    (home-page "https://github.com/lirios/fluid")
+    (synopsis "Library for QtQuick applications")
+    (description
+     "Fluid is a collection of cross-platform QtQuick components for
+building fluid and dynamic applications.")
+    (license license:mpl2.0)))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index df6fe168a..0846e5f89 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -46,6 +46,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages pciutils)
-- 
2.11.0

Re: [PATCH] gnu: Add fluid.

[ng0]

ng0 <ng0@libertad.pw> writes:

> * gnu/packages/kde-frameworks.scm (fluid): New variable.
> ---
>  gnu/packages/kde-frameworks.scm | 57 +++++++++++++++++++++++++++++++++++++++++
>  gnu/packages/qt.scm             |  1 +
>  2 files changed, 58 insertions(+)
>
> diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
> index 94145fb95..224b35666 100644
> --- a/gnu/packages/kde-frameworks.scm
> +++ b/gnu/packages/kde-frameworks.scm
> @@ -3,6 +3,7 @@
>  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
>  ;;; Copyright © 2016 David Craven <david@craven.ch>
> +;;; Copyright © 2017 ng0 <ng0@libertad.pw>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -2896,3 +2897,59 @@ script engines.")
>  
>  (define kinit-bootstrap
>    ((package-input-rewriting `((,kdbusaddons . ,kdbusaddons-bootstrap))) kinit))
> +
> +(define-public fluid
> +  (package
> +    (name "fluid")
> +    (version "0.9.0")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/lirios/fluid/releases/download/"
> +                           "v" version "/" name "-" version ".tar.xz"))
> +       (file-name (string-append name "-" version ".tar.xz"))
> +       (sha256
> +        (base32
> +         "0m6mijlnizgvmh0z2wcrmkfl5cdrylxz3d7bqii8dasmm0q8f68y"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'check 'set-path-for-check
> +           ;; The tests do not find the fluid module.
> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (bin (string-append out "/bin"))
> +                    (qtb (assoc-ref inputs "qtbase"))
> +                    (qtd (assoc-ref inputs "qtdeclarative"))
> +                    (qts (assoc-ref inputs "qtsvg"))
> +                    (qtq (assoc-ref inputs "qtquickcontrol2")))
> +               (setenv "PATH" (string-append (getenv "PATH")

Should this be a string-join instead?

> +                                             ":" bin ":" qtb ":"
> +                                             qtd ":" qtd ":" qts
> +                                             ":" qtq))
> +               (setenv "QML2_IMPORT_PATH"
> +                       (string-append (getcwd)
> +                                      "/test_root/usr/lib/"
> +                                      "qt5/qml"))
> +               (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/lib"))
> +               (setenv "HOME" (getcwd))
> +               (setenv "CTEST_OUTPUT_ON_FAILURE" "1") ; Enable debug output
> +               (setenv "QT_QPA_PLATFORM" "offscreen"))
> +             #t))
> +         (add-after 'install 'check
> +           ;; Swap check and install phases and set paths to installed binaries.
> +           (assoc-ref %standard-phases 'check)))))
> +    (native-inputs
> +     `(("extra-cmake-modules" ,extra-cmake-modules)))
> +    (inputs
> +     `(("qtbase" ,qtbase)
> +       ("qtdeclarative" ,qtdeclarative)
> +       ("qtsvg" ,qtsvg)
> +       ("qtquickcontrols2" ,qtquickcontrols2)))
> +    (home-page "https://github.com/lirios/fluid")
> +    (synopsis "Library for QtQuick applications")
> +    (description
> +     "Fluid is a collection of cross-platform QtQuick components for
> +building fluid and dynamic applications.")
> +    (license license:mpl2.0)))
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index df6fe168a..0846e5f89 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -46,6 +46,7 @@
>    #:use-module (gnu packages gtk)
>    #:use-module (gnu packages icu4c)
>    #:use-module (gnu packages image)
> +  #:use-module (gnu packages kde-frameworks)
>    #:use-module (gnu packages linux)
>    #:use-module (gnu packages databases)
>    #:use-module (gnu packages pciutils)
> -- 
> 2.11.0
>
>

-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

Re: [PATCH] gnu: Add fluid.

[David Craven]

+(define-public fluid
+  (package
+    (name "fluid")
+    (version "0.8.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/hawaii-desktop/fluid"
+                    "/releases/download/v" version "/"
+                    "fluid-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0f1xirjlli6r0mgky0a58w6ph3raihcwbck4my59mf12365hh57m"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtquickcontrols" ,qtquickcontrols)
+       ("qtquickcontrols2" ,qtquickcontrols2)))
+    (arguments
+     `(#:configure-flags
+       (list (string-append "-DQML_INSTALL_DIR="
+                            (assoc-ref %outputs "out") "/qml"))))
+    (home-page "https://github.com/hawaii-desktop/fluid")
+    (synopsis "Library for QtQuick applications")
+    (description "Modules for fluid and dynamic applications development with
+QtQuick.")
+    (license license:lgpl2.1+)))

This is how I packaged it, I never submitted my hawaii-desktop
packages because of some problems I haven't solved yet. Does this fix
the tests for you?

Re: [PATCH] gnu: Add fluid.

[David Craven]

Never mind, fluid 0.8.0 didn't have any tests yet.

Re: [PATCH] gnu: Add fluid.

[ng0]

David Craven <david@craven.ch> writes:

> Never mind, fluid 0.8.0 didn't have any tests yet.
>

Additionally they are not the same fluid, lirios is the merge of
some other project which did "qml" before and of this hawaii.
-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

Re: [PATCH] gnu: Add fluid.

[David Craven]

> Additionally they are not the same fluid, lirios is the merge of
> some other project which did "qml" before and of this hawaii.

I believe that fluid was forked from hawaii to papyros and that the
main developer of hawaii and fluid is now the main developer of lirios
and lirios-fluid. Sorry if it did not help.