From: Klaus Ethgen <Klaus@Ethgen.de>
Date: Sun, 28 Jul 2019 22:14:39 +0000 (+0100)
Subject: Limiting to more recent version of glib and fix travis
X-Git-Tag: v1.5.1~9
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=87e765314a6f7c7d5ed850dea2a63b62965c5e46

Limiting to more recent version of glib and fix travis

g_utf8_make_valid was implemented with glib 2.52. That also causes
builds on ubuntu trusty fail.
---

diff --git a/.travis.yml b/.travis.yml
index 6229169e..23693a86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,10 @@
 language: c
 os: linux
-dist: trusty
+dist: bionic
 sudo: required
 compiler:
   - gcc
   - clang
-addons:
-  apt:
-    sources:
-      - trusty
-    packages:
-      - autoconf
-      - automake
-      - autotools-dev
-      - build-essential
-      - debhelper
-      - dh-autoreconf
-      - dpkg-dev
-      - gnome-doc-utils
-      - gnome-doc-utils
-      - imagemagick
-      - intltool
-      - libexiv2-dev
-      - libgtk2.0-dev
-      - libjpeg-dev
-      - liblcms2-dev
-      - liblircclient-dev
-      - liblua5.1-0-dev
-      - libtiff-dev
-      - libtool
-script: (CFLAGS= ./autogen.sh) && make
+before_install:
+  - sudo apt-get install -y autoconf automake autotools-dev build-essential debhelper dh-autoreconf dpkg-dev gnome-doc-utils gnome-doc-utils imagemagick intltool libexiv2-dev libgtk2.0-dev libjpeg-dev liblcms2-dev liblircclient-dev liblua5.1-0-dev libtiff-dev libtool
+script: (CFLAGS="-fPIC" ./autogen.sh) && make
diff --git a/configure.ac b/configure.ac
index 3cbc03a7..3fe49881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,7 +197,7 @@ else
   prefix=$prefix
 fi
 
-AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.))
+AM_PATH_GLIB_2_0(2.52.0,,AC_MSG_ERROR(GLIB >= 2.52.0 not installed.))
 AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--enable-gtk3], [use gtk3 instead of gtk2]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], m4_ifdef([AM_PATH_GTK_2_0], [no], [auto]), [no])])
 
 if test x$gtk3 = xyes; then