[libreoffice] need at least libreoffice-poppler-0.17.0.patch for new poppler

[Caolan McNamara]

commit 4f6c7713325a99e9b95f6f64ad4d78089a24cca9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 18 13:40:17 2011 +0100

    need at least libreoffice-poppler-0.17.0.patch for new poppler

 libreoffice-poppler-0.17.0.patch |   43 ++++++++++++++++++++++++++++++++++++++
 libreoffice.spec                 |    7 ++++-
 2 files changed, 48 insertions(+), 2 deletions(-)
---
diff --git a/libreoffice-poppler-0.17.0.patch b/libreoffice-poppler-0.17.0.patch
new file mode 100644
index 0000000..343a01f
--- /dev/null
+++ b/libreoffice-poppler-0.17.0.patch
@@ -0,0 +1,43 @@
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index f7741b4..df15a94 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -489,7 +489,11 @@ void PDFOutDev::endPage()
+     printf("endPage\n");
+ }
+ 
++#if POPPLER_CHECK_VERSION(0, 17, 0)
++void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog);
++#else
+ void PDFOutDev::processLink(Link* link, Catalog*)
++#endif
+ {
+     assert(link);
+ 
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index 3ac0f49..27914d3 100644
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -65,6 +65,7 @@ class GfxPath;
+ class GfxFont;
+ class PDFDoc;
+ #ifndef SYSTEM_POPPLER
++#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
+ typedef GString GooString;
+ #endif
+ 
+@@ -193,9 +194,13 @@ namespace pdfi
+         // Convert between device and user coordinates.
+         // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
+         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
+-        
++
++        #if POPPLER_CHECK_VERSION(0, 17, 0)
++        virtual void processLink(AnnotLink *link, Catalog *catalog);
++        #else
+         //----- link borders
+         virtual void processLink(Link *link, Catalog *catalog);
++        #endif
+         
+         //----- save/restore graphics state
+         virtual void saveState(GfxState *state);
diff --git a/libreoffice.spec b/libreoffice.spec
index 4dccc83..0e10311 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -114,6 +114,7 @@ Patch19: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
 Patch20: 0001-Related-rhbz-711087-band-aid.patch
 Patch21: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
 Patch22: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
+Patch23: libreoffice-poppler-0.17.0.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -738,6 +739,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch20 -p1 -b .rhbz711087-band-aid.patch
 %patch21 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
 %patch22 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
+%patch23 -p1 -b .poppler-0.17.0.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2022,8 +2024,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
-* Fri Jul 15 2011 Marek Kasik <mkasik at redhat.com> - 3.4.2.1-2
-- Rebuild (poppler-0.17.0)
+* Mon Jul 18 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.2.1-2
+- Rebuild (poppler-0.17.0), add libreoffice-poppler-0.17.0.patch
+  seeing as the API changed for some reason or other
 
 * Wed Jul 13 2011 David Tardon <dtardon at redhat.com> - 3.4.2.1-1
 - 3.4.2 rc1