From 53471ab86019d104cddb3a1b8c96400c8da0838b Mon Sep 17 00:00:00 2001 From: John Darrington Date: Fri, 6 Jul 2018 16:19:24 +0200 Subject: [PATCH] Increase the required Gtk+ version to 3.18.0 Since ssw requires this version it is not sensible for pspp have different requirements. * configure.ac: Update Gtk+ version number. * INSTALL: Update Gtk+ version number. --- INSTALL | 2 +- NEWS | 6 ++++-- configure.ac | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index b1166b20b6..d4f982e193 100644 --- a/INSTALL +++ b/INSTALL @@ -89,7 +89,7 @@ use the GUI, you must run `configure' with --without-gui. 0.18 and 0.19 have a bug that will prevent library detection, but other versions should be fine. - * GTK+ (http://www.gtk.org/), version 3.14.5 or later. + * GTK+ (http://www.gtk.org/), version 3.18.0 or later. It has been reported that versions prior to 3.22.x give problems, so a recent version is recommended. diff --git a/NEWS b/NEWS index 8bb992571f..78cb95ad75 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,10 @@ Changes from 1.0.1 to 1.1.0: - zlib is now a required dependency. (Previously it was optional.) - * The code implementing the sheet rendering has been removed. Instead we - use a third party library: spread-sheet-widget. + - Gtk+3.18.0 or later must now be used when building. + + - The code implementing the sheet rendering has been removed. Instead we + use a third party library: spread-sheet-widget. * The "NOMISSING" keyword when generating syntax for piecharts in the frequencies command was omitted. This has been corrected. diff --git a/configure.ac b/configure.ac index 5e2c714b60..e423e71206 100644 --- a/configure.ac +++ b/configure.ac @@ -106,8 +106,8 @@ if test "$with_cairo" != no && test "$with_gui" != "no"; then PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [], [PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])]) - PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.14.5], [], - [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.14.5 or later (or use --without-gui)])]) + PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.18.0], [], + [PSPP_REQUIRED_PREREQ([gtk+ 3.0 version 3.18.0 or later (or use --without-gui)])]) PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-3.0 >= 3.4.2], [], [PSPP_REQUIRED_PREREQ([gtksourceview 3.0 version 3.4.2 or later (or use --without-gui)])]) -- 2.30.2