gnu: qscintilla: Update to 2.10.8.

* gnu/packages/qt.scm (qscintilla): Update to 2.10.8.
(python-qscintilla)[arguments]: Update custom 'configure phase.
master
Efraim Flashner 2019-01-02 15:38:53 +02:00
parent d4274628a6
commit 9f8fee5027
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 17 additions and 15 deletions

View File

@ -1917,7 +1917,7 @@ contain over 620 classes.")
(define-public qscintilla (define-public qscintilla
(package (package
(name "qscintilla") (name "qscintilla")
(version "2.10.7") (version "2.10.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/pyqt/QScintilla2/" (uri (string-append "mirror://sourceforge/pyqt/QScintilla2/"
@ -1925,7 +1925,7 @@ contain over 620 classes.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06hs6civq13dvzlws0spjb7gwyk6kynpnfwg5plhahnxf7g5h137")))) "1swjr786w04r514pry9pn32ivza4il1cg35s60qy39cwc175pka6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -1973,19 +1973,21 @@ indicators, code completion and call tips.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
(lambda* (#:key outputs configure-flags #:allow-other-keys) (lambda* (#:key inputs outputs configure-flags #:allow-other-keys)
(chdir "Python") (let ((out (assoc-ref outputs "out"))
(apply invoke "python3" "configure.py" (python (assoc-ref inputs "python")))
configure-flags) (chdir "Python")
;; Install to the right directory (apply invoke "python3" "configure.py"
(substitute* '("Makefile" configure-flags)
"Qsci/Makefile") ;; Install to the right directory
(("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+") (substitute* '("Makefile"
(assoc-ref outputs "out"))) "Qsci/Makefile")
;; And fix the installed.txt file (("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+") out)
(substitute* "installed.txt" (((string-append python "/lib"))
(("/gnu/store/[^/]+") (string-append out "/lib")))
(assoc-ref outputs "out"))) ;; And fix the installed.txt file
(substitute* "installed.txt"
(("/gnu/store/[^/]+") out)))
#t))))) #t)))))
(inputs (inputs
`(("qscintilla" ,qscintilla) `(("qscintilla" ,qscintilla)