Commit 460863e6 authored by J0WI's avatar J0WI

community/libreoffice: upgrade to 6.4.5.2

parent 2af74886
Pipeline #36561 failed with stages
in 360 minutes and 24 seconds
......@@ -2,8 +2,8 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libreoffice
pkgver=6.4.4.2
pkgrel=2
pkgver=6.4.5.2
pkgrel=0
pkgdesc="LibreOffice - Meta package for the full office suite"
url="https://www.libreoffice.org/"
arch="all !s390x !mips !mips64"
......@@ -134,7 +134,6 @@ source="https://download.documentfoundation.org/libreoffice/src/$_v/libreoffice-
disable-liborcus-unittest.patch
musl-stacksize.patch
musl-libintl.patch
fix-poppler.patch
"
# secfixes:
......@@ -455,9 +454,9 @@ sdk_doc() {
_split sdk_doc
}
sha512sums="8e2b6a2d34fbc182ce4ec0b6d6bfb30665ff5cee0a27a22551c71d4eddf63b812d676ea8dea9a2e4bb028a2365b5e23908679efbe4696032e1abeedecb85b8d3 libreoffice-6.4.4.2.tar.xz
db90516f448bb67b0e36fb3d97589253261a6d349e6b33842e59d817d9f9c1a4c0f56113f676cf2028d476766bcfd6ad87c7c84b4e7f605b2482842ea77dba71 libreoffice-dictionaries-6.4.4.2.tar.xz
8d52f17c50202884c9d18f70d0162a6caee27caf9ec1c52b963f97dfb122433ccdc204da153245901a1f92ead2655582fabb6fa6b9a890dec5a3eca03c3c148b libreoffice-translations-6.4.4.2.tar.xz
sha512sums="f0a5ac37b9c8e46bfd50bf9137d193a83d55d8d451c5b27d86b7f257633e861eb79422e1e64f7c462ae4a9045e00827beed302ab6f0773f8864c03bb11d3b752 libreoffice-6.4.5.2.tar.xz
4a4f9346bc5bb67a21c6d3499f8a5bb0a837f579c198cf45946a43a61fdbc073b2abd5a3b4fe2f6579934cd83bb409b2019459e6b8967472401011834b7b7a14 libreoffice-dictionaries-6.4.5.2.tar.xz
a7bc0f95edbeeea36fd832f5ce91e38e3803d7be1b56a5b3626cc5251eb6e1a25ad482b2cc1fb61a463470237805eecebaaf3efd375cb44e65b6cc5187cc8bfe libreoffice-translations-6.4.5.2.tar.xz
a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
9fe106bbdb55365f589246e5a0d10bbe9b35224132b66a1823dc6361633a67f2acc0e8c393dc7ed70d086858d16d242b8806b8b2184c98e3d20d0be85bed9c44 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
......@@ -483,5 +482,4 @@ d5e4b5cc2b1528d474dc60e4f9c65f679c199dcf48495b4bef8187edaccf13cfaf2be667344f303c
417ad2849ff9e189ec0247bbd5fe241988e6377a17a0842013eebf1879627fb520408ce97088827eaff8b4c37b702c9946bde2799d2ac61fac6f040ad078de8f fix-execinfo.patch
121827c1eaa0d09a8ccc757e18c7306fef0b8a22335a1910606d1a59891b8ae33fbe85581baa8b2da79dafd27d952d89c4402f0ffb37cb4f702418d50abf0c90 disable-liborcus-unittest.patch
9abb0b14b7c408705569f26f6ed6519630ee7b98ff9c959eb53bb5efec6c08cae906f3c82943aee21098ab09c6caf58443a0dbe347d7dc5c8b6637f3665abca2 musl-stacksize.patch
d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3 musl-libintl.patch
9f4755f5773e6c98f675dd4082878b4a4c32b6706f8ff669b231cea682394f921eab9392ca3681e63512bfb19bff69ced5ee0ff8fd300995303b4b3eeef561df fix-poppler.patch"
d99d074e89e2713a3b6a56fa60d9d989ca6eefc8884ccbf88cb16c7b09da6dde4ba4ebc6a4d8408b61a08088df7cb1bcda60738f91e5569179fc45d7e9b901a3 musl-libintl.patch"
--- 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();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment