aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/enchant.scm50
-rw-r--r--gnu/packages/fcitx.scm2
-rw-r--r--gnu/packages/gnome.scm2
-rw-r--r--gnu/packages/gtk.scm5
-rw-r--r--gnu/packages/mate.scm2
5 files changed, 41 insertions, 20 deletions
diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm
index c3f75ccf2e..0392a709e2 100644
--- a/gnu/packages/enchant.scm
+++ b/gnu/packages/enchant.scm
@@ -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"))))))
diff --git a/gnu/packages/fcitx.scm b/gnu/packages/fcitx.scm
index bcd5f12dd1..b05d9b7146 100644
--- a/gnu/packages/fcitx.scm
+++ b/gnu/packages/fcitx.scm
@@ -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+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1ca354a432..8d684cd36d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -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
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 0b85a1723f..76e64b36bc 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -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
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 88f64fdb66..5919c714ee 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -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)