From: Kei Kebreau <kei@openmailbox.org>
To: Leo Famulari <leo@famulari.name>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: Add qscintilla.
Date: Wed, 14 Sep 2016 14:11:44 -0400 [thread overview]
Message-ID: <87vaxyic67.fsf@openmailbox.org> (raw)
In-Reply-To: <20160914170819.GA4003@jasmine> (Leo Famulari's message of "Wed, 14 Sep 2016 13:08:19 -0400")
[-- Attachment #1.1: Type: text/plain, Size: 876 bytes --]
Leo Famulari <leo@famulari.name> 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
>> <kei@openmailbox.org> wrote:
>> >In this case, should I leave qtscintilla-qt4 as a public package in
>> >qt.scm
>> >instead of maths.scm as Leo suggested?
>>
>> 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. --
>
> 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." :)
[-- Attachment #1.2: 0001-gnu-Add-qscintilla.patch --]
[-- Type: text/plain, Size: 4014 bytes --]
From 9304e67ff085853ebbd5d7f1c976171de498bf5b Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Wed, 14 Sep 2016 13:56:33 -0400
Subject: [PATCH] gnu: Add qscintilla.
* gnu/packages/qt.scm (qscintilla): New variable.
---
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
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;;
;;; 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 requested.")
(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/QScintilla-"
+ 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/intro")
+ (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 code.
+These include support for syntax styling, error indicators, code completion 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")))
--
2.10.0
[-- Attachment #1.3: 0001-gnu-Add-qscintilla-qt4.patch --]
[-- Type: text/plain, Size: 4022 bytes --]
From ced0df00c37a91b4dbcf38665bdedc0d38fbd44f Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Wed, 14 Sep 2016 14:00:35 -0400
Subject: [PATCH] gnu: Add qscintilla-qt4.
* gnu/packages/qt.scm (qscintilla-qt4): New variable.
---
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
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;;
;;; 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 requested.")
(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/QScintilla-"
+ 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/intro")
+ (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 code.
+These include support for syntax styling, error indicators, code completion 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")))
--
2.10.0
[-- Attachment #1.4: 0001-gnu-octave-Enable-Octave-s-Qt-4-GUI.patch --]
[-- Type: text/plain, Size: 1084 bytes --]
From b50e78c9689555a5e755027a6050de07e562fe84 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
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.
---
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
--- 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)
--
2.10.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
next prev parent reply other threads:[~2016-09-14 18:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-12 17:31 [PATCH] gnu: Add qscintilla Kei Kebreau
2016-09-13 14:37 ` Kei Kebreau
2016-09-13 17:05 ` Leo Famulari
2016-09-13 18:01 ` Kei Kebreau
2016-09-13 18:14 ` Leo Famulari
2016-09-13 18:59 ` Kei Kebreau
2016-09-13 19:04 ` Leo Famulari
2016-09-13 19:40 ` Kei Kebreau
2016-09-13 19:39 ` Efraim Flashner
2016-09-13 20:37 ` Kei Kebreau
2016-09-13 20:48 ` Efraim Flashner
2016-09-14 17:08 ` Leo Famulari
2016-09-14 18:11 ` Kei Kebreau [this message]
2016-09-14 18:56 ` Leo Famulari
2016-09-14 20:37 ` Kei Kebreau
2016-09-14 20:42 ` Efraim Flashner
2016-09-15 14:20 ` Kei Kebreau
2016-09-15 14:25 ` Kei Kebreau
2016-09-18 8:36 ` Andreas Enge
2016-09-18 20:10 ` Kei Kebreau
2016-09-18 20:56 ` Leo Famulari
2016-09-18 21:02 ` Efraim Flashner
2016-09-19 13:18 ` Kei Kebreau
2016-09-19 13:25 ` Ricardo Wurmus
2016-09-19 14:47 ` Kei Kebreau
2016-09-19 21:32 ` Leo Famulari
2016-09-19 21:45 ` Kei Kebreau
2016-09-19 23:52 ` Leo Famulari
2016-09-22 19:02 ` Ricardo Wurmus
2016-09-24 3:30 ` Leo Famulari
2016-09-24 5:13 ` Kei Kebreau
2016-09-25 17:05 ` Leo Famulari
2016-09-25 19:25 ` Kei Kebreau
2016-10-03 16:17 ` Ludovic Courtès
2016-09-19 13:30 ` Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vaxyic67.fsf@openmailbox.org \
--to=kei@openmailbox.org \
--cc=guix-devel@gnu.org \
--cc=leo@famulari.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).