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

gnu: libreoffice: Update to 6.4.5.2.

Browse source 
* gnu/packages/libreoffice.scm (libreoffice): Update to 6.4.5.2.
[source]: Remove patch.
* gnu/packages/patches/libreoffice-poppler-compat.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
Efraim Flashner 2020-07-13 09:02:56 +03:00
parent 5cd9cd644c
commit 000498784f
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1211,7 +1211,6 @@ dist_patch_DATA = \
%D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \
%D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \
%D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \
%D%/packages/patches/libreoffice-poppler-compat.patch \
%D%/packages/patches/libsndfile-armhf-type-checks.patch \
%D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch \
%D%/packages/patches/libsndfile-CVE-2017-8362.patch \

5
gnu/packages/libreoffice.scm
View file

@ -1049,7 +1049,7 @@ (define-public libqxp
(define-public libreoffice
(package
(name "libreoffice")
(version "6.4.4.2")
(version "6.4.5.2")
(source
(origin
(method url-fetch)
@ -1057,10 +1057,9 @@ (define-public libreoffice
(string-append
"https://download.documentfoundation.org/libreoffice/src/"
(version-prefix version 3) "/libreoffice-" version ".tar.xz"))
(patches (search-patches "libreoffice-poppler-compat.patch"))
(sha256
(base32
"0y6026h374787yy2f3as1q7clxmgywsfdrj62kw3577wvybqaf2l"))))
"1v4ili9j8d0xfj3q69niski1v65icg8xi09ip2bsk343rawwck3a"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("bison" ,bison)

19
gnu/packages/patches/libreoffice-poppler-compat.patch
View file

@ -1,19 +0,0 @@
Fix type mismatch with Poppler 0.86.
Taken from Arch Linux:
https://git.archlinux.org/svntogit/packages.git/tree/trunk/libreoffice-poppler-0.86.patch?h=packages/libreoffice-fresh
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
if (!(pAction && pAction->getKind() == actionURI))
return;
-#if POPPLER_CHECK_VERSION(0, 72, 0)
+#if POPPLER_CHECK_VERSION(0, 86, 0)
+ const char* pURI = static_cast<LinkURI*>(pAction)->getURI().c_str();
+#elif POPPLER_CHECK_VERSION(0, 72, 0)
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
#else
const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();