[PATCH] gnu: Add qwt.

[PATCH] gnu: Add qwt.

[Thomas Danckaert]

[-- Attachment #1: Type: Text/Plain, Size: 790 bytes --]

This patch adds Qwt.

For the license, I picked LGPL2.1, but in fact Qwt has its own “Qwt 
License”, which is the same as the LGPL2.1, but relaxes (or tries to 
relax) some of its conditions (see 
http://qwt.sourceforge.net/qwtlicense.html).  Can we stick with LGPL 
for our purposes?

I had to disable building of the qtcreator plugin, because this tries 
to link against the qwt library in the build directory, which is not 
accepted by the guix ld-wrapper (at least that's my understanding of 
it).  Suggestions on how to fix this are welcome (though at the 
moment, qtcreator is not packaged for guix anyway?).

Also, I put this in qt.scm, but perhaps it should go in a separate 
file (e.g. qt_contrib.scm?), because it's a third-party library?

cheers,

Thomas

[-- Attachment #2: 0001-gnu-Add-qwt.patch --]
[-- Type: Text/X-Patch, Size: 2466 bytes --]

From d9b856d8719877333fb015191f287da948e6d6c6 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Fri, 14 Oct 2016 13:27:23 +0200
Subject: [PATCH] gnu: Add qwt.

* gnu/packages/qt.scm (qwt, qwt-qt-4): New variables.
---
 gnu/packages/qt.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a1e5fde..483e338 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
 ;;; 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 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1112,3 +1113,43 @@ contain over 620 classes.")
       "QtKeychain is a Qt library to store passwords and other secret data
 securely.  It will not store any data unencrypted unless explicitly requested.")
     (license license:bsd-3)))
+
+(define-public qwt
+  (package
+    (name "qwt")
+    (version "6.1.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri
+         (string-append "mirror://sourceforge/qwt/qwt/"
+                        version "/qwt-" version ".tar.bz2"))
+        (sha256
+         (base32 "0cwp63s03dw351xavb3pzbjlqvx7kj88wv7v4a2b18m9f97d7v7k"))))
+  (build-system gnu-build-system)
+  (inputs
+   `(("qt" ,qt)))
+  (arguments
+   `(#:phases
+     (modify-phases %standard-phases
+       (replace 'configure
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let ((out (assoc-ref outputs "out")))
+             (substitute* '("qwtconfig.pri")
+               (("/usr/local/qwt-\\$\\$QWT\\_VERSION") out)
+               (("QWT_CONFIG     += QwtDesigner") ""))
+             (system* "qmake")))))))
+  (home-page "http://qwt.sourceforge.net")
+  (synopsis "Qt widgets for plots, scales, dials and other technical software
+GUI components")
+  (description
+   "The Qwt library contains widgets and components which are primarily useful
+for technical and scientific purposes.  It includes a 2-D plotting widget,
+different kinds of sliders, and much more.")
+  (license license:lgpl2.1)))
+
+(define-public qwt-qt-4
+  (package (inherit qwt)
+           (name "qwt-qt-4")
+           (inputs
+            `(("qt" ,qt-4)))))
-- 
2.7.4

Re: [PATCH] gnu: Add qwt.

[Marius Bakke]

[-- Attachment #1.1: Type: text/plain, Size: 1710 bytes --]

Thomas Danckaert <post@thomasdanckaert.be> writes:

> This patch adds Qwt.
>
> For the license, I picked LGPL2.1, but in fact Qwt has its own “Qwt 
> License”, which is the same as the LGPL2.1, but relaxes (or tries to 
> relax) some of its conditions (see 
> http://qwt.sourceforge.net/qwtlicense.html).  Can we stick with LGPL 
> for our purposes?

Hi Thomas, thanks for the patch!

I am not a lawyer etc, but think we should stick to the original
license with a "non-copyleft http://qwt.sourceforge.net/qwtlicense.html"
style license field since it contains some important exceptions.

Some files in "textengines/mathml/" are under dual LGPL2.1/GPL3 (either)
license, so they should be mentioned too.

> I had to disable building of the qtcreator plugin, because this tries 
> to link against the qwt library in the build directory, which is not 
> accepted by the guix ld-wrapper (at least that's my understanding of 
> it).  Suggestions on how to fix this are welcome (though at the 
> moment, qtcreator is not packaged for guix anyway?).

I was able to build this, after switching to the modular qt packages and
adding "qttools" to (inputs). See attached patch.

>
> Also, I put this in qt.scm, but perhaps it should go in a separate 
> file (e.g. qt_contrib.scm?), because it's a third-party library?

qt.scm is fine IMO.

I modified the patch to include the changes mentioned above, as well as
install the 130+ manual pages (only ~600KiB compressed). I also removed
the qt4 variant since QT4 is no longer supported upstream, so we should
not be encouraging its usage.

I haven't pushed this yet, but if there are no protests it will go in
tomorrow or so:


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

[-- Attachment #2: 0001-gnu-Add-qwt.patch --]
[-- Type: text/x-patch, Size: 3029 bytes --]

From 7eddc0407373c2dd09692bb1f26a537efc7dc508 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Fri, 14 Oct 2016 13:27:23 +0200
Subject: [PATCH] gnu: Add qwt.

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

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a1e5fde..0cc87b0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
 ;;; 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 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1112,3 +1113,52 @@ contain over 620 classes.")
       "QtKeychain is a Qt library to store passwords and other secret data
 securely.  It will not store any data unencrypted unless explicitly requested.")
     (license license:bsd-3)))
+
+(define-public qwt
+  (package
+    (name "qwt")
+    (version "6.1.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri
+         (string-append "mirror://sourceforge/qwt/qwt/"
+                        version "/qwt-" version ".tar.bz2"))
+        (sha256
+         (base32 "0cwp63s03dw351xavb3pzbjlqvx7kj88wv7v4a2b18m9f97d7v7k"))))
+  (build-system gnu-build-system)
+  (inputs
+   `(("qtbase" ,qtbase)
+     ("qtsvg" ,qtsvg)
+     ("qttools" ,qttools)))
+  (arguments
+   `(#:phases
+     (modify-phases %standard-phases
+       (replace 'configure
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let ((out (assoc-ref outputs "out")))
+             (substitute* '("qwtconfig.pri")
+               (("/usr/local/qwt-\\$\\$QWT\\_VERSION") out))
+             (zero? (system* "qmake")))))
+       (add-after 'install 'install-documentation
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let* ((out (assoc-ref outputs "out"))
+                  (man (string-append out "/share/man")))
+             ;; Remove some incomplete manual pages.
+             (for-each delete-file (find-files "doc/man/man3" "^_tmp.*"))
+             (mkdir-p man)
+             (copy-recursively "doc/man" man)
+             #t))))))
+  (home-page "http://qwt.sourceforge.net")
+  (synopsis "Qt widgets for plots, scales, dials and other technical software
+GUI components")
+  (description
+   "The Qwt library contains widgets and components which are primarily useful
+for technical and scientific purposes.  It includes a 2-D plotting widget,
+different kinds of sliders, and much more.")
+  (license
+   (list
+    ;; The Qwt license is LGPL2.1 with some exceptions.
+    license:non-copyleft "http://qwt.sourceforge.net/qwtlicense.html"
+    ;; textengines/mathml/qwt_mml_document.{cpp,h} is dual LGPL2.1/GPL3 (either).
+    license:lgpl2.1 license:gpl3))))
-- 
2.10.1

Re: [PATCH] gnu: Add qwt.

[Marius Bakke]

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


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

I pushed this as fc381a3.

`guix lint` reports that qttools "should probably be a native-input",
but it is referenced, so that is wrong.

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