From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add qscintilla. Date: Thu, 15 Sep 2016 10:25:58 -0400 Message-ID: <8760pxgryh.fsf@openmailbox.org> References: <87a8fddnyi.fsf@openmailbox.org> <87r38ndfwb.fsf@openmailbox.org> <20160913170529.GD20731@jasmine> <87k2efd6gy.fsf@openmailbox.org> <20160913193906.GC31892@macbook42.flashner.co.il> <874m5jcz8w.fsf@openmailbox.org> <20160914170819.GA4003@jasmine> <87vaxyic67.fsf@openmailbox.org> <20160914185607.GB22240@jasmine> <87eg4mgqud.fsf@openmailbox.org> <6400A56C-A3FF-487D-B020-ED6C28C6A549@flashner.co.il> <87a8f9gs8f.fsf@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46351) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXcB-0000H1-N6 for guix-devel@gnu.org; Thu, 15 Sep 2016 10:26:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkXc5-0002Vz-LL for guix-devel@gnu.org; Thu, 15 Sep 2016 10:26:10 -0400 Received: from smtp26.openmailbox.org ([62.4.1.60]:51910 helo=smtp11.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXc5-0002Vk-Ad for guix-devel@gnu.org; Thu, 15 Sep 2016 10:26:05 -0400 In-Reply-To: <87a8f9gs8f.fsf@openmailbox.org> (Kei Kebreau's message of "Thu, 15 Sep 2016 10:20:00 -0400") 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: Efraim Flashner Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Kei Kebreau writes: > Efraim Flashner writes: > >> On September 14, 2016 11:37:46 PM GMT+03:00, Kei Kebreau >> wrote: >>>Leo Famulari writes: >>> >>>> On Wed, Sep 14, 2016 at 02:11:44PM -0400, Kei Kebreau wrote: >>>>> Leo Famulari writes: >>>>>=20 >>>>> > On Tue, Sep 13, 2016 at 08:48:43PM +0000, Efraim Flashner wrote: >>>>> >> On September 13, 2016 11:37:35 PM GMT+03:00, Kei Kebreau >>>>> >> wrote: >>>>> >> >In this case, should I leave qtscintilla-qt4 as a public package >>>in >>>>> >> >qt.scm >>>>> >> >instead of maths.scm as Leo suggested? >>>>> >>=20 >>>>> >> That's where I would leave it. You could also leave a note, >>>saying >>>>> >> that it was for octave, and if they switch to qt5 then we can get >>>rid >>>>> >> of it. We still have an old vte package I added for a terminal >>>since >>>>> >> all the bug reports around it haven't been cleared yet, and >>>that's >>>>> >> with the other versions of vte. --=20 >>>>> > >>>>> > Sounds like a plan! >>>>>=20 >>>>> Alright then! I have all three patches here. Tell me if I did >>>anything >>>>> funny. The order of application is "Add qscintilla, Add >>>qscintilla-qt4, >>>>> Enable Octave's Qt 4 GUI." :) >>>> >>>> The patches "Add qscintilla" and "Add qscintilla-qt4" both add both >>>> packages. >>> >>>Fixed it. >> >> If you switch ("qtbase" ,qtbase) to ("qt" ,qtbase) can you remove the >> whole argument block from qscintilla? > > I can! Nice catch. Forgot to use the qt module in the GNU Octave patch... --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-gnu-octave-Enable-Octave-s-Qt-4-GUI.patch Content-Transfer-Encoding: quoted-printable From=20f00730e07e56b3095f921ea1ab3f8b2b1d46a9ab Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 15 Sep 2016 10:23:59 -0400 Subject: [PATCH] gnu: octave: Enable Octave's Qt 4 GUI. * gnu/packages/maths.scm (octave)[inputs]: Add qscintilla-qt4 and qt-4. =2D-- gnu/packages/maths.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 44a24ef..ccb43b1 100644 =2D-- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -77,6 +77,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages tbb) #:use-module (gnu packages shells) @@ -717,6 +718,8 @@ can solve two kinds of problems: ("libxft" ,libxft) ("mesa" ,mesa) ("glu" ,glu) + ("qscintilla" ,qscintilla-qt4) + ("qt" ,qt-4) ("zlib" ,zlib))) (native-inputs `(("gfortran" ,gfortran) =2D-=20 2.10.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX2q93AAoJEOal7jwZRnoNKngP/2metz4Zr1XFt5p3mcL98eXa Q6T/Sj3yR5e9rGtFvv0x6MjgPAXO35ZmV85zlPLar5ObwDLn4QAXnpmjDPO1zrH9 QEdCN0RKX32S6DVxuSv5zk1cQTkHWbSBgvTSvIyApU/Oa2GH2DqibW/GvNcqcCJA /bUzjIeLjDDZIDZ+orMZ9gtBFycHV4tLonDxTLxstNXPepPo/eb5rlBFvH/JjObl LpGnCzNZZS4mtqBr9dlC/IBdirDcpks3k84Ik5msgKkxhTactqmdU4jMqqzqF7Ci EPItjJyzRLmH8z42UyYen/vDOxHBnBELfqXd3Ahel9kXxB6+AUjc41o7HG+H5Jk9 ABn+iSJ6tWj4Y+3k2LuD9mYzvkiIZaxA82x9Rtg6AiCaOKUihvRCenF8YVN1kbfO ZoLzGbz7Qosl9sUnOJGFB7sW4P+8C49miEDDyZJN2J6E8uzVhb6180em1fFB8Pc3 Tfl8n+aY8grxXqcOV+g6lu6zaqSMU/w9jKD/vCmudKduuR/LXfZ97tZJuq78sb3l zCJz+8wjlJxa54VxHG6rIQ1qw17Fgp8mtGd0l+wGC9z8Zods5DpOn87kYUTBjPkv DwYknxMYC0RG/eszxwm44ejuUSaei309d9rW/gKDKzC3MiunpcNWwwPhC4COvztF S5rKRBo4Y94ZmAXT67qp =R/4x -----END PGP SIGNATURE----- --==-=-=--