From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add qscintilla. Date: Mon, 19 Sep 2016 17:45:35 -0400 Message-ID: <87wpi7imww.fsf@openmailbox.org> References: <87k2efd6gy.fsf@openmailbox.org> <20160913193906.GC31892@macbook42.flashner.co.il> <874m5jcz8w.fsf@openmailbox.org> <20160918083656.GA4235@solar> <87wpi9geag.fsf@openmailbox.org> <20160918205634.GA11923@jasmine> <20160918210202.GA853@macbook42.flashner.co.il> <8760psjadm.fsf@openmailbox.org> <874m5cm36o.fsf@elephly.net> <871t0gj68z.fsf@openmailbox.org> <20160919213214.GA10174@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]:35531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm6O3-0004FW-E1 for guix-devel@gnu.org; Mon, 19 Sep 2016 17:46:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bm6Nx-00014d-Tm for guix-devel@gnu.org; Mon, 19 Sep 2016 17:46:02 -0400 Received: from smtp28.openmailbox.org ([62.4.1.62]:50390 helo=smtp13.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bm6Nx-00014C-F2 for guix-devel@gnu.org; Mon, 19 Sep 2016 17:45:57 -0400 In-Reply-To: <20160919213214.GA10174@jasmine> (Leo Famulari's message of "Mon, 19 Sep 2016 17:32:14 -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 Mon, Sep 19, 2016 at 10:47:56AM -0400, Kei Kebreau wrote: >> Using >>=20 >> #:use-module (gnu packages qt) >>=20 >> and >>=20 >> (define qscintilla-qt4 >> (package >> (inherit qscintilla) >> ...)) >>=20 >> gives me an unbound variable error. Any idea what's going wrong here? > > Can you send the patch that gives the error? Sure thing. It's the combination of these two patches. --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-qscintilla.patch Content-Transfer-Encoding: quoted-printable From=20f60fc09f3f200276b2789a5e305efd5df17666d2 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 19 Sep 2016 10:09:33 -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=20ae862b8a51d15f165dc9b40dc46c2e209736f3a8 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Mon, 19 Sep 2016 10:11:20 -0400 Subject: [PATCH] gnu: Add qscintilla-qt4. * gnu/packages/maths.scm (qscintilla-qt4): New variable. =2D-- gnu/packages/maths.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 44a24ef..829fc7a 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) @@ -747,6 +748,16 @@ Work may be performed both at the interactive command-= line as well as via script files.") (license license:gpl3+))) =20 +;; required for Octave until its GUI is updated to Qt 5 +(define 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"))) + (define-public gmsh (package (name "gmsh") =2D-=20 2.10.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX4Fx/AAoJEOal7jwZRnoNfisP/3/llLf70+Ykd5fcRoNbxGUS Rj9YViduzgL8A6Afqn9jH645HoXsLjENAsfHukEZYuXXtOqsxU0LquYSckZ6/UwR /Q1O+gs6UsnNSkppuK1npAlSPdwJrKpdtRzcSHswpdxIM+sQ7isSfvdhCzDcz04n YZ9TrK8qW6VY8LoT/5xkX19hQjnj0A7/D8iUpkr3YmibCQic3NrTvT+KaBT2Z468 krpUt3utYHaf0DBzz6M+WXFw0JtbPAPExHQ02H1np8cRWkX4mGjPtFNohPDQuJdQ yMYMFvbbaYTgsoLcEjMSvEwzAnfTWpWjf8tay5URZRcbfp932mGcxCbUPJ/3IMqH cXpSbP4c23rfbG9HvBcg3uOPGrIR++OpzGY/B5QKRB2fvvr7clRibE+tNvWO3XD8 02l/WKaXya8LMa4nUolZATeUieVXzX/bCWcBBrfiiKNA43jjRd6yzw1dvNUz0KO5 +Wuc/Qg1n25b6bcqj9BeC3iLL/dyy4t/H2RU6CoxsljE4VnU4V7GBH5Ixb1b0K6V fiqnjZ7gR3l/Tk++/E7LZcncQz/xhNONDJ63hiAyY9cc4rEBYDUVWQ+gfk2EAoon 2tvnpJsjc+FdTmS1Gc37iNzBKfS0uupMvtgrUe38fK2wtVzo0bKGmpAePCVce3dn N3i9y0iftSYDBeytc3F7 =l/wN -----END PGP SIGNATURE----- --==-=-=--