From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efXpW-0000sK-29 for guix-patches@gnu.org; Sat, 27 Jan 2018 16:16:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efXpS-0006Mu-OX for guix-patches@gnu.org; Sat, 27 Jan 2018 16:16:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:37640) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1efXpS-0006MB-Dy for guix-patches@gnu.org; Sat, 27 Jan 2018 16:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1efXpS-0000Mh-2x for guix-patches@gnu.org; Sat, 27 Jan 2018 16:16:02 -0500 Subject: [bug#30259] [PATCH] gnu: octave: Add audio and Qt GUI support. Resent-Message-ID: From: Kei Kebreau References: <20180126151311.9049-1-kkebreau@posteo.net> <87wp04fpjs.fsf@abyayala.i-did-not-set--mail-host-address--so-tickle-me> <87po5wfmui.fsf@abyayala.i-did-not-set--mail-host-address--so-tickle-me> <87372scat2.fsf@posteo.net> <877es3zmla.fsf@abyayala.i-did-not-set--mail-host-address--so-tickle-me> Date: Sat, 27 Jan 2018 16:14:52 -0500 In-Reply-To: <877es3zmla.fsf@abyayala.i-did-not-set--mail-host-address--so-tickle-me> (ng0's message of "Sat, 27 Jan 2018 09:18:25 +0000") Message-ID: <87y3kjatrn.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: ng0+guixpatches@n0.is Cc: 30259@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ng0+guixpatches@n0.is writes: > On Fri, 26 Jan 2018, Kei Kebreau wrote: >> ng0+guixpatches@n0.is writes: >> >>> On Fri, 26 Jan 2018, ng0+guixpatches@n0.is wrote: >>>> On Fri, 26 Jan 2018, Kei Kebreau wrote: >>>>> * gnu/packages/maths.scm (octave)[inputs]: Add qscintilla, qt, suites= parse, >>>>> libsndfile, portaudio and alsa-lib. >>>>> [native-inputs]: Add qttools. >>>>> [arguments]: Add 'patch-qscintilla-library-name' phase. >>>> >>>> Woo! Nice :) I've started work on the Qt GUI a while ago but >>>> never finished it. Do you think we should split this into octave >>>> and octave-qt (or octave-gui)? Qt is quiet huge and not everyone >>>> will want this I think. >>>> >>>> Building this now and getting back to you with results. >>>> > [=E2=80=A6] >>> Build, compiled, installed, LGTM and works for me. At least the >>> minimal basics I've tested. >>> >> >> Excellent! Thanks for testing this. >> >>> However I still think we should split it later on. I'm not sure >>> if other systems just provide it in one piece or if they provide >>> octave-cli, octave-qt, etc. >>> In my scenario we don't have substitutes for Qt all the time and >>> someone running a >>> machine which isn't capable of building Qt wants to use octave. >> >> I agree that this package should be split. Should a split be made now >> while we leave the lighter CLI-only Octave package available on master, >> or should it be postponed until later on? >> > > It could be done later on, but if you think it wouldn't be too > much work you could do it now. Done, I think! > Ideally this would leave 'octave' as it is and add > 'octave-whatever' ... octave-qt? Debian calls the package (with > just the Qt Gui) "qtoctave". octave-* should be reserved for > extensions (which we don't have right now), so maybe qtoctave > would fit into our naming scheme? > > > / I think I'm going to switch the subscribed address once more, > now that I have proper filtering I don't need the server-side > filtering. / Can you (and/or any bystanders reading this) test these? --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-octave-Add-audio-and-more-sparse-matrix-support.patch Content-Transfer-Encoding: quoted-printable From=20da42c35c7d779c99a198e73d2872f5cde5401134 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 26 Jan 2018 10:08:52 -0500 Subject: [PATCH 1/2] gnu: octave: Add audio and more sparse matrix support. * gnu/packages/maths.scm (octave)[inputs]: Add suitesparse, libsndfile, por= taudio and alsa-lib. =2D-- gnu/packages/maths.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bce662737..bbfd41b1e 100644 =2D-- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -11,7 +11,7 @@ ;;; Copyright =C2=A9 2015, 2016, 2017 Efraim Flashner ;;; Copyright =C2=A9 2015 Fabian Harfert ;;; Copyright =C2=A9 2016 Roel Janssen =2D;;; Copyright =C2=A9 2016 Kei Kebreau +;;; Copyright =C2=A9 2016, 2018 Kei Kebreau ;;; Copyright =C2=A9 2016, 2017 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2016 Leo Famulari ;;; Copyright =C2=A9 2016, 2017 Thomas Danckaert @@ -52,6 +52,7 @@ #:use-module (guix build-system ocaml) #:use-module (guix build-system r) #:use-module (gnu packages algebra) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -74,6 +75,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages java) #:use-module (gnu packages less) + #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages logging) #:use-module (gnu packages lua) @@ -91,6 +93,7 @@ #:use-module (gnu packages popt) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages readline) @@ -1310,7 +1313,11 @@ can solve two kinds of problems: ("zlib" ,zlib) ("curl" ,curl) ("texinfo" ,texinfo) =2D ("graphicsmagick" ,graphicsmagick))) + ("graphicsmagick" ,graphicsmagick) + ("suitesparse" ,suitesparse) + ("libsndfile" ,libsndfile) + ("portaudio" ,portaudio) + ("alsa-lib" ,alsa-lib))) (native-inputs `(("lzip" ,lzip) ("gfortran" ,gfortran) =2D-=20 2.16.1 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0002-gnu-Add-qtoctave.patch Content-Transfer-Encoding: quoted-printable From=20a4cb4580413f81f83a57cd046e5a0d228e9b9aff Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 27 Jan 2018 16:06:13 -0500 Subject: [PATCH 2/2] gnu: Add qtoctave. * gnu/packages/maths.scm (qtoctave): New variable. =2D-- gnu/packages/maths.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bbfd41b1e..b7ae069ad 100644 =2D-- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -96,6 +96,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-web) + #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages tbb) #:use-module (gnu packages scheme) @@ -1357,6 +1358,31 @@ Work may be performed both at the interactive comman= d-line as well as via script files.") (license license:gpl3+))) =20 +(define-public qtoctave + (package (inherit octave) + (name "qtoctave") + (inputs + `(("qscintilla" ,qscintilla) + ("qt" ,qtbase) + ,@(package-inputs octave))) + (native-inputs + `(("qttools" , qttools) ;for lrelease + ,@(package-native-inputs octave))) + (arguments + (substitute-keyword-arguments (package-arguments octave) + ((#:phases phases) + `(modify-phases ,phases + (add-before 'configure 'patch-qscintilla-library-name + (lambda* (#:key inputs #:allow-other-keys) + ;; The QScintilla library that the Octave configure script = tries + ;; to link with should be named libqscintilla-qt5.so, but t= he + ;; QScintilla input provides the shared library as + ;; libqscintilla2_qt5.so. + (substitute* "configure" + (("qscintilla2-qt5") + "qscintilla2_qt5")) + #t)))))))) + (define-public opencascade-oce (package (name "opencascade-oce") =2D-=20 2.16.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlps68wACgkQ5qXuPBlG eg3rhw//chTweQFFS+0B28gQa3FgqgaIjJXAks6ZqQ7J7pWIHPhqUw6FLmmIcUwq Z1ykc5ETQkMEkOSq5z58vg3rnGjxJNOiLsTATcOXiX5iEr9wERt8a0dFViqMygiP o3/yKkUzMf+qkPd8M9H0Rmhr+wnznVA4dQgKJ1rxMdxu3JrS7daUyA8pxnqf2k6k WB7WhlKR4I40fBafwjlcE+zWTfMuPmColMHwB+JUp5+3eAs/RaSRDhaap5bHV4if CuajhX4y94dTS/bPOV3RvQCSwEUZSxv9e6C/NnyysZN9YioTmAZNjWoWeC87Q8sJ cPaAUNWTPO3wlNwK5zSzrNicFEmlexJV/X2fbWazHj5kcLF9pPfvAf19pIdSsnJl SR0NOIGquitqNZHlq0Q5To14HT1BZiUFkadwXrYwAUh2LTpVyPT7Vx6AKdKHIl58 3NZCUZdraAq1/i2ygFqt4zYQ2QmRG6Wy8PNBGtLqlZcSApo0QmYn0GziTnmt/MqC e0PDKPuUAOOqDhTX5FIf9Tz1zeFCQ37BP2ElQ3FdzoerGLBeAVcfKRefaWEJ0ZqF MgaKEpJuabDO602iII+trZ0XJIo0en6CILo31QCMG8xB/EySr+2pN4fTGvUf69/I GWQMs4h16Zd1WqGbaLsKYIyX0u7VLrz7JAUKSsnkoJiauDD7kAY= =YHtQ -----END PGP SIGNATURE----- --==-=-=--