Thomas Danckaert <p...@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:
signature.asc
Description: PGP signature
>From 7eddc0407373c2dd09692bb1f26a537efc7dc508 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.dancka...@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 <l...@gnu.org>
;;; Copyright © 2015, 2016 Efraim Flashner <efr...@flashner.co.il>
;;; Copyright © 2016 ng0 <n...@we.make.ritual.n0.is>
+;;; Copyright © 2016 Thomas Danckaert <p...@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
