mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: abiword: Update to 3.0.7.
* gnu/packages/abiword.scm (abiword): Update to 3.0.7. [source]: Switch to git-fetch, update url. [arguments]<#:configure-flags>: Add --enable-scripting. <#:phases>: Add bootstrap-common. [inputs]: Sort; add aspell, boost, libgcrypt, libxft; remove glib. [native-inputs]: Sort; add findutils, perl, grep, autoconf, autogen, automake, bash-minimal. [home-page]: Update url. Change-Id: Id71c614c46e14a0871ec8a9b5cbab7961b79fa3b Signed-off-by: Andreas Enge <andreas@enge.fr>
This commit is contained in:
parent
71c496bee7
commit
45d412ead1
1 changed files with 48 additions and 20 deletions
|
@ -25,11 +25,16 @@
|
||||||
(define-module (gnu packages abiword)
|
(define-module (gnu packages abiword)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
|
||||||
#:use-module (guix build-system glib-or-gtk)
|
#:use-module (guix build-system glib-or-gtk)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
|
#:use-module (guix git-download)
|
||||||
#:use-module (gnu packages)
|
#:use-module (gnu packages)
|
||||||
|
#:use-module (gnu packages aspell)
|
||||||
|
#:use-module (gnu packages bash)
|
||||||
|
#:use-module (gnu packages gnupg)
|
||||||
|
#:use-module (gnu packages autogen)
|
||||||
#:use-module (gnu packages autotools)
|
#:use-module (gnu packages autotools)
|
||||||
|
#:use-module (gnu packages base)
|
||||||
#:use-module (gnu packages boost)
|
#:use-module (gnu packages boost)
|
||||||
#:use-module (gnu packages compression)
|
#:use-module (gnu packages compression)
|
||||||
#:use-module (gnu packages enchant)
|
#:use-module (gnu packages enchant)
|
||||||
|
@ -40,30 +45,31 @@
|
||||||
#:use-module (gnu packages gtk)
|
#:use-module (gnu packages gtk)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages ots)
|
#:use-module (gnu packages ots)
|
||||||
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages popt)
|
#:use-module (gnu packages popt)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module (gnu packages wv)
|
#:use-module (gnu packages wv)
|
||||||
#:use-module (gnu packages xml))
|
#:use-module (gnu packages xml))
|
||||||
|
|
||||||
(define-public abiword
|
(define-public abiword
|
||||||
(package
|
(package
|
||||||
(name "abiword")
|
(name "abiword")
|
||||||
(version "3.0.5")
|
(version "3.0.7")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri
|
(uri (git-reference
|
||||||
;; XXX: The main site <https://www.abisource.com/> is down. Only a (partial)
|
(url "https://gitlab.gnome.org/World/AbiWord/")
|
||||||
;; mirror is available at <http://www.nl.abisource.com/>.
|
(commit (string-append "release-" version))))
|
||||||
(string-append "http://www.nl.abisource.com/downloads/abiword/" version
|
(file-name (git-file-name name version))
|
||||||
"/source/abiword-" version ".tar.gz"))
|
(sha256
|
||||||
(sha256
|
(base32
|
||||||
(base32 "1d1179pnslijpjhz1q155fsc828rrlqf7lsn2inqsl3hk5z28mqj"))
|
"0hp11vdfm70n840ib19szxkibfs0v1hhklslz4xipfwrdvpwk1km"))
|
||||||
(patches
|
(patches
|
||||||
(search-patches "abiword-explictly-cast-bools.patch"))))
|
(search-patches "abiword-explictly-cast-bools.patch"))))
|
||||||
|
|
||||||
(build-system glib-or-gtk-build-system)
|
(build-system glib-or-gtk-build-system)
|
||||||
(arguments ;; NOTE: rsvg is disabled, since Abiword
|
(arguments ;; NOTE: rsvg is disabled, since Abiword
|
||||||
(list #:configure-flags ;; supports it directly, and its BS is broken.
|
(list #:configure-flags ;; supports it directly, and its BS is broken.
|
||||||
|
@ -80,6 +86,7 @@
|
||||||
"pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
|
"pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict "
|
||||||
"wikipedia " "wml " "xslfo")
|
"wikipedia " "wml " "xslfo")
|
||||||
"--enable-introspection"
|
"--enable-introspection"
|
||||||
|
"--enable-scripting"
|
||||||
(string-append "--with-gir-dir="
|
(string-append "--with-gir-dir="
|
||||||
#$output
|
#$output
|
||||||
"/share/gir-1.0")
|
"/share/gir-1.0")
|
||||||
|
@ -93,22 +100,34 @@
|
||||||
;; Manually starting the X server before the test phase did not help
|
;; Manually starting the X server before the test phase did not help
|
||||||
;; the tests to pass.
|
;; the tests to pass.
|
||||||
#:tests? #f
|
#:tests? #f
|
||||||
|
#:phases
|
||||||
|
#~(modify-phases %standard-phases
|
||||||
|
;; FIXME: Use #:bootstrap-scripts instead.
|
||||||
|
(add-before 'bootstrap 'bootstrap-common
|
||||||
|
(lambda _
|
||||||
|
(substitute* "autogen-common.sh"
|
||||||
|
(("/bin/sh")
|
||||||
|
(string-append
|
||||||
|
#$(this-package-native-input "bash-minimal")
|
||||||
|
"/bin/sh"))))))
|
||||||
#:make-flags
|
#:make-flags
|
||||||
#~(list "gtk_update_icon_cache=true")))
|
#~(list "gtk_update_icon_cache=true")))
|
||||||
(inputs
|
(inputs
|
||||||
(list boost
|
(list aspell
|
||||||
|
boost
|
||||||
enchant
|
enchant
|
||||||
fontconfig
|
fontconfig
|
||||||
fribidi
|
fribidi
|
||||||
glib
|
|
||||||
goffice
|
goffice
|
||||||
gtk+
|
gtk+
|
||||||
|
libgcrypt
|
||||||
libchamplain
|
libchamplain
|
||||||
libglade
|
libglade
|
||||||
libgsf
|
libgsf
|
||||||
libjpeg-turbo
|
libjpeg-turbo
|
||||||
libpng
|
libpng
|
||||||
(librsvg-for-system)
|
(librsvg-for-system)
|
||||||
|
libxft
|
||||||
libxml2
|
libxml2
|
||||||
libxslt
|
libxslt
|
||||||
ots
|
ots
|
||||||
|
@ -118,13 +137,22 @@
|
||||||
wv
|
wv
|
||||||
zlib))
|
zlib))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list gobject-introspection
|
(list `(,glib "bin")
|
||||||
|
autoconf
|
||||||
|
autoconf-archive
|
||||||
|
autogen
|
||||||
|
automake
|
||||||
|
bash-minimal
|
||||||
|
findutils
|
||||||
|
grep
|
||||||
intltool
|
intltool
|
||||||
`(,glib "bin")
|
|
||||||
libtool
|
libtool
|
||||||
|
perl
|
||||||
pkg-config
|
pkg-config
|
||||||
python-wrapper))
|
python-wrapper
|
||||||
(home-page "http://www.nl.abisource.com/")
|
sed
|
||||||
|
gobject-introspection))
|
||||||
|
(home-page "https://gitlab.gnome.org/World/AbiWord/")
|
||||||
(synopsis "Word processing program")
|
(synopsis "Word processing program")
|
||||||
|
|
||||||
;; HACKERS: The comment below is here so that it shows up early in the
|
;; HACKERS: The comment below is here so that it shows up early in the
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue