From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add qscintilla. Date: Tue, 13 Sep 2016 16:37:35 -0400 Message-ID: <874m5jcz8w.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> 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]:33256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjuTJ-0006WD-GB for guix-devel@gnu.org; Tue, 13 Sep 2016 16:38:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjuTE-0001iV-F0 for guix-devel@gnu.org; Tue, 13 Sep 2016 16:38:24 -0400 Received: from smtp27.openmailbox.org ([62.4.1.61]:50608 helo=smtp12.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjuTE-0001h9-0n for guix-devel@gnu.org; Tue, 13 Sep 2016 16:38:20 -0400 In-Reply-To: <20160913193906.GC31892@macbook42.flashner.co.il> (Efraim Flashner's message of "Tue, 13 Sep 2016 22:39:07 +0300") 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: text/plain Content-Transfer-Encoding: quoted-printable Efraim Flashner writes: > On Tue, Sep 13, 2016 at 02:01:33PM -0400, Kei Kebreau wrote: >> Leo Famulari writes: >>=20 >> > On Tue, Sep 13, 2016 at 10:37:56AM -0400, Kei Kebreau wrote: >> >> 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? >> > >> > Since Qt 4 is no longer supported upstream, we are trying to remove >> > users of the qt-4 package so that we can eventually remove the qt-4 >> > package itself. >> > >> > With that in mind, how about a qscintilla-for-octave package? This >> > package can inherit from a qscintilla that uses qtbase, and I think it >> > should be declared privately [using (define) instead of (define-public= ]. >> > >> >> + (replace 'configure >> >> + (lambda _ >> >> + (chdir "Qt4Qt5") >> >> + (zero? (system* "qmake" "qscintilla.pro")))) >> > >> > I would change directory in a separate 'chdir' phase. >> > >> >> + (substitute* (find-files "." "Makefile") >> >> + (((string-append "INSTALL_ROOT)" qt)) >> >> + (string-append "INSTALL_ROOT)" out))))))))) >> > ^ >> > Inconsistent indentation. Also, this phase should return #t, since the >> > return value of substitute* is unspecified. >> > >> >> + (synopsis "Qt5 port of the Scintilla editing component") >> > >> > Make sure to adjust the Qt name as appropriate :) >>=20 >> Like below? And how could I then access qscintilla-for-octave from >> maths.scm if it isn't defined publicly? >>=20 >> (define-public qscintilla >> (package >> (name "qscintilla") >> (version "2.9.3") >> (source (origin >> (method url-fetch) >> (uri (string-append "mirror://sourceforge/QScintilla2/QSci= ntilla-" >> version "/QScintilla_gpl-" version ".t= ar.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/i= ntro") >> (synopsis "Qt5 port of the Scintilla editing component") >> (description >> "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor = control. >> As well as features found in standard text editing components, QScintilla >> includes features especially useful when editing and debugging source co= de. >> These include support for syntax styling, error indicators, code complet= ion and >> call tips.") >> (license (list license:bsd-2 ; Python/configure.py >> license:expat ; src/ and include/ >> license:gpl3)))) >>=20 >> (define qtscintilla-for-octave > > This should be qtscintilla-qt4, we might have a use for it outside of > octave > In this case, should I leave qtscintilla-qt4 as a public package in qt.scm instead of maths.scm as Leo suggested? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX2GOQAAoJEOal7jwZRnoNkz0QALXHrghPiP1oVmbeZSK7rm+r lHSRvJ1QrBqaZnmlQ5Bi792Ciik4Ebsr+N5mxL2zagX9RbiEZl8RhvxbueXldweu NAcyqcvi8dXvwo1YwAxkzLKbJwNP6Wn6klcgmw7WhcPgb3TKOrsZu5czUzMQCIFt IvBrHftxXjmDcBuqNuckn51T51vcR/EHCgj4twiDpYMuJdTfpy44P4hSmqCJogrE 55J9zZu8ZQ0uADqbv96HD5IoCEMkLeI4d9fjJ8nU9NEWIkq4li2zUAIKpqptM1/t ssyexmZkcT7W5VGKiQDKL6G6t0vdbAUYGtLtvNUPcXsQX9M6CQw3kgNluRqdha6M 9pV/odCa2s71vGLL2sXubDmIRgMJPRHrdhPcFrNpLSDulhgLZ2pP359GwP6MbGm3 RdgxWuAcyeO2rzYSyu+CrHVWOBclkn1rDMPv1slTu3I0PWh2oNDapPwxVeKihYBi ae2TcrsZDCAhgq9fe3FAzcjUtIr3VomFawOJY0SUEADZsKkuYrEh9ChnGBQbTCxl uW4oXKmDL7sb3/CiJRpEzBOxqCv2q2hd4kIEN158cEqRAv2hzdy7gzAs4PaUX/Su 1Mou0SC0MBfuGRT6cHEhkST++pkOmIEnJIO2xliPfwvzfyCDutrw5Zx8WfQQ2JVN U4xL2tIx1Ngg+EfLt1b3 =wQDP -----END PGP SIGNATURE----- --=-=-=--