Date: Sunday, March 1, 2020 @ 11:02:48 Author: arojas Revision: 376448
Fix build with poppler 0.86 Added: libreoffice-still/trunk/libreoffice-poppler-0.86.patch Modified: libreoffice-still/trunk/PKGBUILD --------------------------------+ PKGBUILD | 8 ++++++-- libreoffice-poppler-0.86.patch | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-03-01 10:45:53 UTC (rev 376447) +++ PKGBUILD 2020-03-01 11:02:48 UTC (rev 376448) @@ -56,7 +56,8 @@ make-pyuno-work-with-system-wide-module-install.diff soffice-template.desktop.in libreoffice-still.sh libreoffice-still.csh - 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch) + 0001-Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.patch + libreoffice-poppler-0.86.patch) noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip @@ -99,12 +100,15 @@ 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879' 'c1e199f7767a4f42d9a95fc942cda4cf47737c7d67e6f334679c9b2e3e271dc2' '07c28ff8f5258abfe4338efccbdfb1dd35892bd00a2ed7f53b1fc2263f71a8b6' - '77214ebc425916990ed80e9508572fd1d565412e1f8c2289424457e3d9bcbc79') + '77214ebc425916990ed80e9508572fd1d565412e1f8c2289424457e3d9bcbc79' + 'f52ef5d64d7a74ca90bc96614260566720130d91f3764874eac673f6b3336b5e') prepare() { cd libreoffice-$_LOver + patch -p1 -i ../libreoffice-poppler-0.86.patch # Fix build with poppler 0.86 + # move external sources into place mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources for source in "${noextract[@]}"; do Added: libreoffice-poppler-0.86.patch =================================================================== --- libreoffice-poppler-0.86.patch (rev 0) +++ libreoffice-poppler-0.86.patch 2020-03-01 11:02:48 UTC (rev 376448) @@ -0,0 +1,15 @@ +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index e9c2a407c279..16ad04bf660a 100644 +--- 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();