mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-26 06:18:07 -05:00
gnu: LibreOffice: Update to 6.1.5.2.
* gnu/packages/libreoffice.scm (libreoffice): Update to 6.1.5.2. [source]: Remove obsolete Poppler patches.
This commit is contained in:
parent
5cfb647c52
commit
a4fc80254a
1 changed files with 3 additions and 33 deletions
|
@ -930,7 +930,7 @@ (define-public libqxp
|
|||
(define-public libreoffice
|
||||
(package
|
||||
(name "libreoffice")
|
||||
(version "6.1.3.2")
|
||||
(version "6.1.5.2")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -940,7 +940,7 @@ (define-public libreoffice
|
|||
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0i4gf3qi16fg7dxq2l4vhkwh4f5lx7xd1ilpzcw26vccqkv3hvyl"))
|
||||
"1wh8qhqkmb89nmfcb0w6iwpdzxwqr7c5kzxgpk4gy60xin6gwjgb"))
|
||||
(patches
|
||||
(append (list (origin
|
||||
;; Support newer versions of Orcus and MDDS. These patches
|
||||
|
@ -966,37 +966,7 @@ (define-public libreoffice
|
|||
(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"))))
|
||||
"0apbmammmp4pk473xiv5vk50r4c5gjvqzf9jkficksvz58q6114f"))))
|
||||
(search-patches "libreoffice-boost.patch"
|
||||
"libreoffice-icu.patch"
|
||||
"libreoffice-glm.patch")))
|
||||
|
|
Loading…
Reference in a new issue