From a2737a61353e305a9ee69640fb20d4582c218008 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 23 Mar 2020 13:40:03 +0100 Subject: [PATCH] - fix building with poppler 0.86 --- libreoffice.spec | 2 ++ poppler-0.86.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 poppler-0.86.patch diff --git a/libreoffice.spec b/libreoffice.spec index c8004fc..2823fd3 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -96,6 +96,7 @@ Patch0: disable-failing-test.patch Patch1: mdds-1.5-orcus-0.15.patch Patch2: poppler-0.82.patch Patch3: poppler-0.83.patch +Patch4: poppler-0.86.patch URL: http://www.documentfoundation.org/ BuildRequires: /usr/bin/getopt @@ -3029,6 +3030,7 @@ dialogs. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 for dir in *-%{version}; do [ -f $dir/ChangeLog ] && mv $dir/ChangeLog ChangeLog-$dir diff --git a/poppler-0.86.patch b/poppler-0.86.patch new file mode 100644 index 0000000..76b8356 --- /dev/null +++ b/poppler-0.86.patch @@ -0,0 +1,14 @@ +--- libreoffice-6.3.0.4/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx~ 2020-03-23 11:28:30.000000000 +0100 ++++ libreoffice-6.3.0.4/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2020-03-23 11:31:46.670106683 +0100 +@@ -564,7 +564,11 @@ + return; + + #if POPPLER_CHECK_VERSION(0, 72, 0) ++#if POPPLER_CHECK_VERSION(0, 86, 0) ++ const char* pURI = static_cast(pAction)->getURI().c_str(); ++#else + const char* pURI = static_cast(pAction)->getURI()->c_str(); ++#endif + #else + const char* pURI = static_cast(pAction)->getURI()->getCString(); + #endif -- 2.44.0