HCoop
/
jackhill
/
guix
/
guix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gnu: julia: Update to 1.4.1.
[jackhill/guix/guix.git]
/
gnu
/
packages
/
abiword.scm
diff --git
a/gnu/packages/abiword.scm
b/gnu/packages/abiword.scm
index
514ac0c
..
9cfd12a
100644
(file)
--- a/
gnu/packages/abiword.scm
+++ b/
gnu/packages/abiword.scm
@@
-1,6
+1,10
@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
;;;
;;; This file is part of GNU Guix.
;;;
@@
-44,29
+48,22
@@
(define-public abiword
(package
(name "abiword")
(define-public abiword
(package
(name "abiword")
- (version "3.0.
1
")
+ (version "3.0.
4
")
(source
(origin
(method url-fetch)
(uri
(source
(origin
(method url-fetch)
(uri
- (string-append "http
://abisource.org/downloads/" name "
/" version
- "/source/
" name "
-" version ".tar.gz"))
+ (string-append "http
s://www.abisource.com/downloads/abiword
/" version
+ "/source/
abiword
-" version ".tar.gz"))
(sha256
(sha256
- (base32 "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570"))
- (modules '((guix build utils)))
- (snippet
- ;; Ensure reproducibility.
- '(substitute* "src/wp/main/xp/abi_ver.cpp"
- (("__DATE__") "\"2017\"")
- (("__TIME__") "\"00:00\"")))
+ (base32 "1mx5l716n0z5788i19qmad30cck4v9ggr071cafw2nrf375rcc79"))
(patches
(patches
- (search-patches "abiword-wmf-version-lookup-fix.patch"
- "abiword-explictly-cast-bools.patch"))))
+ (search-patches "abiword-explictly-cast-bools.patch"))))
(build-system glib-or-gtk-build-system)
(arguments ;; NOTE: rsvg is disabled, since Abiword
`(#:configure-flags ;; supports it directly, and its BS is broken.
(build-system glib-or-gtk-build-system)
(arguments ;; NOTE: rsvg is disabled, since Abiword
`(#:configure-flags ;; supports it directly, and its BS is broken.
- (list
+ (list
;; wmf was removed from Guix for security.
"--enable-clipart" ;; TODO: The following plugins have unresolved
"--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda,
(string-append ;; wordperfect, psion, mathview.
"--enable-clipart" ;; TODO: The following plugins have unresolved
"--enable-templates" ;; dependencies: aiksaurus, grammar, wpg, gda,
(string-append ;; wordperfect, psion, mathview.
@@
-77,14
+74,16
@@
"latex " "loadbindings " "mht " "mif " "mswrite " "opendocument "
"openwriter " "openxml " "opml " "ots " "paint " "passepartout "
"pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
"latex " "loadbindings " "mht " "mif " "mswrite " "opendocument "
"openwriter " "openxml " "opml " "ots " "paint " "passepartout "
"pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
- "wikipedia " "wm
f " "wm
l " "xslfo"))
+ "wikipedia " "wml " "xslfo"))
;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen:
;; assertion 'GDK_IS_SCREEN (screen)' failed
;; GLib-GObject-CRITICAL **: g_object_get_qdata:
;; assertion 'G_IS_OBJECT (object)' failed
;; Manually starting the X server before the test phase did not help
;; the tests to pass.
;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen:
;; assertion 'GDK_IS_SCREEN (screen)' failed
;; GLib-GObject-CRITICAL **: g_object_get_qdata:
;; assertion 'G_IS_OBJECT (object)' failed
;; Manually starting the X server before the test phase did not help
;; the tests to pass.
- #:tests? #f))
+ #:tests? #f
+ #:make-flags
+ (list "gtk_update_icon_cache=true")))
(inputs
`(("boost" ,boost)
("enchant" ,enchant)
(inputs
`(("boost" ,boost)
("enchant" ,enchant)
@@
-96,10
+95,9
@@
("libchamplain" ,libchamplain)
("libglade" ,libglade)
("libgsf" ,libgsf)
("libchamplain" ,libchamplain)
("libglade" ,libglade)
("libgsf" ,libgsf)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg
-turbo
)
("libpng" ,libpng)
("librsvg" ,librsvg)
("libpng" ,libpng)
("librsvg" ,librsvg)
- ("libwmf" ,libwmf)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("ots" ,ots)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("ots" ,ots)
@@
-113,7
+111,7
@@
("glib:bin" ,glib "bin")
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
("glib:bin" ,glib "bin")
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
- (home-page "http
://abisource.org
/")
+ (home-page "http
s://www.abisource.com
/")
(synopsis "Word processing program")
;; HACKERS: The comment below is here so that it shows up early in the
(synopsis "Word processing program")
;; HACKERS: The comment below is here so that it shows up early in the