update to 6.4.5.2

This commit is contained in:
robert 2020-07-02 18:41:18 +00:00
parent 0880adec24
commit 690cf2326d
3 changed files with 10 additions and 29 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.230 2020/07/01 10:18:33 sthen Exp $
# $OpenBSD: Makefile,v 1.231 2020/07/02 18:41:18 robert Exp $
USE_WXNEEDED= Yes
@ -26,7 +26,7 @@ SHARED_LIBS += wpg-0.3-lo 3.3 # 3.3
SHARED_LIBS += wps-0.4-lo 4.10 # 4.10
BV= 6.4
VERSION= ${BV}.4.2
VERSION= ${BV}.5.2
DISTNAME= libreoffice-${VERSION}
WRKDIST= ${WRKDIR}/libreoffice-${VERSION}
PKGNAME= libreoffice-${VERSION}
@ -35,7 +35,6 @@ PKGNAME-kde= libreoffice-kde-${VERSION}
PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
DPB_PROPERTIES= parallel
REVISION-main= 0
EPOCH= 0

View File

@ -60,10 +60,10 @@ SHA256 (libreoffice/liborcus-0.15.3.tar.gz) = DdJvPy5hHFHfnuAtbb8IiHmJ6qQXtz9od8
SHA256 (libreoffice/libpagemaker-0.0.4.tar.xz) = Zq2s1wWn0ZiV4I6sRtHoUTMq3y5zbFZr7xFk56RCUZ0=
SHA256 (libreoffice/libqxp-0.0.2.tar.xz) = 4Te2sRASClLJjt0C69xAle4I0NUpWpQxapgXUAlalFw=
SHA256 (libreoffice/libre-hebrew-1.0.tar.gz) = 9ZYlfB23Bs41eVsY1/ZqTbmdQncl8g6ThJFLU0FCV5o=
SHA256 (libreoffice/libreoffice-6.4.4.2.tar.xz) = VDiFl9/8nDL4FEbm5jT3r3bKDg5aDSe8P+iQM6ARwHg=
SHA256 (libreoffice/libreoffice-dictionaries-6.4.4.2.tar.xz) = 0EwyWKb4qEnSqsYXDMz31db0ckY/Dgrbs4xldyRWLGo=
SHA256 (libreoffice/libreoffice-help-6.4.4.2.tar.xz) = xhrHuc6smqCBO85AXOJbE9wbaYUJzjOCf/fGXf/eJaw=
SHA256 (libreoffice/libreoffice-translations-6.4.4.2.tar.xz) = Sc04Wqvn8ZdEesBkWo/NunWwRkKzj6xJNCqs4gVQmL0=
SHA256 (libreoffice/libreoffice-6.4.5.2.tar.xz) = akzGucqDjKmXuDGB2NFjsZgd4tTRJoOHdB00JFOkkew=
SHA256 (libreoffice/libreoffice-dictionaries-6.4.5.2.tar.xz) = 83wIRNA/G1KTjaDlFT3+5npoi4C5W4zvSUZNeDR1p/g=
SHA256 (libreoffice/libreoffice-help-6.4.5.2.tar.xz) = ZmdcywI6jtiM2tbod8/vVeoTljDN+N8XUWg1x0VuL6I=
SHA256 (libreoffice/libreoffice-translations-6.4.5.2.tar.xz) = T00tdO+06roK1UQO5xYVDIPLOi4leAhNLONXuUNVmKA=
SHA256 (libreoffice/librevenge-0.0.4.tar.bz2) = xRYBzQgyC3VwKBLGSq4GU0CRZNp4Jf0PRRrCxdvnfL8=
SHA256 (libreoffice/libstaroffice-0.0.6.tar.xz) = awDh7YGU5gcr5EQQJdG4iOOTZXJ+1bI+DoySxACdHsQ=
SHA256 (libreoffice/libvisio-0.1.7.tar.xz) = j6+N+HDLJ7CaeHoZWdbGRvqkTQ2KsVGIPfQItxZr6kw=
@ -142,10 +142,10 @@ SIZE (libreoffice/liborcus-0.15.3.tar.gz) = 2602283
SIZE (libreoffice/libpagemaker-0.0.4.tar.xz) = 306496
SIZE (libreoffice/libqxp-0.0.2.tar.xz) = 341760
SIZE (libreoffice/libre-hebrew-1.0.tar.gz) = 531276
SIZE (libreoffice/libreoffice-6.4.4.2.tar.xz) = 231325236
SIZE (libreoffice/libreoffice-dictionaries-6.4.4.2.tar.xz) = 45910896
SIZE (libreoffice/libreoffice-help-6.4.4.2.tar.xz) = 88296340
SIZE (libreoffice/libreoffice-translations-6.4.4.2.tar.xz) = 172568720
SIZE (libreoffice/libreoffice-6.4.5.2.tar.xz) = 236255044
SIZE (libreoffice/libreoffice-dictionaries-6.4.5.2.tar.xz) = 47237244
SIZE (libreoffice/libreoffice-help-6.4.5.2.tar.xz) = 88376816
SIZE (libreoffice/libreoffice-translations-6.4.5.2.tar.xz) = 173031776
SIZE (libreoffice/librevenge-0.0.4.tar.bz2) = 529833
SIZE (libreoffice/libstaroffice-0.0.6.tar.xz) = 706324
SIZE (libreoffice/libvisio-0.1.7.tar.xz) = 854296

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx,v 1.10 2020/03/21 19:44:46 kili Exp $
Fix with poppler-0.86.x.
Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
+++ 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();