diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2020-06-01 23:40:46 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2020-06-01 23:40:46 +0200 |
| commit | b2dbc53ec2806f05d6c98287f79ee162d335050d (patch) | |
| tree | 4fbcdde013e04e66260904769997548f4554bcfb | |
| parent | 9e03ddc5175a09f408bdca91ea5ccecdfd8fb9af (diff) | |
| download | guix-b2dbc53ec2806f05d6c98287f79ee162d335050d.tar guix-b2dbc53ec2806f05d6c98287f79ee162d335050d.tar.gz | |
gnu: scintilla: Update to 4.4.0.
* 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.
| -rw-r--r-- | gnu/packages/text-editors.scm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index e80e9dcbe5..8e4e49112d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -743,14 +743,14 @@ and Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "4.3.3") + (version "4.4.0") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "0zh8c19r1zd4kr9jg2ws0n2n5ic2siz5zbns6cvylyfbpf69ghy2")))) + (base32 "10qnab10gfkzdfyqpmsl4c3mhh7533l4q6jrdfy5ssvj4da6hawd")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") @@ -758,20 +758,14 @@ and Octave. TeXmacs is completely extensible via Guile.") #:phases (modify-phases %standard-phases (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 + ;; Upstream provides no install script. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib")) (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)) (find-files "include/" ".")) #t)))))) |