diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-04-05 18:12:49 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-04-05 19:04:42 +0200 |
| commit | b8247fa646d67c9385ffb3c05d1f6a1420cad014 (patch) | |
| tree | eef26b25000b3eadd22b9a6af88738df4f5b97f8 /app-office | |
| parent | profiles: Add ~app-text/poppler-0.87.0 to package.mask (diff) | |
| download | gentoo-b8247fa646d67c9385ffb3c05d1f6a1420cad014.tar.gz gentoo-b8247fa646d67c9385ffb3c05d1f6a1420cad014.tar.bz2 gentoo-b8247fa646d67c9385ffb3c05d1f6a1420cad014.zip | |
app-office/libreoffice: Fix build with poppler-0.86.0
Closes: https://bugs.gentoo.org/711102
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch | 15 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.4.2.2.ebuild | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch new file mode 100644 index 000000000000..c56ba89ade59 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch @@ -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(); diff --git a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild index a6f3687b3c41..b3b6af835f93 100644 --- a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild @@ -252,6 +252,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" + + # TODO: upstream (for now taken from Arch Linux) + "${FILESDIR}/${P}-poppler-0.86.patch" # bug 711102 ) S="${WORKDIR}/${PN}-${MY_PV}" |