From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add qscintilla. Date: Wed, 14 Sep 2016 14:11:44 -0400 Message-ID: <87vaxyic67.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> 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]:36206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkEfI-0003Dr-GP for guix-devel@gnu.org; Wed, 14 Sep 2016 14:12:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bkEfB-0004um-FM for guix-devel@gnu.org; Wed, 14 Sep 2016 14:12:05 -0400 Received: from smtp24.openmailbox.org ([62.4.1.58]:45975 helo=smtp9.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bkEfB-0004uJ-1M for guix-devel@gnu.org; Wed, 14 Sep 2016 14:12:01 -0400 In-Reply-To: <20160914170819.GA4003@jasmine> (Leo Famulari's message of "Wed, 14 Sep 2016 13:08:19 -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: Leo Famulari Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari 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 >> 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! 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." :) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-qscintilla.patch Content-Transfer-Encoding: quoted-printable From=209304e67ff085853ebbd5d7f1c976171de498bf5b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 14 Sep 2016 13:56:33 -0400 Subject: [PATCH] gnu: Add qscintilla. * gnu/packages/qt.scm (qscintilla): New variable. =2D-- gnu/packages/qt.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a482d75..de3e656 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,70 @@ 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")) + (qtbase (assoc-ref inputs "qtbase"))) + (substitute* (find-files "." "Makefile") + (((string-append "INSTALL_ROOT)" qtbase)) + (string-append "INSTALL_ROOT)" out)))) + #t))))) + (native-inputs + `(("python-pyqt" ,python-pyqt) + ("qtbase" ,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)))) + +;; required for Octave until its GUI is updated to Qt 5 +(define-public qscintilla-qt4 + (package + (inherit qscintilla) + (name "qscintilla-qt4") + (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-4) + ("qt" ,qt-4))) ; for qmake + (synopsis "Qt4 port of the Scintilla editing component"))) =2D-=20 2.10.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-qscintilla-qt4.patch Content-Transfer-Encoding: quoted-printable From=20ced0df00c37a91b4dbcf38665bdedc0d38fbd44f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 14 Sep 2016 14:00:35 -0400 Subject: [PATCH] gnu: Add qscintilla-qt4. * gnu/packages/qt.scm (qscintilla-qt4): New variable. =2D-- gnu/packages/qt.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a482d75..de3e656 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,70 @@ 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")) + (qtbase (assoc-ref inputs "qtbase"))) + (substitute* (find-files "." "Makefile") + (((string-append "INSTALL_ROOT)" qtbase)) + (string-append "INSTALL_ROOT)" out)))) + #t))))) + (native-inputs + `(("python-pyqt" ,python-pyqt) + ("qtbase" ,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)))) + +;; required for Octave until its GUI is updated to Qt 5 +(define-public qscintilla-qt4 + (package + (inherit qscintilla) + (name "qscintilla-qt4") + (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-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=20b50e78c9689555a5e755027a6050de07e562fe84 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Wed, 14 Sep 2016 14:01:05 -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 iQIcBAEBCAAGBQJX2ZLhAAoJEOal7jwZRnoNDKQP/ioVDpmlHVK73zVLF1mFbxuz +WfMn1N6madRymIHYo6XLvpznhmimhSs3WwdIh89IyKIBGdqzkdCdYR9u89Gu7Ji v1ntLQNiVo9I0rVt5REUY4tLJHC95Lzl7dJcUoJr/wPjv6fdgD6h0ZY7WDLTvy/S PoHLhi0DNo29FJL1y4MRVvvo5l0YgLUSpEJYMnJbPkxXK9UMYeraehWWyEpmmvy0 Xn/I7K7sxQvVZvJGDMM7PLO8cohU6MLIIMO1SfodHySPtlBWuas0hafF0S/w2RqA w5TDJpPB0P/SAmioBvzVkzDCxxskyOJtxIFFUf3xq2HZlH/acvE2CEaHWdq5CTu8 3b0+V2LvQznTWQaJ6CYrg3aS+yQalXyK9qmPU9QYsl2+Bg6awf2a4abVSG9l564q UyO/H32k6U1GqdruEAEge084miKqjKOB7jFPtaNyI/HCIFEa/CZwnoOC8vGddHeu UebtBTvqOYKdU+L8L+sAI8X1D/2aftdsXMKeo+zncDyZ4qQUNssJyNckDwH8aEbC MACoxgURRvGB2Nh4UBYAoDz5dAupYiDE+KUHduScHKCOHrzuZaXxgHtbvz5iiGIc vbHgBiwupll5pihHmoUr1grgkzFuXWcPehR0ZLUidBrMG4WYkn9AspkOubeEZTYB HnB40/DMrQ5PUH82RkMB =4XXe -----END PGP SIGNATURE----- --==-=-=--