Change the poppler test from 0.60 to 0.58

because the relevant code changes are related to 0.58

Signed-off-by: Ray Vine <[email protected]>
(cherry picked from commit 594387b4f345169662031732f2c9495d297be17d)

4 files changed, 22 insertions, 22 deletions

diff --git a/config.h.cmake b/config.h.cmake
index a45ebc35..338bd27e 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,7 +1,7 @@
 #cmakedefine VERSION "@VERSION@"
 
 // poppler-tqt
-#cmakedefine HAVE_POPPLER_060
+#cmakedefine HAVE_POPPLER_058
 #cmakedefine HAVE_POPPLER_030
 #cmakedefine HAVE_POPPLER_020
 #cmakedefine HAVE_POPPLER_016
diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
index de1426a0..6fa57f6d 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
+++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
@@ -24,13 +24,13 @@ check_cxx_source_compiles("
   HAVE_POPPLER_030 )
 tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
 
-if( NOT DEFINED HAVE_POPPLER_060 )
-  message( STATUS "Performing Test HAVE_POPPLER_060" )
-  if( NOT POPPLER_VERSION VERSION_LESS "0.60" )
-    set( HAVE_POPPLER_060 1 CACHE INTERNAL "" FORCE )
-    message( STATUS "Performing Test HAVE_POPPLER_060 - Success" )
+if( NOT DEFINED HAVE_POPPLER_058 )
+  message( STATUS "Performing Test HAVE_POPPLER_058" )
+  if( NOT POPPLER_VERSION VERSION_LESS "0.58" )
+    set( HAVE_POPPLER_058 1 CACHE INTERNAL "" FORCE )
+    message( STATUS "Performing Test HAVE_POPPLER_058 - Success" )
   else( )
-    set( HAVE_POPPLER_060 "" CACHE INTERNAL "" FORCE )
-    message( STATUS "Performing Test HAVE_POPPLER_060 - Failed" )
+    set( HAVE_POPPLER_058 "" CACHE INTERNAL "" FORCE )
+    message( STATUS "Performing Test HAVE_POPPLER_058 - Failed" )
   endif( )
 endif( )
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
index 5998ae24..e04f66ac 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
@@ -153,7 +153,7 @@ TQString Document::getInfo( const TQString & type ) const
   if ( data->locked )
     return NULL;
 
-# if defined(HAVE_POPPLER_060)
+# if defined(HAVE_POPPLER_058)
   info = data->doc.getDocInfo();
 # else
   data->doc.getDocInfo( &info );
@@ -170,7 +170,7 @@ TQString Document::getInfo( const TQString & type ) const
   Dict *infoDict = info.getDict();
 
   if (
-#   if defined(HAVE_POPPLER_060)
+#   if defined(HAVE_POPPLER_058)
     infoDict->lookup( (char*)type.latin1() ).isString()
 #   else
     infoDict->lookup( (char*)type.latin1(), &obj )->isString()
@@ -202,13 +202,13 @@ TQString Document::getInfo( const TQString & type ) const
       }
       result += unicodeToTQString( &u, 1 );
     }
-#   if !defined(HAVE_POPPLER_060)
+#   if !defined(HAVE_POPPLER_058)
     obj.free();
     info.free();
 #   endif
     return result;
   }
-# if !defined(HAVE_POPPLER_060)
+# if !defined(HAVE_POPPLER_058)
   obj.free();
   info.free();
 # endif
@@ -223,13 +223,13 @@ TQDateTime Document::getDate( const TQString & type ) const
     return TQDateTime();
 
   Object info;
-# if defined(HAVE_POPPLER_060)
+# if defined(HAVE_POPPLER_058)
   info = data->doc.getDocInfo();
 # else
   data->doc.getDocInfo( &info );
 # endif
   if ( !info.isDict() ) {
-#   if !defined(HAVE_POPPLER_060)
+#   if !defined(HAVE_POPPLER_058)
     info.free();
 #   endif
     return TQDateTime();
@@ -242,7 +242,7 @@ TQDateTime Document::getDate( const TQString & type ) const
   TQString result;
 
   if (
-#   if defined(HAVE_POPPLER_060)
+#   if defined(HAVE_POPPLER_058)
     infoDict->lookup( (char*)type.latin1() ).isString()
 #   else
     infoDict->lookup( (char*)type.latin1(), &obj )->isString()
@@ -256,7 +256,7 @@ TQDateTime Document::getDate( const TQString & type ) const
       TQDate d( year, mon, day );  //CHECK: it was mon-1, Jan->0 (??)
       TQTime t( hour, min, sec );
       if ( d.isValid() && t.isValid() ) {
-#	if !defined(HAVE_POPPLER_060)
+#	if !defined(HAVE_POPPLER_058)
 	obj.free();
 	info.free();
 #	endif
@@ -264,7 +264,7 @@ TQDateTime Document::getDate( const TQString & type ) const
       }
     }
   }
-# if !defined(HAVE_POPPLER_060)
+# if !defined(HAVE_POPPLER_058)
   obj.free();
   info.free();
 # endif
@@ -347,7 +347,7 @@ bool Document::print(const TQString &fileName, TQValueList<int> pageList, double
 
 bool Document::print(const TQString &file, TQValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight)
 {
-#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030)
+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030)
   std::vector<int> pages;
   TQValueList<int>::iterator it;
   for (it = pageList.begin();  it != pageList.end();  ++it ) {
diff --git a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc
index 3c6bafca..45ea5b74 100644
--- a/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc
+++ b/tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc
@@ -129,7 +129,7 @@ TQString Page::getText(const Rectangle &r) const
   TQString result;
   ::Page *p;
 
-#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
   output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
 #else
   output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
@@ -164,7 +164,7 @@ TQValueList<TextBox*> Page::textList() const
 
   TQValueList<TextBox*> output_list;
 
-#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
   output_dev = new TextOutputDev(0, gFalse, 0, gFalse, gFalse);
 #else
   output_dev = new TextOutputDev(0, gFalse, gFalse, gFalse);
@@ -205,14 +205,14 @@ PageTransition *Page::getTransition() const
   {
     Object o;
     PageTransitionParams params;
-#   if defined(HAVE_POPPLER_060)
+#   if defined(HAVE_POPPLER_058)
     o = data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans();
 #   else
     data->doc->data->doc.getCatalog()->getPage(data->index + 1)->getTrans(&o);
 #   endif
     params.dictObj = &o;
     data->transition = new PageTransition(params);
-#   if !defined(HAVE_POPPLER_060)
+#   if !defined(HAVE_POPPLER_058)
     o.free();
 #   endif
   }