From 05984c1d86db00d2c3a6b058c3c870f233748a4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 18 Jul 2011 15:35:53 +0100
Subject: [PATCH] tweak this

---
 libreoffice-poppler-0.17.0.patch | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/libreoffice-poppler-0.17.0.patch b/libreoffice-poppler-0.17.0.patch
index 343a01f..2f37978 100644
--- a/libreoffice-poppler-0.17.0.patch
+++ b/libreoffice-poppler-0.17.0.patch
@@ -15,18 +15,21 @@ index f7741b4..df15a94 100644
      assert(link);
  
 diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index 3ac0f49..27914d3 100644
+index 3ac0f49..0fd43c5 100644
 --- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
 +++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -65,6 +65,7 @@ class GfxPath;
+@@ -65,7 +65,10 @@ class GfxPath;
  class GfxFont;
  class PDFDoc;
  #ifndef SYSTEM_POPPLER
 +#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
  typedef GString GooString;
++#else
++#include <glib/poppler-features.h>
  #endif
  
-@@ -193,9 +194,13 @@ namespace pdfi
+ namespace pdfi
+@@ -193,9 +196,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);