LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File libreoffice-poppler-0.17.0-reject-fix.diff of Package libreoffice (Project LibreOffice:Unstable)

Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -9157,16 +9157,6 @@ if test "x$enable_ext_pdfimport" != "xno
       AC_MSG_RESULT([external])
       SYSTEM_POPPLER=YES
       PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
-      AC_LANG_PUSH([C++])
-      save_CXXFLAGS=$CXXFLAGS
-      save_CPPFLAGS=$CPPFLAGS
-      CXXFLAGS="$CXXFLAGS $POPPLER_CFLAGS"
-      CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
-      AC_CHECK_HEADER([cpp/poppler-version.h], [],
-                   [AC_MSG_ERROR([cpp/poppler-version.h not found. Install poppler])], [])
-      CXXFLAGS=$save_CXXFLAGS
-      CPPFLAGS=$save_CPPFLAGS
-      AC_LANG_POP([C++])
   else
       AC_MSG_RESULT([internal])
       SYSTEM_POPPLER=NO
Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
===================================================================
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -46,11 +46,7 @@
 #pragma warning(push, 1)
 #endif
 
-#if POPPLER_CHECK_VERSION(0, 21, 0)
-#include "UTF.h"
-#else
 #include "UTF8.h"
-#endif
 
 #if defined __SUNPRO_CC
 #pragma enable_warn
@@ -158,11 +154,7 @@ void writeBinaryBuffer( const OutputBuff
 void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
 {
     // dump JPEG file as-is
-#if POPPLER_CHECK_VERSION(0, 17, 3)
-    str = str->getBaseStream();
-#else
     str = ((DCTStream *)str)->getRawStream();
-#endif
     str->reset();
 
     int c;
@@ -501,13 +493,7 @@ void PDFOutDev::endPage()
     printf("endPage\n");
 }
 
-#if POPPLER_CHECK_VERSION(0, 19, 0)
-void PDFOutDev::processLink(AnnotLink *link)
-#elif POPPLER_CHECK_VERSION(0, 17, 0)
-void PDFOutDev::processLink(AnnotLink *link, Catalog *)
-#else
 void PDFOutDev::processLink(Link* link, Catalog*)
-#endif
 {
     assert(link);
 
Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
===================================================================
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -65,14 +65,7 @@ class GfxPath;
 class GfxFont;
 class PDFDoc;
 #ifndef SYSTEM_POPPLER
-#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
 typedef GString GooString;
-#else
-#include <cpp/poppler-version.h>
-#define POPPLER_CHECK_VERSION(major,minor,micro) \
-  (POPPLER_VERSION_MAJOR > (major) || \
-   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR > (minor)) || \
-   (POPPLER_VERSION_MAJOR == (major) && POPPLER_VERSION_MINOR == (minor) && POPPLER_VERSION_MICRO >= (micro)))
 #endif
 
 namespace pdfi
@@ -202,13 +195,7 @@ namespace pdfi
         // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
 
         //----- link borders
-	#if POPPLER_CHECK_VERSION(0, 19, 0)
-        virtual void processLink(AnnotLink *link);
-        #elif POPPLER_CHECK_VERSION(0, 17, 0)
-	virtual void processLink(AnnotLink *link, Catalog *catalog);
-        #else
         virtual void processLink(Link *link, Catalog *catalog);
-        #endif
 
         //----- save/restore graphics state
         virtual void saveState(GfxState *state);