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:20:00 -0400 Message-ID: <87a8f9gs8f.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> 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]:44828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXWt-0004nC-Mf for guix-devel@gnu.org; Thu, 15 Sep 2016 10:20:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkXWm-0000yi-S2 for guix-devel@gnu.org; Thu, 15 Sep 2016 10:20:42 -0400 Received: from smtp17.openmailbox.org ([62.4.1.51]:44140 helo=smtp2.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkXWc-0000wm-Kn for guix-devel@gnu.org; Thu, 15 Sep 2016 10:20:36 -0400 In-Reply-To: <6400A56C-A3FF-487D-B020-ED6C28C6A549@flashner.co.il> (Efraim Flashner's message of "Wed, 14 Sep 2016 20:42:42 +0000") 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 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. --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-qscintilla.patch Content-Transfer-Encoding: quoted-printable From=207a263e397cc06a87c15d80ec7a41442d25247f19 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 15 Sep 2016 10:15:55 -0400 Subject: [PATCH] gnu: Add qscintilla. * gnu/packages/qt.scm (qscintilla): New variable. =2D-- gnu/packages/qt.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a482d75..b6a649f 100644 =2D-- 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 Kei Kebreau ;;; ;;; This file is part of GNU Guix. ;;; @@ -1112,3 +1113,45 @@ 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 qscintilla + (package + (name "qscintilla") + (version "2.9.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/QScintilla2/QScint= illa-" + version "/QScintilla_gpl-" version ".tar= .gz")) + (sha256 + (base32 + "0znvdncpj64zcpbkyvj11dm8bdc3nfn5girggj33ammhfcyvkalq")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'change-directory + (lambda _ (chdir "Qt4Qt5") #t)) + (replace 'configure + (lambda _ (zero? (system* "qmake" "qscintilla.pro")))) + (add-before 'install 'fix-Makefiles + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (qt (assoc-ref inputs "qt"))) + (substitute* (find-files "." "Makefile") + (((string-append "INSTALL_ROOT)" qt)) + (string-append "INSTALL_ROOT)" out)))) + #t))))) + (native-inputs + `(("python-pyqt" ,python-pyqt) + ("qt" ,qtbase))) ; for qmake + (home-page "https://www.riverbankcomputing.com/software/qscintilla/int= ro") + (synopsis "Qt5 port of the Scintilla editing component") + (description + "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor co= ntrol. +As well as features found in standard text editing components, QScintilla +includes features especially useful when editing and debugging source code. +These include support for syntax styling, error indicators, code completio= n and +call tips.") + (license (list license:bsd-2 ; Python/configure.py + license:expat ; src/ and include/ + license:gpl3)))) =2D-=20 2.10.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-gnu-Add-qscintilla-qt4.patch Content-Transfer-Encoding: quoted-printable From=20c79f95135b3fb569d5677e349fcd9f7d69ee157f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 15 Sep 2016 10:16:27 -0400 Subject: [PATCH] gnu: Add qscintilla-qt4. * gnu/packages/qt.scm (qscintilla-qt4): New variable. =2D-- gnu/packages/qt.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index b6a649f..7cdc812 100644 =2D-- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1155,3 +1155,13 @@ call tips.") (license (list license:bsd-2 ; Python/configure.py license:expat ; src/ and include/ license:gpl3)))) + +;; required for Octave until its GUI is updated to Qt 5 +(define-public qscintilla-qt4 + (package + (inherit qscintilla) + (name "qscintilla-qt4") + (native-inputs + `(("python-pyqt" ,python-pyqt-4) + ("qt" ,qt-4))) ; for qmake + (synopsis "Qt4 port of the Scintilla editing component"))) =2D-=20 2.10.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=0001-gnu-octave-Enable-Octave-s-Qt-4-GUI.patch Content-Transfer-Encoding: quoted-printable From=20065120c938bb4ff3ca03856fbd943891eb0f12b2 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 15 Sep 2016 10:18:11 -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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 44a24ef..645b57d 100644 =2D-- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -717,6 +717,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 iQIcBAEBCAAGBQJX2q4QAAoJEOal7jwZRnoNzR4QAJaMkR2adlxPTOzgaLfc6E7K r4ljTLcdTA+iwEls2kLVclSKdANvkOWEfStDuLFNRDWG7l4wR322O2080TH7LTja fcyw5SHOcVM4TcvoWdjb7PRs0m1LUqAwOABAyVb2NbH7oJ+81RDJPfWChsO68o0U UITpBAawfuLjqfsf+YDYJiViB3Q/i/v4ufzleUFxsYzptBzR7rG0i+HfZa1IEDi6 gMTt+49WCJ+Gp30/7C/peVGg+/jD04rV2o2yrSCAyVOHztLlBTi5wcprW7HD2Fq5 VgZ5ioaEJG6X7k6pDPWkWC51jb9F+P4R7iTs5sjHxcWVm/D4HwOj5eIol75UjNRb nnpcWbS+eBdIpc0YC5/YNLg4T+yTSwSeJ5EPTYY15dnhB6/hdvEyqisKIxdS4yAi gZhvYNK/t5cisiqa5LYgiG1q+tv8jZs1PQEAnR3vBSA1jrJSaLcS37XxfPaS/BN2 ElBhRkLIQzs5yABHPdlArOtOSZNDUBNE1lWDqFS5R9R8+/oMa9Pi/IhYu3JBd52o 14Nb3tugaKnPJdit9RdCRknZhG3MHyqfQrRqpp6TbfCh+KrrZBUQ8GvN0z4jYl0W zFLj4RUgpRnzOY6RGYMpzuouis2rnA10rNngTA2cPYJXLxI3fjyrSijxH006FOq7 C9nPcz5WDMcfMBURI0ug =bK0/ -----END PGP SIGNATURE----- --==-=-=--