;;; Copyright © 2016, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
-;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
-;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages documentation)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gnupg)
- #:use-module (gnu packages gnuzilla)
#:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages java)
#:use-module (gnu packages linux)
#:use-module (gnu packages maths)
+ #:use-module (gnu packages nss)
#:use-module (gnu packages openldap)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
(define-public libwpd
(package
(name "libwpd")
- (version "0.10.2")
+ (version "0.10.3")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/" name "/" name "/"
- name "-" version "/" name "-" version ".tar.xz"))
+ (uri (string-append "mirror://sourceforge/libwpd/libwpd/"
+ "libwpd-" version "/libwpd-" version ".tar.xz"))
(sha256 (base32
- "0436gnidx45a9vx114hhh216jrh57mqb9zyssyjfadagmyz6hgrj"))))
+ "02fx8bngslcj7i5g1gx2kiign4vp09wrmp5wpvix9igxcavb0r94"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags '("--disable-werror")))
(native-inputs
`(("doxygen" ,doxygen)
("pkg-config" ,pkg-config)))
(define-public libwpg
(package
(name "libwpg")
- (version "0.3.2")
+ (version "0.3.3")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/" name "/" name "/"
- name "-" version "/" name "-" version ".tar.xz"))
+ (uri (string-append "mirror://sourceforge/libwpg/libwpg/"
+ "libwpg-" version "/libwpg-" version ".tar.xz"))
(sha256 (base32
- "0cwc5zkp210c661l0bvk6q21jg9ak5g8gmy578w5fgfnjymz3yjp"))))
+ "074x159immf139szkswv2zapnq75p7xk10dbha2p9193hgwggcwr"))))
(build-system gnu-build-system)
(native-inputs
`(("doxygen" ,doxygen)
;; FIXME: Man pages generation requires docbook-to-man; reenable
;; it once this is available.
"--without-man"
+ ;; XXX: A configure test fails with GCC7 when including Boost headers.
+ "--disable-werror"
;; During configure, the boost headers are found, but linking
;; fails without the following flag.
(string-append "--with-boost="
(define-public libabw
(package
(name "libabw")
- (version "0.1.2")
+ (version "0.1.3")
(source
(origin
(method url-fetch)
- (uri (string-append "https://dev-www.libreoffice.org/src/" name "/"
- name "-" version ".tar.xz"))
+ (uri (string-append "https://dev-www.libreoffice.org/src/libabw/"
+ "libabw-" version ".tar.xz"))
(sha256 (base32
- "11949iscdb99f2jplxjd39282jxcrf2fw0sqbh5dl7gqb96r8whb"))))
+ "1vbfrmnvib3cym0yyyabnd8xpx4f7wp20vnn09s6dln347fajqz7"))))
(build-system gnu-build-system)
(native-inputs
`(("doxygen" ,doxygen)
("libxml2" ,libxml2)))
(inputs
`(("boost" ,boost)))
- (arguments
- ;; avoid triggering configure errors by simple inclusion of boost headers
- `(#:configure-flags '("--disable-werror")))
(home-page "https://wiki.documentfoundation.org/DLP/Libraries/libabw")
(synopsis "Library for parsing the AbiWord format")
(description "Libabw is a library that parses the file format of
(define-public libnumbertext
(package
(name "libnumbertext")
- (version "1.0")
+ (version "1.0.5")
(source
(origin
(method url-fetch)
- (uri (string-append "https://github.com/numbertext/" name
- "/archive/" version ".tar.gz"))
+ (uri (string-append "https://github.com/Numbertext/libnumbertext/"
+ "releases/download/" version
+ "/libnumbertext-" version ".tar.xz"))
(sha256
- (base32
- "0wnsn4911fdd2na8jxkcvmk04a6xw6qlviic9w4qwg9fcym6866v"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ (base32 "1xzlwhwwhvr76kfdsw5gvfjfdayz803z65h331gv5dpc9imhijg1"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags '("--disable-static")))
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("libtool" ,libtool)
- ("pkg-config" ,pkg-config)))
(home-page "https://github.com/Numbertext/libnumbertext")
(synopsis "Language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions")
(description
(source
(origin
(method url-fetch)
- (uri (string-append "https://dev-www.libreoffice.org/src/" name "/"
- name "-" version ".tar.xz"))
+ (uri (string-append "https://dev-www.libreoffice.org/src/libpagemaker/"
+ "libpagemaker-" version ".tar.xz"))
(sha256 (base32
"17ai8ajffr0ixxmmcv3k5vgjlcsix38ldb4fw2arild70pbsrbb6"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:configure-flags '("--disable-werror")))
(native-inputs
`(("doxygen" ,doxygen)
("pkg-config" ,pkg-config)))
(define-public libvisio
(package
(name "libvisio")
- (version "0.1.6")
+ (version "0.1.7")
(source
(origin
(method url-fetch)
- (uri (string-append "http://dev-www.libreoffice.org/src/" name "/"
- name "-" version ".tar.xz"))
+ (uri (string-append "http://dev-www.libreoffice.org/src/libvisio/"
+ "libvisio-" version ".tar.xz"))
(sha256 (base32
- "1yahpfl13qk6178irv8jn5ppxdn7isafqisyqsdw0lqxcz9h447y"))))
+ "0k7adcbbf27l7n453cca1m6s9yj6qvb5j6bsg2db09ybf3w8vbwg"))))
(build-system gnu-build-system)
(native-inputs
`(("cppunit" ,cppunit)
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/libwpd/" name "/"
- name "-" version "/" name "-" version ".tar.xz"))
+ (uri (string-append "mirror://sourceforge/libwpd/libodfgen/"
+ "libodfgen-" version "/libodfgen-" version ".tar.xz"))
(sha256 (base32
"0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij"))))
(build-system gnu-build-system)
(define-public libmwaw
(package
(name "libmwaw")
- (version "0.3.14")
+ (version "0.3.15")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/" name "/" name "/" name "-"
- version "/" name "-" version ".tar.xz"))
+ (uri (string-append "mirror://sourceforge/libmwaw/libmwaw/libmwaw-"
+ version "/libmwaw-" version ".tar.xz"))
(sha256 (base32
- "1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c"))))
+ "1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"))))
(build-system gnu-build-system)
(native-inputs
`(("doxygen" ,doxygen)
(define-public libqxp
(package
(name "libqxp")
- (version "0.0.1")
+ (version "0.0.2")
(source (origin
(method url-fetch)
(uri (string-append "https://dev-www.libreoffice.org/src/libqxp/"
"libqxp-" version ".tar.xz"))
(sha256
(base32
- "0wswz49y0lqwqw2nj9j7jaj5ag88hapcz8czgkxax57zhihpy9cc"))))
+ "0p4lb84m05wqd8qr8ni9sp80ivlm83ffn0nxiv4m42hj22qvcdz1"))))
(build-system gnu-build-system)
(inputs
`(("boost" ,boost)
(define-public libreoffice
(package
(name "libreoffice")
- (version "6.1.3.2")
+ (version "6.3.4.2")
(source
(origin
(method url-fetch)
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256
(base32
- "0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl"))
- (patches
- (append (list (origin
- ;; Support newer versions of Orcus and MDDS. These patches
- ;; are taken from upstream, but we use the patches from Arch
- ;; because they are adapted for the release tarball.
- ;; Note: remove the related substitutions below when these
- ;; are no longer needed.
- (method url-fetch)
- (uri (string-append "https://git.archlinux.org/svntogit"
- "/packages.git/plain/trunk/"
- "0001-Update-orcus-to-0.14.0.patch?&id="
- "4002fa927f2a143bd2ec008a0c400b2ce9f2c8a7"))
- (file-name "libreoffice-orcus.patch")
- (sha256
- (base32
- "0v1knblrmfzkb4g9pm5mdnrmjib59bznvca1ygbwlap2ln1h4mk0")))
- (origin
- (method url-fetch)
- (uri (string-append "https://git.archlinux.org/svntogit"
- "/packages.git/plain/trunk/"
- "0001-Update-mdds-to-1.4.1.patch?&id="
- "4002fa927f2a143bd2ec008a0c400b2ce9f2c8a7"))
- (file-name "libreoffice-mdds.patch")
- (sha256
- (base32
- "0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f")))
- ;; The Poppler API changed rapidly in the versions leading 0.72.
- ;; Thus, we need several patches from upstream, each adapting to
- ;; different Poppler changes since version 0.68.
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/LibreOffice/core/commit/"
- "1688a395d05125b83eac6cd5c43f0e3f2f66c491"
- ".patch"))
- (file-name "libreoffice-poppler-compat.patch")
- (sha256
- (base32
- "0ia5avmj772mrgs6m4qqf01hs8hzpy3nafidj7w7gqx2zz2s5ih9")))
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/LibreOffice/core/commit/"
- "5e8bdd9203dd642111c62a6668ee665a20d4ba19"
- ".patch"))
- (file-name "libreoffice-poppler-gbool.patch")
- (sha256
- (base32
- "19kc74h5vnk48l2vny8zmm2lkxpwc7g8n9d3wwpg99748dvbmikd")))
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/LibreOffice/core/commit/"
- "8ff41a26caf51544699863c89598d37d93dc1b21"
- ".patch"))
- (file-name "libreoffice-poppler-0.71.patch")
- (sha256
- (base32
- "1dsd0gynjf7d6412dd2sx70xa2s8kld7ibyjdkwg5w9hhi2zxw2f"))))
- (search-patches "libreoffice-boost.patch"
- "libreoffice-icu.patch"
- "libreoffice-glm.patch")))
+ "1774vmf3lr5x24ikpn1z5vqcdwrhiwfkjy7sx09jqkvpm6d5awnb"))
+ (patches (search-patches "libreoffice-icu.patch"
+ "libreoffice-glm.patch"))
(modules '((guix build utils)))
(snippet
'(begin
("cups" ,cups)
("dbus-glib" ,dbus-glib)
("fontconfig" ,fontconfig)
+ ("fontforge" ,fontforge)
("gconf" ,gconf)
("glew" ,glew)
("glm" ,glm)
+ ("gnupg" ,gnupg)
+ ("gobject-introspection" ,gobject-introspection)
("gperf" ,gperf)
("gpgme" ,gpgme)
("graphite2" ,graphite2)
("libxt" ,libxt)
("libzmf" ,libzmf)
("lpsolve" ,lpsolve)
+ ("mariadb" ,mariadb "dev")
("mdds" ,mdds)
("mythes" ,mythes)
("neon" ,neon)
("unixodbc" ,unixodbc)
("unzip" ,unzip)
("vigra" ,vigra)
+ ("xdg-utils" ,xdg-utils)
("xmlsec" ,xmlsec-nss)
("zip" ,zip)))
(arguments
"solenv/gbuild/platform/unxgcc.mk")
(("/bin/sh") (which "sh")))
- ;; XXX: Adjust the checks for MDDS and liborcus to avoid having
- ;; to re-bootstrap the whole thing. Remove this with the related
- ;; patches above.
- (substitute* "configure"
- (("mdds-1.2 >= 1.2.3") "mdds-1.4 >= 1.4.1")
- (("liborcus-0.13 >= 0.13.3") "liborcus-0.14 >= 0.14.0"))
-
;; GPGME++ headers are installed in a gpgme++ subdirectory, but
;; files in "xmlsecurity/source/gpg/" and elsewhere expect to
;; find them on the include path without a prefix.
(assoc-ref inputs "gpgme")
"/include/gpgme++")))
+ ;; /usr/bin/xdg-open doesn't exist on Guix System.
+ (substitute* '("shell/source/unix/exec/shellexec.cxx"
+ "shell/source/unix/misc/senddoc.sh")
+ (("/usr/bin/xdg-open")
+ (string-append (assoc-ref inputs "xdg-utils")
+ "/bin/xdg-open")))
+
#t))
(add-after 'install 'bin-and-desktop-install
;; Create 'soffice' and 'libreoffice' symlinks to the executable
#:configure-flags
(list
"--enable-release-build"
- "--enable-verbose"
;; Avoid using all cpu cores by default
(format #f "--with-parallelism=~d" (parallel-job-count))
"--disable-fetch-external" ; disable downloads
;; With java, the build fails since sac.jar is missing.
"--without-java"
;; FIXME: Enable once the corresponding inputs are packaged.
- "--without-system-npapi-headers"
"--disable-coinmp"
"--disable-firebird-sdbc" ; embedded firebird
- "--disable-gltf"
;; XXX: PDFium support requires fetching an external tarball and
;; patching the build scripts to work with GCC5. Try enabling this
;; when our default compiler is >=GCC 6.
"--disable-pdfium"
"--disable-gtk" ; disable use of GTK+ 2
- "--without-doxygen")))
+ "--without-doxygen"
+ "--enable-build-opensymbol")))
(home-page "https://www.libreoffice.org/")
(synopsis "Office suite")
(description "LibreOffice is a comprehensive office suite. It contains
HCoop / jackhill / guix / guix.git / blobdiff