From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef6uw-00029d-72 for guix-patches@gnu.org; Fri, 26 Jan 2018 11:31:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef6ur-0006p3-9o for guix-patches@gnu.org; Fri, 26 Jan 2018 11:31:54 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:36056) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ef6uq-0006ok-Te for guix-patches@gnu.org; Fri, 26 Jan 2018 11:31:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ef5qI-0001hP-2u for guix-patches@gnu.org; Fri, 26 Jan 2018 10:23:02 -0500 Subject: [bug#30259] [PATCH] gnu: octave: Add audio and Qt GUI support. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ef5pv-0000sN-Rm for guix-patches@gnu.org; Fri, 26 Jan 2018 10:22:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ef5ps-00030E-La for guix-patches@gnu.org; Fri, 26 Jan 2018 10:22:39 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44272) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ef5ps-0002zA-7Q for guix-patches@gnu.org; Fri, 26 Jan 2018 10:22:36 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 0160620FD7 for ; Fri, 26 Jan 2018 16:13:52 +0100 (CET) From: Kei Kebreau Date: Fri, 26 Jan 2018 10:13:11 -0500 Message-Id: <20180126151311.9049-1-kkebreau@posteo.net> 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: 30259@debbugs.gnu.org Cc: Kei Kebreau * gnu/packages/maths.scm (octave)[inputs]: Add qscintilla, qt, suitesparse, libsndfile, portaudio and alsa-lib. [native-inputs]: Add qttools. [arguments]: Add 'patch-qscintilla-library-name' phase. --- gnu/packages/maths.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bce662737..172f1da07 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -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,8 +93,10 @@ #: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 qt) #:use-module (gnu packages readline) #:use-module (gnu packages tbb) #:use-module (gnu packages scheme) @@ -1310,12 +1314,19 @@ can solve two kinds of problems: ("zlib" ,zlib) ("curl" ,curl) ("texinfo" ,texinfo) - ("graphicsmagick" ,graphicsmagick))) + ("graphicsmagick" ,graphicsmagick) + ("qscintilla", qscintilla) + ("qt", qtbase) + ("suitesparse" ,suitesparse) + ("libsndfile" ,libsndfile) + ("portaudio" ,portaudio) + ("alsa-lib" ,alsa-lib))) (native-inputs `(("lzip" ,lzip) ("gfortran" ,gfortran) ("pkg-config" ,pkg-config) ("perl" ,perl) + ("qttools" ,qttools) ;for lrelease ;; The following inputs are not actually used in the build process. ;; However, the ./configure gratuitously tests for their existence and ;; assumes that programs not present at build time are also not, and @@ -1333,6 +1344,16 @@ can solve two kinds of problems: "/bin/sh")) #:phases (modify-phases %standard-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 the + ;; QScintilla input provides the shared library as + ;; libqscintilla2_qt5.so. + (substitute* "configure" + (("qscintilla2-qt5") + "qscintilla2_qt5")) + #t)) (add-after 'configure 'configure-makeinfo (lambda* (#:key inputs #:allow-other-keys) (substitute* "libinterp/corefcn/help.cc" -- 2.16.1