ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libreoffice: Update to 7.5.1.2.

Browse source 
* gnu/packages/libreoffice.scm (libreoffice): Update to 7.5.1.2.
[arguments]: Adjust 'prepare-src phase for newer dragonbox dependency.
Remove outdated configure flag.
[inputs]: Replace dragonbox-for-libreoffice with dragonbox. Replace
harfbuzz with harfbuzz-5.
(dragonbox-for-libreoffice): Remove package.
* gnu/packages/hunspell.scm (hunspell-dictonary): Update to 7.5.1.2.
This commit is contained in:
Efraim Flashner 2023-03-08 10:14:13 +02:00
parent 346048a40c
commit 203578eef2
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/hunspell.scm
View file

@ -276,7 +276,7 @@ (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page licen
(#\_ #\-)
(chr chr))
(string-downcase dict-name))))
(version "7.5.0.3")
(version "7.5.1.2")
(source
(origin
(method git-fetch)

29
gnu/packages/libreoffice.scm
View file

@ -887,21 +887,6 @@ (define-public dragonbox
commonly called @code{ftoa} or @code{dtoa}.")
(license license:asl2.0)))
(define-public dragonbox-for-libreoffice
(package
(inherit dragonbox)
(name "dragonbox")
(version "1.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jk-jeon/dragonbox")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"11h9xhpzp61rfyh1nnca5shzi40skgpdql080k5cb6cfy672s1qz"))))))
(define dtoa
(origin
(method url-fetch)
@ -914,7 +899,7 @@ (define dtoa
(define-public libreoffice
(package
(name "libreoffice")
(version "7.5.0.3")
(version "7.5.1.2")
(source
(origin
(method url-fetch)
@ -923,7 +908,7 @@ (define-public libreoffice
"https://download.documentfoundation.org/libreoffice/src/"
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(sha256
(base32 "0fq0fxwhbhikqzfl2z5xg2swlnrkg1p8l0shh6qdx9w0msihy4pm"))))
(base32 "1dy0lvrvgkr7mbmiag26a38pivcddav8piph7jin1kw4phaxs3cj"))))
(build-system glib-or-gtk-build-system)
(arguments
(list
@ -969,10 +954,10 @@ (define-public libreoffice
(string-append "GPGMEPP_CFLAGS=-I"
(search-input-directory inputs
"include/gpgme++")))
(("DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1.0.0")
(("DRAGONBOX_CFLAGS=-I/usr/include/dragonbox-1\\.1\\.3")
(string-append "DRAGONBOX_CFLAGS=-I"
(search-input-directory inputs
"include/dragonbox-1.0.0"))))
"include/dragonbox-1.1.3"))))
;; /usr/bin/xdg-open doesn't exist on Guix System.
(substitute* '("shell/source/unix/exec/shellexec.cxx"
@ -1047,8 +1032,6 @@ (define (install-appdata app)
(dirname
(search-input-file %build-inputs
"lib/libboost_system.so")))
;; Avoid a dependency on ucpp.
"--with-idlc-cpp=cpp"
;; The fonts require an external tarball (crosextrafonts).
;; They should not be needed when system fonts are available.
"--without-fonts"
@ -1085,7 +1068,7 @@ (define (install-appdata app)
clucene
cups
dbus-glib
dragonbox-for-libreoffice
dragonbox
firebird
fontconfig
fontforge
@ -1099,7 +1082,7 @@ (define (install-appdata app)
graphite2
gst-plugins-base
gtk+
harfbuzz
harfbuzz-5
hunspell
hyphen
libabw