diff mbox

gnu: Add qscintilla.

Message ID 8760pxgryh.fsf@openmailbox.org
State New
Headers show

Commit Message

Kei Yamashita Sept. 15, 2016, 2:25 p.m. UTC 
Kei Kebreau <kei@openmailbox.org> writes:

> Efraim Flashner <efraim@flashner.co.il> writes:
>
>> On September 14, 2016 11:37:46 PM GMT+03:00, Kei Kebreau
>> <kei@openmailbox.org> wrote:
>>>Leo Famulari <leo@famulari.name> writes:
>>>
>>>> On Wed, Sep 14, 2016 at 02:11:44PM -0400, Kei Kebreau wrote:
>>>>> Leo Famulari <leo@famulari.name> writes:
>>>>> 
>>>>> > 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
>>>>> >> <kei@openmailbox.org> wrote:
>>>>> >> >In this case, should I leave qtscintilla-qt4 as a public package
>>>in
>>>>> >> >qt.scm
>>>>> >> >instead of maths.scm as Leo suggested?
>>>>> >> 
>>>>> >> 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.  -- 
>>>>> >
>>>>> > Sounds like a plan!
>>>>> 
>>>>> 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...
From f00730e07e56b3095f921ea1ab3f8b2b1d46a9ab Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
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.
---
 gnu/packages/maths.scm | 3 +++
 1 file changed, 3 insertions(+)
diff mbox

Patch

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 44a24ef..ccb43b1 100644
--- 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)