me
/
guix
Archived
1
0
Fork 0

gnu: libreoffice: Update to 6.2.8.2.

* gnu/packages/libreoffice.scm (libreoffice): Update to 6.2.8.2.
[sources]: Remove libreoffice-boost.patch, libreoffice-orcus patch,
libreoffice-mdds patch.
[inputs]: Add fontforge, mariadb.
[arguments]: Remove substitution checking for mdds and orcus versions.
From configure-flags, remove outdated flags, add flag to build font
file.
* gnu/packages/patches/libreoffice-boost.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
master
Efraim Flashner 2019-10-29 19:45:15 +02:00
parent 7460f34670
commit e0efda9561
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
3 changed files with 8 additions and 59 deletions

View File

@ -1065,7 +1065,6 @@ dist_patch_DATA = \
%D%/packages/patches/libmpeg2-global-symbol-test.patch \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \
%D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
%D%/packages/patches/libreoffice-boost.patch \
%D%/packages/patches/libreoffice-icu.patch \ %D%/packages/patches/libreoffice-icu.patch \
%D%/packages/patches/libreoffice-glm.patch \ %D%/packages/patches/libreoffice-glm.patch \
%D%/packages/patches/libsndfile-armhf-type-checks.patch \ %D%/packages/patches/libsndfile-armhf-type-checks.patch \

View File

@ -929,7 +929,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.1.5.2") (version "6.2.8.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -939,36 +939,9 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
(version-prefix version 3) "/libreoffice-" version ".tar.xz")) (version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb")) "1npxyj0hklls3jnaxx9kj3r6bgydgrbz6nacy05n0zhq8i6zb5ir"))
(patches (patches (search-patches "libreoffice-icu.patch"
(append (list (origin "libreoffice-glm.patch"))
;; 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"))))
(search-patches "libreoffice-boost.patch"
"libreoffice-icu.patch"
"libreoffice-glm.patch")))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -992,6 +965,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
("cups" ,cups) ("cups" ,cups)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("fontforge" ,fontforge)
("gconf" ,gconf) ("gconf" ,gconf)
("glew" ,glew) ("glew" ,glew)
("glm" ,glm) ("glm" ,glm)
@ -1031,6 +1005,7 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
("libxt" ,libxt) ("libxt" ,libxt)
("libzmf" ,libzmf) ("libzmf" ,libzmf)
("lpsolve" ,lpsolve) ("lpsolve" ,lpsolve)
("mariadb" ,mariadb)
("mdds" ,mdds) ("mdds" ,mdds)
("mythes" ,mythes) ("mythes" ,mythes)
("neon" ,neon) ("neon" ,neon)
@ -1066,13 +1041,6 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
"solenv/gbuild/platform/unxgcc.mk") "solenv/gbuild/platform/unxgcc.mk")
(("/bin/sh") (which "sh"))) (("/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 ;; GPGME++ headers are installed in a gpgme++ subdirectory, but
;; files in "xmlsecurity/source/gpg/" and elsewhere expect to ;; files in "xmlsecurity/source/gpg/" and elsewhere expect to
;; find them on the include path without a prefix. ;; find them on the include path without a prefix.
@ -1161,16 +1129,15 @@ converting QuarkXPress file format. It supports versions 3.1 to 4.1.")
;; With java, the build fails since sac.jar is missing. ;; With java, the build fails since sac.jar is missing.
"--without-java" "--without-java"
;; FIXME: Enable once the corresponding inputs are packaged. ;; FIXME: Enable once the corresponding inputs are packaged.
"--without-system-npapi-headers"
"--disable-coinmp" "--disable-coinmp"
"--disable-firebird-sdbc" ; embedded firebird "--disable-firebird-sdbc" ; embedded firebird
"--disable-gltf"
;; XXX: PDFium support requires fetching an external tarball and ;; XXX: PDFium support requires fetching an external tarball and
;; patching the build scripts to work with GCC5. Try enabling this ;; patching the build scripts to work with GCC5. Try enabling this
;; when our default compiler is >=GCC 6. ;; when our default compiler is >=GCC 6.
"--disable-pdfium" "--disable-pdfium"
"--disable-gtk" ; disable use of GTK+ 2 "--disable-gtk" ; disable use of GTK+ 2
"--without-doxygen"))) "--without-doxygen"
"--enable-build-opensymbol")))
(home-page "https://www.libreoffice.org/") (home-page "https://www.libreoffice.org/")
(synopsis "Office suite") (synopsis "Office suite")
(description "LibreOffice is a comprehensive office suite. It contains (description "LibreOffice is a comprehensive office suite. It contains

View File

@ -1,17 +0,0 @@
Fix compatibility with newer Boost.
Extracted from this upstream commit:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=23a8d5ffbbe58761b89f590f0735abccd69a3681
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -144,7 +144,7 @@ bool LoadModule()
#endif // ENABLE_QUICKSTART_APPLET
}
assert(!boost::logic::indeterminate(loaded));
- return loaded;
+ return bool(loaded);
}
}