Leo Famulari <l...@famulari.name> writes: > On Mon, Sep 19, 2016 at 10:47:56AM -0400, Kei Kebreau wrote: >> Using >> >> #:use-module (gnu packages qt) >> >> and >> >> (define qscintilla-qt4 >> (package >> (inherit qscintilla) >> ...)) >> >> 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.
From f60fc09f3f200276b2789a5e305efd5df17666d2 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <k...@openmailbox.org>
Date: Mon, 19 Sep 2016 10:09:33 -0400
Subject: [PATCH] gnu: Add qscintilla.
* gnu/packages/qt.scm (qscintilla): New variable.
---
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
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2015 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2015, 2016 Efraim Flashner <efr...@flashner.co.il>
;;; Copyright © 2016 ng0 <n...@we.make.ritual.n0.is>
+;;; Copyright © 2016 Kei Kebreau <k...@openmailbox.org>
;;;
;;; 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
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"))
+ (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/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))))
--
2.10.0
From ae862b8a51d15f165dc9b40dc46c2e209736f3a8 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <k...@openmailbox.org>
Date: Mon, 19 Sep 2016 10:11:20 -0400
Subject: [PATCH] gnu: Add qscintilla-qt4.
* gnu/packages/maths.scm (qscintilla-qt4): New variable.
---
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
--- 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+)))
+;; 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")
--
2.10.0
signature.asc
Description: PGP signature
