From mboxrd@z Thu Jan 1 00:00:00 1970 From: Efraim Flashner Subject: Re: [PATCH] gnu: Add qscintilla. Date: Tue, 13 Sep 2016 22:39:07 +0300 Message-ID: <20160913193906.GC31892@macbook42.flashner.co.il> References: <87a8fddnyi.fsf@openmailbox.org> <87r38ndfwb.fsf@openmailbox.org> <20160913170529.GD20731@jasmine> <87k2efd6gy.fsf@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="c3bfwLpm8qysLVxt" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47253) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjtYA-0000ZI-Td for guix-devel@gnu.org; Tue, 13 Sep 2016 15:39:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bjtY5-0003fw-CV for guix-devel@gnu.org; Tue, 13 Sep 2016 15:39:21 -0400 Received: from flashner.co.il ([178.62.234.194]:58993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bjtY5-0003dN-2T for guix-devel@gnu.org; Tue, 13 Sep 2016 15:39:17 -0400 Content-Disposition: inline In-Reply-To: <87k2efd6gy.fsf@openmailbox.org> 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: Kei Kebreau Cc: guix-devel@gnu.org --c3bfwLpm8qysLVxt Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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/QScin= tilla-" > version "/QScintilla_gpl-" version ".ta= r.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/in= tro") > (synopsis "Qt5 port of the Scintilla editing component") > (description > "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor c= ontrol. > As well as features found in standard text editing components, QScintilla > includes features especially useful when editing and debugging source cod= e. > These include support for syntax styling, error indicators, code completi= on 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 > (package > (inherit qtscintilla) > (name "qtscintilla-for-octave") > (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) python-pyqt is built against qt-5 > ("qt" ,qt-4))) ; for qmake > (synopsis "Qt4 port of the Scintilla editing component"))) --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --c3bfwLpm8qysLVxt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCgAGBQJX2FXTAAoJEPTB05F+rO6TQ8QP/3S+n6hmuEMIoeeGVRbjypJV hzAnfOXO150PlwOIjiEVb379wfCUYJOucjZ3cED0gJt0z2kzgweXG12NewO7ltFV 9vW9oSVYtahNSWUoHtQhYKmwJ+Iiw7zMdpCx5eTB90CkZMCMeaOaTzIPjDmdZi0p dAJV1AXt7sGRU3fIkEsr7B3WmtIL7YijtDRuVrmhjxB7e9cKqsYRYn4xAWFoSGbY b9Pi9LTbyrQ/jYvU3THtQbHPnKU7WeqbfEYebqS0M7hTWWKpKHkSgHGB1sYctpgq 1C8nyD5gdJXeOcsxMti4j2kbWoncl3/VtP1wvBkPdl0HpIDxE/yn6oYIib2r04nL pnPXi5Acd6el4kjXir076LgVlrnZ0jsS8S54C0+I4b9z5EY9M9Kr+7Vcbu7hvcUi Iv3JdxHEL8UGnEuBiPfVMMLutCPnuOovEyXtWWRRl7qBFGx1hTq+kwolPS6RPply YF1m+nu0FjX80tTrVVQAm6Wec4J2MAe40sJfTMGIry2akc7IHrfEwBAvrVPz7ILR IwB1ErgUzxWWnlrpzdiYRLnW9Wd+KpkZykZ7o/ugTFb8z3+QwC8tD3Dl8+t2of2K /6eSC7k1qcz8iFJdWZk7ZIai2QiVi/QSYk87zjk0ZsZ/EDbXTn5wT1/tvx9Ubgcp wnsqL6C7aj7Sym4GWRJ9 =b1LJ -----END PGP SIGNATURE----- --c3bfwLpm8qysLVxt--