From b36af5410ffd49fb455f7137cd3d66e1ed329b92 Mon Sep 17 00:00:00 2001
From: Roland Lutz <rlutz@hedmen.org>
Date: Tue, 22 Dec 2020 23:18:17 +0100
Subject: [PATCH] Allow building with older library versions

This partially reverts commit 2957627bbd97aa1cfac66464095c7bd55e88541b.
---
 README           | 10 +++++-----
 configure.ac     | 28 ++++++++++++++--------------
 m4/geda-cairo.m4 | 24 ++++++++++++++----------
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/README b/README
index e11877ff0..022205a03 100644
--- a/README
+++ b/README
@@ -101,15 +101,15 @@ their development files:
  - Guile 2.2 ("GNU's Ubiquitous Intelligent Language for Extensions")
    >= 2.2.4 <https://www.gnu.org/software/guile/>
 
- - GLib 2.0 >= 2.58.3 <https://www.gtk.org/>
+ - GLib 2.0 >= 2.41.1 <https://www.gtk.org/>
 
- - GTK+ 2.0 (the Gimp Toolkit) >= 2.24.32 <https://www.gtk.org/>
+ - GTK+ 2.0 (the Gimp Toolkit) >= 2.18.0 <https://www.gtk.org/>
 
- - GDK Pixbuf 2.0 >= 2.38.1 <https://www.gtk.org/>
+ - GDK Pixbuf 2.0 >= 2.18.0 <https://www.gtk.org/>
 
- - Pango >= 1.42.3 <https://pango.gnome.org/>
+ - Pango >= 1.23.0 <https://pango.gnome.org/>
 
- - Cairo >= 1.16.0 <https://cairographics.org/>
+ - Cairo >= 1.8.0 <https://cairographics.org/>
 
  - CPython 2.7 >= 2.7.16 <https://www.python.org/downloads/>
 
diff --git a/configure.ac b/configure.ac
index 1e66194b7..8f63b5a5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,30 +83,30 @@ PKG_PROG_PKG_CONFIG
 
 AX_CHECK_GUILE([2.0.10])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.58.3], ,
-  AC_MSG_ERROR([GLib 2.58.3 or later is required.]))
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.41.1], ,
+  AC_MSG_ERROR([GLib 2.41.1 or later is required.]))
 
-PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.58.3], ,
-  AC_MSG_ERROR([GIO 2.58.3 or later is required.]))
+PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.20.0], ,
+  AC_MSG_ERROR([GIO 2.20.0 or later is required.]))
 
-PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.24.32], ,
-  AC_MSG_ERROR([GTK+ 2.24.32 or later is required.]))
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.18.0], ,
+  AC_MSG_ERROR([GTK+ 2.18.0 or later is required.]))
 GTK_CFLAGS=`echo "$GTK_CFLAGS" | sed "s/-I\\(@<:@^ @:>@*gtk\\)/-isystem\\1/g"`
 
-PKG_CHECK_MODULES(GDK, [gdk-2.0 >= 2.24.32], ,
-  AC_MSG_ERROR([GDK 2.24.32 or later is required.]))
+PKG_CHECK_MODULES(GDK, [gdk-2.0 >= 2.18.0], ,
+  AC_MSG_ERROR([GDK 2.18.0 or later is required.]))
 GDK_CFLAGS=`echo "$GDK_CFLAGS" | sed "s/-I\\(@<:@^ @:>@*gtk\\)/-isystem\\1/g"`
 
-PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0 >= 2.38.1], ,
-  AC_MSG_ERROR([GDK_PIXBUF 2.38.1 or later is required.]))
+PKG_CHECK_MODULES(GDK_PIXBUF, [gdk-pixbuf-2.0 >= 2.18.0], ,
+  AC_MSG_ERROR([GDK_PIXBUF 2.18.0 or later is required.]))
 
 AX_CHECK_CAIRO
 
-PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo >= 1.42.3], ,
-  AC_MSG_ERROR([PANGOCAIRO 1.42.3 or later is required.]))
+PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo >= 0.26], ,
+  AC_MSG_ERROR([PANGOCAIRO 0.26 or later is required.]))
 
-PKG_CHECK_MODULES(PANGO, [pango >= 1.42.3], ,
-  AC_MSG_ERROR([PANGO 1.42.3 or later is required.]))
+PKG_CHECK_MODULES(PANGO, [pango >= 1.23.0], ,
+  AC_MSG_ERROR([PANGO 1.23.0 or later is required.]))
 
 #####################################################################
 # Header files & particular functions
diff --git a/m4/geda-cairo.m4 b/m4/geda-cairo.m4
index 545465489..75aa783e3 100644
--- a/m4/geda-cairo.m4
+++ b/m4/geda-cairo.m4
@@ -24,15 +24,19 @@ AC_DEFUN([AX_CHECK_CAIRO],
 
   # In Cairo >= 1.10, need to check for Cairo PDF/SVG/PS/PNG support
   # separately.
-  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.16.0], [],
-    AC_MSG_ERROR([Cairo 1.16.0 or later is required.]))
-  PKG_CHECK_MODULES([CAIRO_PNG], [cairo-png >= 1.16.0], ,
-    AC_MSG_ERROR([Cairo PNG support 1.16.0 or later is required.]))
-  PKG_CHECK_MODULES([CAIRO_PDF], [cairo-pdf >= 1.16.0], ,
-    AC_MSG_ERROR([Cairo PDF support 1.16.0 or later is required.]))
-  PKG_CHECK_MODULES([CAIRO_PS], [cairo-ps >= 1.16.0], ,
-    AC_MSG_ERROR([Cairo PostScript support 1.16.0 or later is required.]))
-  PKG_CHECK_MODULES([CAIRO_SVG], [cairo-svg >= 1.16.0], ,
-    AC_MSG_ERROR([Cairo SVG support 1.16.0 or later is required.]))
+  PKG_CHECK_MODULES([CAIRO], [cairo >= 1.10], [CAIRO=yes], [CAIRO=no])
+  if test "$CAIRO" = "yes"; then
+    PKG_CHECK_MODULES([CAIRO_PNG], [cairo-png >= 1.10], ,
+      AC_MSG_ERROR([Cairo PNG support 1.10.0 or later is required.]))
+    PKG_CHECK_MODULES([CAIRO_PDF], [cairo-pdf >= 1.10], ,
+      AC_MSG_ERROR([Cairo PDF support 1.10.0 or later is required.]))
+    PKG_CHECK_MODULES([CAIRO_PS], [cairo-ps >= 1.10], ,
+      AC_MSG_ERROR([Cairo PostScript support 1.10.0 or later is required.]))
+    PKG_CHECK_MODULES([CAIRO_SVG], [cairo-svg >= 1.10], ,
+      AC_MSG_ERROR([Cairo SVG support 1.10.0 or later is required.]))
+  else
+    PKG_CHECK_MODULES([CAIRO], [cairo >= 1.8], [],
+      AC_MSG_ERROR([Cairo 1.8.0 or later is required.]))
+  fi
 
 ])dnl AX_CHECK_CAIRO
-- 
2.11.4.GIT