[poppler] CMakeLists.txt configure.ac

Albert Astals Cid aacid at kemper.freedesktop.org
Wed Sep 28 21:24:12 UTC 2016


 CMakeLists.txt |    2 +-
 configure.ac   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 27cf7fabad27648019b36b2d6352e6767bfc8689
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Sep 28 23:23:33 2016 +0200

    Increase glib requirement
    
    Seems we've been requiring it for a while at least.
    
    See "Build fail on Ubuntu 14.04" thread on the mailing list

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d59a6fc..c86922a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,7 @@ set(TEXTOUT_WORD_LIST ON)
 # setting the minimum required versions for some components
 set(QT4_MIN_VERSION "4.7.0")
 set(CAIRO_VERSION "1.10.0")
-set(GLIB_REQUIRED "2.18")
+set(GLIB_REQUIRED "2.41")
 
 macro_bool_to_01(ENABLE_SPLASH HAVE_SPLASH)
 find_package(Freetype REQUIRED)
diff --git a/configure.ac b/configure.ac
index c4cfc2c..f0303e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -639,7 +639,7 @@ if test x$enable_cairo_output = xyes; then
   POPPLER_GLIB_DISABLE_DEPRECATED=""
   POPPLER_GLIB_DISABLE_SINGLE_INCLUDES=""
 
-  GLIB_REQUIRED=2.18
+  GLIB_REQUIRED=2.41
   AC_SUBST(GLIB_REQUIRED)
   AC_ARG_ENABLE(poppler-glib,
 	        AC_HELP_STRING([--disable-poppler-glib],


More information about the poppler mailing list