me/guix
Archived
1
0
Fork 0
Code Activity

gnu: libreoffice: Update to 7.1.4.2.

Browse source 
* gnu/packages/libreoffice.scm (libreoffice)[inputs]: Add box2d, dtoa.
[arguments]: Adjust custom 'prepare-src, 'bin-and-desktop-install phases.
Add custom 'insert-external-tarballs phase. Adjust configure-flags to
build without skia. Remove deprecated make-flag
This commit is contained in:
Efraim Flashner 2021-06-22 12:41:27 +03:00
parent 4aae607119
commit d89ef8a7d8
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/libreoffice.scm
View file

@ -57,6 +57,7 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages game-development)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
@ -1088,7 +1089,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(define-public libreoffice (define-public libreoffice
(package (package
(name "libreoffice") (name "libreoffice")
(version "6.4.7.2") (version "7.1.4.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1097,7 +1098,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
"https://download.documentfoundation.org/libreoffice/src/" "https://download.documentfoundation.org/libreoffice/src/"
(version-prefix version 3) "/libreoffice-" version ".tar.xz")) (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256 (sha256
(base32 "0i3654rmzs8aazj8j3dmxamilslfrki0y4sksg3n1zygc2ddfk83")))) (base32 "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
@ -1110,6 +1111,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(inputs (inputs
`(("bluez" ,bluez) `(("bluez" ,bluez)
("boost" ,boost) ("boost" ,boost)
("box2d" ,box2d)
("clucene" ,clucene) ("clucene" ,clucene)
("cups" ,cups) ("cups" ,cups)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
@ -1180,12 +1182,23 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
("vigra" ,vigra) ("vigra" ,vigra)
("xdg-utils" ,xdg-utils) ("xdg-utils" ,xdg-utils)
("xmlsec" ,xmlsec-nss) ("xmlsec" ,xmlsec-nss)
("zip" ,zip))) ("zip" ,zip)
("dtoa" ; needed after version 6.4.7.2.
,(origin
(method url-fetch)
(uri "https://dev-www.libreoffice.org/src/dtoa-20180411.tgz")
(sha256
(base32 "1d0iwy0q5sjznv23d3nbwmy0r7m1mdzlnv5pc4izddkx9xld10h0"))))))
(arguments (arguments
`(#:tests? #f ; Building the tests already fails. `(#:tests? #f ; Building the tests already fails.
#:make-flags '("build-nocheck") ; Do not build unit tests, which fails.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'insert-external-tarballs
(lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "external/tarballs")
(copy-file (assoc-ref inputs "dtoa")
"external/tarballs/dtoa-20180411.tgz")
#t))
(add-before 'configure 'prepare-src (add-before 'configure 'prepare-src
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* (substitute*
@ -1203,14 +1216,11 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(list "dirname" "grep" "uname")) (list "dirname" "grep" "uname"))
;; GPGME++ headers are installed in a gpgme++ subdirectory, but ;; GPGME++ headers are installed in a gpgme++ subdirectory, but
;; files in "xmlsecurity/source/gpg/" and elsewhere expect to ;; configure is hardcoded to use FHS directories.
;; find them on the include path without a prefix. (substitute* "configure"
(substitute* '("xmlsecurity/Library_xsec_xmlsec.mk" (("GPGMEPP_CFLAGS=-I/usr")
"comphelper/Library_comphelper.mk") (string-append "GPGMEPP_CFLAGS=-I"
(("\\$\\$\\(INCLUDE\\)") (assoc-ref inputs "gpgme"))))
(string-append "$$(INCLUDE) -I"
(assoc-ref inputs "gpgme")
"/include/gpgme++")))
;; /usr/bin/xdg-open doesn't exist on Guix System. ;; /usr/bin/xdg-open doesn't exist on Guix System.
(substitute* '("shell/source/unix/exec/shellexec.cxx" (substitute* '("shell/source/unix/exec/shellexec.cxx"
@ -1261,10 +1271,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
"/bin/soffice") "/bin/soffice")
(symlink-output "/lib/libreoffice/program/soffice" (symlink-output "/lib/libreoffice/program/soffice"
"/bin/libreoffice") "/bin/libreoffice")
(install "workdir/CustomTarget/sysui/share/libreoffice/openoffice.keys"
"/share/mime-info/libreoffice.keys")
(install "workdir/CustomTarget/sysui/share/libreoffice/openoffice.mime"
"/share/mime-info/libreoffice.mime")
(install (install
"workdir/CustomTarget/sysui/share/libreoffice/openoffice.org.xml" "workdir/CustomTarget/sysui/share/libreoffice/openoffice.org.xml"
"/share/mime/packages/libreoffice.xml") "/share/mime/packages/libreoffice.xml")
@ -1298,6 +1304,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
"--without-java" "--without-java"
;; FIXME: Enable once the corresponding inputs are packaged. ;; FIXME: Enable once the corresponding inputs are packaged.
"--disable-coinmp" "--disable-coinmp"
"--disable-skia"
;; This could (Debian does this) be a separate output containing only ;; This could (Debian does this) be a separate output containing only
;; program/libfirebird_sdbclo.so, if there's a way to point to it. ;; program/libfirebird_sdbclo.so, if there's a way to point to it.
"--enable-firebird-sdbc" "--enable-firebird-sdbc"