[gnome-desktop-testing/optional-parallel-argument: 1/2] Bump glib requirement to 2.54
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop-testing/optional-parallel-argument: 1/2] Bump glib requirement to 2.54
- Date: Fri, 17 Sep 2021 16:09:48 +0000 (UTC)
commit 68694eb8c88c70c0c7823075ceb5a19dcfe2c703
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Sep 17 12:06:09 2021 -0400
Bump glib requirement to 2.54
This is so we can use g_ascii_string_to_unsigned.
configure.ac | 4 ++--
meson.build | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 077a267..a7c6605 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,10 +28,10 @@ AC_SUBST(WARN_CFLAGS)
LT_PREREQ([2.2.4])
LT_INIT([disable-static])
-PKG_CHECK_MODULES(BUILDDEP_GDT, [gio-unix-2.0 >= 2.50])
+PKG_CHECK_MODULES(BUILDDEP_GDT, [gio-unix-2.0 >= 2.54])
PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no])
AS_IF([test "x$have_systemd" = xyes], [AC_DEFINE([HAVE_SYSTEMD], [1], [Define if you have libsystemd])])
-BUILDDEP_GDT_CFLAGS="$BUILDDEP_GDT_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_50
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_50"
+BUILDDEP_GDT_CFLAGS="$BUILDDEP_GDT_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_54
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_54"
AC_CONFIG_FILES([
Makefile
diff --git a/meson.build b/meson.build
index 0c13bd7..30a9609 100644
--- a/meson.build
+++ b/meson.build
@@ -59,14 +59,14 @@ endif
include_dirs = include_directories('.')
-gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.50')
+gio_unix_dep = dependency('gio-unix-2.0', version : '>=2.54')
libsystemd_dep = dependency('libsystemd', required : get_option('systemd'))
cdata = configuration_data()
cdata.set_quoted('DATADIR', get_option('prefix') / get_option('datadir'))
cdata.set_quoted('LIBEXECDIR', get_option('prefix') / get_option('libexecdir'))
-cdata.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_2_50')
-cdata.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_50')
+cdata.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_2_54')
+cdata.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_54')
if libsystemd_dep.found()
cdata.set('HAVE_SYSTEMD', 1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]