From d0df422f9b5b2ad74e4b4ba90ab3af331ec372fe Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 4 Dec 2019 11:07:12 +0100
Subject: [PATCH] all: Bump required glib version

Require the same version of glib as libfprint, and remove support for
very old versions.
---
 configure.ac      | 4 ++--
 pam/pam_fprintd.c | 4 ----
 src/main.c        | 4 ----
 utils/delete.c    | 4 ----
 utils/enroll.c    | 4 ----
 utils/list.c      | 4 ----
 utils/verify.c    | 4 ----
 7 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/configure.ac b/configure.ac
index 41cd6a2..e85e35c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,11 +21,11 @@ PKG_CHECK_MODULES(FPRINT, [libfprint2 >= 1.90.0])
 AC_SUBST(FPRINT_LIBS)
 AC_SUBST(FPRINT_CFLAGS)
 
-PKG_CHECK_MODULES(GLIB, glib-2.0 dbus-glib-1)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.56 dbus-glib-1)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(DAEMON, glib-2.0 dbus-glib-1 gmodule-2.0 polkit-gobject-1 >= 0.91 gio-2.0 >= 2.26)
+PKG_CHECK_MODULES(DAEMON, glib-2.0 dbus-glib-1 gmodule-2.0 polkit-gobject-1 >= 0.91 gio-2.0)
 AC_SUBST(DAEMON_LIBS)
 AC_SUBST(DAEMON_CFLAGS)
 
diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c
index b2eee4d..81db224 100644
--- a/pam/pam_fprintd.c
+++ b/pam/pam_fprintd.c
@@ -468,10 +468,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init();
-#endif
-
 	dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
 					   G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
 
diff --git a/src/main.c b/src/main.c
index 4037808..119d229 100644
--- a/src/main.c
+++ b/src/main.c
@@ -143,10 +143,6 @@ int main(int argc, char **argv)
 	context = g_option_context_new ("Fingerprint handler daemon");
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
 
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init();
-#endif
-
 	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
 		g_warning ("couldn't parse command-line options: %s\n", error->message);
 		g_error_free (error);
diff --git a/utils/delete.c b/utils/delete.c
index 160e936..62d4370 100644
--- a/utils/delete.c
+++ b/utils/delete.c
@@ -125,10 +125,6 @@ static void process_devices(char **argv)
 
 int main(int argc, char **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init();
-#endif
-
 	create_manager();
 
 	if (argc < 2) {
diff --git a/utils/enroll.c b/utils/enroll.c
index 370f7e3..a368587 100644
--- a/utils/enroll.c
+++ b/utils/enroll.c
@@ -159,10 +159,6 @@ int main(int argc, char **argv)
 	GError *err = NULL;
 	DBusGProxy *dev;
 
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init();
-#endif
-
 	dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
 					   G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);
 
diff --git a/utils/list.c b/utils/list.c
index d969752..2bbbe33 100644
--- a/utils/list.c
+++ b/utils/list.c
@@ -130,10 +130,6 @@ static void process_devices(char **argv)
 
 int main(int argc, char **argv)
 {
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init();
-#endif
-
 	create_manager();
 
 	if (argc < 2) {
diff --git a/utils/verify.c b/utils/verify.c
index c828c80..19fd40b 100644
--- a/utils/verify.c
+++ b/utils/verify.c
@@ -172,10 +172,6 @@ int main(int argc, char **argv)
 	DBusGProxy *dev;
 	char *username;
 
-#if !GLIB_CHECK_VERSION (2, 36, 0)
-	g_type_init();
-#endif
-
 	dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
 					   G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);