diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-07-13 09:02:56 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-07-13 09:02:56 +0300 |
| commit | 000498784f4aae34742b28e72175cebce4cff01e (patch) | |
| tree | e1e675adb10c3622b3e7aba08edac13c8f07b2d0 /gnu/packages/patches/libreoffice-poppler-compat.patch | |
| parent | 5cd9cd644ca493b230cb229e7c46641e94a4e2fa (diff) | |
| download | guix-000498784f4aae34742b28e72175cebce4cff01e.tar guix-000498784f4aae34742b28e72175cebce4cff01e.tar.gz | |
gnu: libreoffice: Update to 6.4.5.2.
* 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.
Diffstat (limited to 'gnu/packages/patches/libreoffice-poppler-compat.patch')
| -rw-r--r-- | gnu/packages/patches/libreoffice-poppler-compat.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/gnu/packages/patches/libreoffice-poppler-compat.patch b/gnu/packages/patches/libreoffice-poppler-compat.patch deleted file mode 100644 index 8dc0b60a12..0000000000 --- a/gnu/packages/patches/libreoffice-poppler-compat.patch +++ /dev/null @@ -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(); |