diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/abiword.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
| download | guix-839bb4616f13171a23ad7937bf57d0a01d61d42a.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in: gnu/packages/ibus.scm gnu/packages/image.scm gnu/packages/lisp.scm gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/abiword.scm')
| -rw-r--r-- | gnu/packages/abiword.scm | 65 |
1 files changed, 37 insertions, 28 deletions
diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index 5a0a4cd7be..1635ed54fd 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Marek Benc <merkur32@gmail.com> ;;; Copyright © 2016, 2018 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2017, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> @@ -25,7 +25,6 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) - #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) #:use-module (gnu packages autotools) @@ -41,6 +40,7 @@ #:use-module (gnu packages ots) #:use-module (gnu packages popt) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages readline) #:use-module (gnu packages wv) #:use-module (gnu packages xml)) @@ -74,7 +74,14 @@ "latex " "loadbindings " "mht " "mif " "mswrite " "opendocument " "openwriter " "openxml " "opml " "ots " "paint " "passepartout " "pdb " "pdf " "presentation " "s5 " "sdw " "t602 " "urldict " - "wikipedia " "wml " "xslfo")) + "wikipedia " "wml " "xslfo") + "--enable-introspection" + (string-append "--with-gir-dir=" + (assoc-ref %outputs "out") + "/share/gir-1.0") + (string-append "--with-typelib-dir=" + (assoc-ref %outputs "out") + "/lib/girepository-1.0")) ;; tests fail with: Gtk-CRITICAL **: gtk_settings_get_for_screen: ;; assertion 'GDK_IS_SCREEN (screen)' failed ;; GLib-GObject-CRITICAL **: g_object_get_qdata: @@ -85,32 +92,34 @@ #:make-flags (list "gtk_update_icon_cache=true"))) (inputs - `(("boost" ,boost) - ("enchant" ,enchant) - ("fontconfig" ,fontconfig) - ("fribidi" ,fribidi) - ("glib" ,glib) - ("goffice" ,goffice) - ("gtk+" ,gtk+) - ("libchamplain" ,libchamplain) - ("libglade" ,libglade) - ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("librsvg" ,librsvg) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("ots" ,ots) - ("popt" ,popt) - ("readline" ,readline) - ("telepathy" ,telepathy-glib) - ("wv" ,wv) - ("zlib" ,zlib))) + (list boost + enchant + fontconfig + fribidi + glib + goffice + gtk+ + libchamplain + libglade + libgsf + libjpeg-turbo + libpng + (librsvg-for-system) + libxml2 + libxslt + ots + popt + readline + telepathy-glib + wv + zlib)) (native-inputs - `(("intltool" ,intltool) - ("glib:bin" ,glib "bin") - ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + (list gobject-introspection + intltool + `(,glib "bin") + libtool + pkg-config + python-wrapper)) (home-page "https://www.abisource.com/") (synopsis "Word processing program") |