From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add qscintilla. Date: Tue, 13 Sep 2016 10:37:56 -0400 Message-ID: <87r38ndfwb.fsf@openmailbox.org> References: <87a8fddnyi.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]:45054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjoqg-0002Qx-Nl for guix-devel@gnu.org; Tue, 13 Sep 2016 10:38:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjoqc-0005nT-12 for guix-devel@gnu.org; Tue, 13 Sep 2016 10:38:10 -0400 Received: from smtp5.openmailbox.org ([62.4.1.39]:56998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjoqb-0005mf-Mm for guix-devel@gnu.org; Tue, 13 Sep 2016 10:38:05 -0400 In-Reply-To: <87a8fddnyi.fsf@openmailbox.org> (Kei Kebreau's message of "Mon, 12 Sep 2016 13:31:33 -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: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Kei Kebreau writes: > A component necessary for GNU Octave's GUI. > How does it look? Not sure how packaging Qt packages goes, but I've discovered that GNU Octave's GUI only builds with Qt4 support. I've changed the patch to adjust this. Should I leave the old patch as is and add a qt4 package that inherits from it? --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-qscintilla.patch Content-Transfer-Encoding: quoted-printable From=2051da032547ed3e1c2b7825b35b1f39a5e922b44b Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 13 Sep 2016 10:34:59 -0400 Subject: [PATCH] gnu: Add qscintilla. * gnu/packages/qt.scm (qscintilla): New variable. =2D-- gnu/packages/qt.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index a482d75..159832a 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,44 @@ 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 + (replace 'configure + (lambda _ + (chdir "Qt4Qt5") + (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))))))))) + (native-inputs + `(("python-pyqt" ,python-pyqt) + ("qt" ,qt-4))) ; 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: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX2A9FAAoJEOal7jwZRnoNclYQALAbrRrDt3j2/9I5XHKCyBsh ZeV7w/H2BGoL8GxscsmjUe1YfPjPHmlVp+/sY3yiH12/dA3qSl8qyo2Vg/cA+Yp6 p+mOtjx7ESTM9K8DL8/5evvUcEQ3pDANp8cNqy702ZObAr78JhGOmQ7qwjx931dV ZGIV8Ai4sGinZjBuRslgw0fBHK20x1/EfK83LDzWZ/8nnGUcHrLIoOCM89HyoSuh vAfjvFDwk/PLH3TmzehO3Zf8SoI4tqOl1NwJopZAfukoXHR6hLMKKsDTOa+KQmBn diEcxpdJIO0uxQ66gc3n3mgnx9qAhlbn8mLu0rd5zPibHzPipRnWG5PKz/ofhbHz V+Mu+fVd7BbfqxfUeUESoazdP1nKd6GIHpyrRvQ/IPxuM211RCzZqgiIjdjDLp1J LMeHZIrmkqPXx8JhKjTPxUvHxuBXkXrBXalvTVEFQPcV+TZbJRGwucMZUSQCahEu edcSvKsB7teX2DF+5X59KyVutNP12IhZYlW5R9YBY6p0RLnsOEu15z7ldclkVk7G O3lBmyN4F2o5ze3VX0PBgwOAgSen4KuX+eE1j+V/9VKRquUzlpoLU3RD0LG9Qvbm BzgVVciHqbLsZyltuW1lbdEjUs5qQoHtUm/Cpy8uvJMfDZSS9yFtbAB8A+w2x/F4 YIbuRP46AMzDdlSwlmoR =Q4jE -----END PGP SIGNATURE----- --==-=-=--