Add support for Poppler >= 21.11.

This resolves issue #36.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

config.h.cmake

@@ -1,6 +1,7 @@
 #cmakedefine VERSION "@VERSION@"
 
 // poppler-tqt
+#cmakedefine HAVE_POPPLER_2111
 #cmakedefine HAVE_POPPLER_2108
 #cmakedefine HAVE_POPPLER_086
 #cmakedefine HAVE_POPPLER_083

tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake

@@ -24,7 +24,7 @@ check_cxx_source_compiles("
   HAVE_POPPLER_030 )
 tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
 
-foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 )
+foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 )
   string( REPLACE "." "" _poppler_str "${_poppler_ver}" )
   if( NOT DEFINED HAVE_POPPLER_${_poppler_str} )
     message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" )

tdefile-plugins/dependencies/poppler-tqt/poppler-page.cpp

@@ -173,7 +173,11 @@ TQValueList<TextBox*> Page::textList() const
   data->doc->data->doc.displayPageSlice(output_dev, data->index + 1, 72, 72,
       0, false, false, false, -1, -1, -1, -1);
 
+# if defined(HAVE_POPPLER_2111)
+  std::unique_ptr<TextWordList> word_list = output_dev->makeWordList();
+# else
   TextWordList *word_list = output_dev->makeWordList();
+# endif
 
   if (!word_list) {
     delete output_dev;
@@ -193,7 +197,9 @@ TQValueList<TextBox*> Page::textList() const
     output_list.append(text_box);
   }
 
+# if !defined(HAVE_POPPLER_2111)
   delete word_list;
+# endif
   delete output_dev;
 
   return output_list;