[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: scintilla: Update to 4.4.0.
From: |
guix-commits |
Subject: |
02/02: gnu: scintilla: Update to 4.4.0. |
Date: |
Mon, 1 Jun 2020 17:41:17 -0400 (EDT) |
ngz pushed a commit to branch master
in repository guix.
commit b2dbc53ec2806f05d6c98287f79ee162d335050d
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Mon Jun 1 23:40:46 2020 +0200
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.
---
gnu/packages/text-editors.scm | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index e80e9dc..8e4e491 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))))))