editors/libreoffice and poppler-0.86

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

editors/libreoffice and poppler-0.86

Matthias Kilian
Hi,

whatever I do about the type insanities in poppler-glib pointed out
by Greg, this one will be required to build libreoffice against
poppler-0.86.x in any case.

ok?

Ciao,
        Kili

Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
===================================================================
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 20 Mar 2020 22:55:12 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+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();

Reply | Threaded
Open this post in threaded view
|

Re: editors/libreoffice and poppler-0.86

Robert Nagy
Hi

Sure thing!

On 21/03/20 00:01 +0100, Matthias Kilian wrote:

> Hi,
>
> whatever I do about the type insanities in poppler-glib pointed out
> by Greg, this one will be required to build libreoffice against
> poppler-0.86.x in any case.
>
> ok?
>
> Ciao,
> Kili
>
> Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> ===================================================================
> RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 20 Mar 2020 22:55:12 -0000
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +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();

--
Regards,
Robert Nagy