r23479 by jghali - Bump poppler min version to 0.62.0 (version provided by Ubuntu 18.04)

[scribus-commit]

Author: jghali
Date: Mon Mar  2 15:01:39 2020
New Revision: 23479

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23479
Log:
Bump poppler min version to 0.62.0 (version provided by Ubuntu 18.04)

Modified:
    trunk/Scribus/cmake/modules/FindPOPPLER.cmake
    trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp

Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23479&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindPOPPLER.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake	Mon Mar  2 15:01:39 2020
@@ -1,7 +1,7 @@
 include(FindPkgConfig)
-pkg_search_module(POPPLER libpoppler>=0.58.0 poppler>=0.58.0)
+pkg_search_module(POPPLER libpoppler>=0.62.0 poppler>=0.62.0)
 if (POPPLER_FOUND)
-	pkg_search_module(POPPLER_CPP REQUIRED libpoppler-cpp>=0.58.0 poppler-cpp>=0.58.0)
+	pkg_search_module(POPPLER_CPP REQUIRED libpoppler-cpp>=0.62.0 poppler-cpp>=0.62.0)
 endif(POPPLER_FOUND)
  
 find_path(POPPLER_INCLUDE_DIR 

Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23479&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp	Mon Mar  2 15:01:39 2020
@@ -1285,19 +1285,8 @@
 	updateGUICounter = 0;
 #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)
 	m_fontEngine = new SplashFontEngine(true, false, false, true);
-#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)
+#else
 	m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), false, false, true);
-#else
-	m_fontEngine = new SplashFontEngine(
-#if HAVE_T1LIB_H
-	globalParams->getEnableT1lib(),
-#endif
-#if HAVE_FREETYPE_H
-	globalParams->getEnableFreeType(),
-	false,
-	false,
-#endif
-	true);
 #endif
 }