From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH] gnu: Add qwt. Date: Thu, 27 Oct 2016 13:50:10 +0100 Message-ID: <871sz20xdp.fsf@duckhunt.i-did-not-set--mail-host-address--so-tickle-me> References: <20161025.135509.1245742033144837507.post@thomasdanckaert.be> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzk8Q-0006s9-8k for guix-devel@gnu.org; Thu, 27 Oct 2016 08:50:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzk8L-0002dN-Ab for guix-devel@gnu.org; Thu, 27 Oct 2016 08:50:18 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:41022) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzk8L-0002dF-5W for guix-devel@gnu.org; Thu, 27 Oct 2016 08:50:13 -0400 In-Reply-To: <20161025.135509.1245742033144837507.post@thomasdanckaert.be> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Thomas Danckaert , guix-devel@gnu.org --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Thomas Danckaert writes: > This patch adds Qwt. > > For the license, I picked LGPL2.1, but in fact Qwt has its own =E2=80=9CQ= wt=20 > License=E2=80=9D, which is the same as the LGPL2.1, but relaxes (or tries= to=20 > relax) some of its conditions (see=20 > http://qwt.sourceforge.net/qwtlicense.html). Can we stick with LGPL=20 > 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=20 > to link against the qwt library in the build directory, which is not=20 > accepted by the guix ld-wrapper (at least that's my understanding of=20 > it). Suggestions on how to fix this are welcome (though at the=20 > 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=20 > 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: --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJYEfgCAAoJEKKgbfKjOlT6xqEH/jPZY1BIHuG3GNd/Ub/AB7n3 IM7nyEaPZ8+ikBaXhLgvdPSB0llFS8pMrnegKZp7U4bPsl8T9mR7pgV6qcOHEIoa BmR8tU5CU362vPwwMDNNOxrUM0Iypr23p5Qi/oqBp5TObAcInnSoAqpfevET+igc JdiGf+eNbsvgYXAPUOUNvhSysrZh4yZ+JIOB/fWIzVLu68YYl6azqGWUntty2xTA 9A3tE/MPGqQ1W5CNHA6irJ77Ny2Todv3y4ppKNVXfHiKrTaCiUj6Ku1GtEwTgmjz 3ZA2K7bFNnEJThmZG7f8mNjNvsz0JwFJpTZMqyK0ou6of5GcLDKAhEiZV3gAE10= =O6mb -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-qwt.patch Content-Transfer-Encoding: quoted-printable >From 7eddc0407373c2dd09692bb1f26a537efc7dc508 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert 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 =C2=A9 2015 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2015, 2016 Efraim Flashner ;;; Copyright =C2=A9 2016 ng0 +;;; Copyright =C2=A9 2016 Thomas Danckaert ;;; ;;; 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 reques= ted.") (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 softw= are +GUI components") + (description + "The Qwt library contains widgets and components which are primarily us= eful +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 (e= ither). + license:lgpl2.1 license:gpl3)))) --=20 2.10.1 --=-=-=--