me
/
guix
Archived
1
0
Fork 0
Code

gnu: libreoffice: Update to 7.3.5.2. 

* gnu/packages/libreoffice.scm (libreoffice): Update to 7.3.5.2.
[arguments]: Override DRAGONBOX_CFLAGS; set CPPFLAGS to force c++17 during the
configure phase.
[inputs]: Add dragonbox-for-libreoffice, libfixmath, libtiff, and libwebp.
* gnu/packages/hunspell.scm (hunspell-dictionary): Update hash.
master
Ricardo Wurmus 2022-11-27 17:39:52 +01:00
parent 0bb0fdd2f5
commit 426ef5b46f
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/hunspell.scm
View File

@ -46,7 +46,7 @@
(string-append "libreoffice-" version)))) (string-append "libreoffice-" version))))
(file-name (git-file-name "libreoffice-dictionaries" version)) (file-name (git-file-name "libreoffice-dictionaries" version))
(sha256 (sha256
(base32 "1qyn56kcn2scdlssjgi5b33hnsh20mmnd60w78z0gp7bs0mv0wcs")))) (base32 "115p29ywyn7ncq664gxmcrrz55v23s34asd2hmrg4ahjp7ycrnmy"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(native-inputs (native-inputs
`(("source" ,source))) `(("source" ,source)))

18
gnu/packages/libreoffice.scm
View File

@ -67,6 +67,7 @@
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gstreamer) #:use-module (gnu packages gstreamer)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
@ -1145,7 +1146,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
(define-public libreoffice (define-public libreoffice
(package (package
(name "libreoffice") (name "libreoffice")
(version "7.3.5.2") (version "7.4.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1154,7 +1155,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
"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 "14g9873x8m5yakpq7v9f7lhc5fkxh6yhjhgh0pm30cqmxsqhsglv")))) (base32 "0fyvd4ydh72lmn005h190xa563d4h376pi1fx9lfr5i25qcbpg7z"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
(list (list
@ -1187,13 +1188,18 @@ commonly called @code{ftoa} or @code{dtoa}.")
(("GPGMEPP_CFLAGS=-I/usr/include/gpgme\\+\\+") (("GPGMEPP_CFLAGS=-I/usr/include/gpgme\\+\\+")
(string-append "GPGMEPP_CFLAGS=-I" (string-append "GPGMEPP_CFLAGS=-I"
(search-input-directory inputs (search-input-directory inputs
"include/gpgme++")))) "include/gpgme++")))
(("DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.0.0")
(string-append "DRAGONBOX_CFLAGS=-I"
(search-input-directory inputs
"include/dragonbox-1.0.0"))))
;; /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"
"shell/source/unix/misc/senddoc.sh") "shell/source/unix/misc/senddoc.sh")
(("/usr/bin/xdg-open") (("/usr/bin/xdg-open")
(search-input-file inputs "/bin/xdg-open"))))) (search-input-file inputs "/bin/xdg-open")))
(setenv "CPPFLAGS" "-std=c++17")))
(add-after 'install 'reset-zip-timestamps (add-after 'install 'reset-zip-timestamps
(lambda _ (lambda _
(for-each (lambda (file) (for-each (lambda (file)
@ -1295,6 +1301,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
clucene clucene
cups cups
dbus-glib dbus-glib
dragonbox-for-libreoffice
firebird firebird
fontconfig fontconfig
fontforge fontforge
@ -1315,6 +1322,7 @@ commonly called @code{ftoa} or @code{dtoa}.")
libcdr libcdr
libcmis libcmis
libcuckoo libcuckoo
libfixmath
libjpeg-turbo libjpeg-turbo
libe-book libe-book
libepubgen libepubgen
@ -1331,7 +1339,9 @@ commonly called @code{ftoa} or @code{dtoa}.")
libpagemaker libpagemaker
libqxp libqxp
libstaroffice libstaroffice
libtiff
libvisio libvisio
libwebp
libwpg libwpg
libwps libwps
libxrandr libxrandr