gnu: enchant: Update to 2.2.3.
* gnu/packages/enchant.scm (enchant): Update to 2.2.3. [arguments]: Add "--enable-relocatable" to #:configure-flags. [native-inputs]: Add UNITTEST-CPP. (enchant-1.6): New public variable. * gnu/packages/fcitx.scm (fcitx)[inputs]: Change ENCHANT to ENCHANT-1.6. * gnu/packages/gnome.scm (gspell): Likewise. * gnu/packages/mate.scm (pluma): Likewise. * gnu/packages/gtk.scm (gtkspell3)[propagated-inputs]: Likewise. [inputs]: Remove duplicate ENCHANT.master
Marius Bakke
parent
9a59b29411
commit
c1d59b3c2a
|
|
@ -1,5 +1,6 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
|
||||
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -19,29 +20,32 @@
|
|||
(define-module (gnu packages enchant)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages aspell)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages glib)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix licenses))
|
||||
#:use-module (guix licenses)
|
||||
#:use-module (srfi srfi-1))
|
||||
|
||||
(define-public enchant
|
||||
(package
|
||||
(name "enchant")
|
||||
(version "1.6.0")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri
|
||||
(string-append "http://www.abisource.com/downloads/" name "/" version
|
||||
"/" name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"))))
|
||||
|
||||
(version "2.2.3")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://github.com/AbiWord/enchant/releases"
|
||||
"/download/v" version "/enchant-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0v87p1ls0gym95qirijpclk650sjbkcjjl6ssk059zswcwaykn5b"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--disable-static")))
|
||||
'(#:configure-flags '("--disable-static"
|
||||
;; Tests require a relocatable build.
|
||||
"--enable-relocatable")))
|
||||
(inputs
|
||||
`(("aspell" ,aspell))) ;; Currently, the only supported backend in Guix
|
||||
(propagated-inputs ;; is aspell. (This information might be old)
|
||||
|
|
@ -49,8 +53,8 @@
|
|||
`(("glib" ,glib)))
|
||||
(native-inputs
|
||||
`(("glib:bin" ,glib "bin")
|
||||
("pkg-config" ,pkg-config)))
|
||||
|
||||
("pkg-config" ,pkg-config)
|
||||
("unittest-cpp" ,unittest-cpp)))
|
||||
(synopsis "Multi-backend spell-checking library wrapper")
|
||||
(description
|
||||
"On the surface, Enchant appears to be a generic spell checking library.
|
||||
|
|
@ -63,3 +67,21 @@ library. Everything should \"just work\" for any and every definition of \"just
|
|||
working\".")
|
||||
(home-page "https://abiword.github.io/enchant/")
|
||||
(license lgpl2.1+)))
|
||||
|
||||
;; Some packages are not ready for the 2.x API yet, so we keep this version
|
||||
;; around. The library and executables of Enchant 2 have been designed not to
|
||||
;; conflict with 1.x, so it's OK if both end up in the same profile.
|
||||
(define-public enchant-1.6
|
||||
(package
|
||||
(inherit enchant)
|
||||
(version "1.6.0")
|
||||
(arguments '(#:configure-flags '("--disable-static")))
|
||||
(native-inputs (alist-delete "unittest-cpp"
|
||||
(package-native-inputs enchant)))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://www.abisource.com/downloads/enchant/"
|
||||
version "/enchant-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g"))))))
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@
|
|||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("dbus" ,dbus)
|
||||
("enchant" ,enchant)
|
||||
("enchant" ,enchant-1.6)
|
||||
("gettext" ,gettext-minimal)
|
||||
("gtk2" ,gtk+-2)
|
||||
("gtk3" ,gtk+)
|
||||
|
|
|
|||
|
|
@ -6969,7 +6969,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).")
|
|||
("aspell-dict-en" ,aspell-dict-en)
|
||||
("xorg-server" ,xorg-server)))
|
||||
(propagated-inputs
|
||||
`(("enchant" ,enchant))) ; enchant.pc is required by gspell-1.pc
|
||||
`(("enchant" ,enchant-1.6))) ; enchant.pc is required by gspell-1.pc
|
||||
(home-page "https://wiki.gnome.org/Projects/gspell")
|
||||
(synopsis "GNOME's alternative spell checker")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -1582,12 +1582,11 @@ glass artworks done by Venicians glass blowers.")
|
|||
`(("intltool" ,intltool)
|
||||
("pkg-config" ,pkg-config)))
|
||||
(inputs
|
||||
`(("enchant" ,enchant)
|
||||
("gobject-introspection" ,gobject-introspection)
|
||||
`(("gobject-introspection" ,gobject-introspection)
|
||||
("gtk+" ,gtk+)
|
||||
("pango" ,pango)))
|
||||
(propagated-inputs
|
||||
`(("enchant" ,enchant))) ; gtkspell3-3.0.pc refers to it.
|
||||
`(("enchant" ,enchant-1.6))) ;gtkspell3-3.0.pc refers to it
|
||||
(home-page "http://gtkspell.sourceforge.net")
|
||||
(synopsis "Spell-checking addon for GTK's TextView widget")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -1411,7 +1411,7 @@ can be used as backgrounds in the MATE Desktop environment.")
|
|||
(inputs
|
||||
`(("atk" ,atk)
|
||||
("cairo" ,cairo)
|
||||
("enchant" ,enchant)
|
||||
("enchant" ,enchant-1.6)
|
||||
("glib" ,glib)
|
||||
("gtk+" ,gtk+)
|
||||
("gtksourceview" ,gtksourceview)
|
||||
|
|
|
|||
Loading…
Reference in New Issue