me/guix
Archived
1
0
Fork 0
Code Activity

gnu: scintilla: Update to 4.4.0.

Browse source 
* gnu/packages/text-editors.scm (scintilla): Update to 4.4.0.
[arguments]: Remove phase building shared library.  This is now done out of
the box.
This commit is contained in:
Nicolas Goaziou 2020-06-01 23:40:46 +02:00
parent 9e03ddc517
commit b2dbc53ec2
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/text-editors.scm
View file

@ -743,14 +743,14 @@ and Octave. TeXmacs is completely extensible via Guile.")
(define-public scintilla (define-public scintilla
(package (package
(name "scintilla") (name "scintilla")
(version "4.3.3") (version "4.4.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (let ((v (apply string-append (string-split version #\.)))) (uri (let ((v (apply string-append (string-split version #\.))))
(string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (string-append "https://www.scintilla.org/scintilla" v ".tgz")))
(sha256 (sha256
(base32 "0zh8c19r1zd4kr9jg2ws0n2n5ic2siz5zbns6cvylyfbpf69ghy2")))) (base32 "10qnab10gfkzdfyqpmsl4c3mhh7533l4q6jrdfy5ssvj4da6hawd"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk")
@ -758,20 +758,14 @@ and Octave. TeXmacs is completely extensible via Guile.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(delete 'configure) ;no configure script (delete 'configure) ;no configure script
(add-after 'unpack 'build-shared-library
(lambda _
(substitute* "gtk/makefile"
(("scintilla\\.a") "libscintilla.so")
(("\\$\\(AR\\) \\$\\(ARFLAGS\\) \\$@ \\$\\^")
"$(CC) -shared $^ -o $@")
(("\\$\\(RANLIB\\) \\$@") ""))
#t))
(replace 'install (replace 'install
;; Upstream provides no install script.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib")) (lib (string-append out "/lib"))
(include (string-append out "/include"))) (include (string-append out "/include")))
(install-file "bin/libscintilla.so" lib) (for-each (lambda (f) (install-file f lib))
(find-files "bin/" "\\.so$"))
(for-each (lambda (f) (install-file f include)) (for-each (lambda (f) (install-file f include))
(find-files "include/" ".")) (find-files "include/" "."))
#t)))))) #t))))))