cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-08 20:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

all: Bump required glib version

Browse Source 
Require the same version of glib as libfprint, and remove support for
very old versions.
This commit is contained in:
Bastien Nocera
2019-12-04 11:07:12 +01:00
parent 882740f8a1
commit d0df422f9b
7 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -21,11 +21,11 @@ PKG_CHECK_MODULES(FPRINT, [libfprint2 >= 1.90.0])
AC_SUBST(FPRINT_LIBS) AC_SUBST(FPRINT_LIBS)
AC_SUBST(FPRINT_CFLAGS) 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_CFLAGS)
AC_SUBST(GLIB_LIBS) 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_LIBS)
AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_CFLAGS)

4
pam/pam_fprintd.c
View File

@ -468,10 +468,6 @@ PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc,
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); 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, dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID); G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);

4
src/main.c
View File

@ -143,10 +143,6 @@ int main(int argc, char **argv)
context = g_option_context_new ("Fingerprint handler daemon"); context = g_option_context_new ("Fingerprint handler daemon");
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); 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) { if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
g_warning ("couldn't parse command-line options: %s\n", error->message); g_warning ("couldn't parse command-line options: %s\n", error->message);
g_error_free (error); g_error_free (error);

4
utils/delete.c
View File

@ -125,10 +125,6 @@ static void process_devices(char **argv)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init();
#endif
create_manager(); create_manager();
if (argc < 2) { if (argc < 2) {

4
utils/enroll.c
View File

@ -159,10 +159,6 @@ int main(int argc, char **argv)
GError *err = NULL; GError *err = NULL;
DBusGProxy *dev; DBusGProxy *dev;
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init();
#endif
dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN, dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID); G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);

4
utils/list.c
View File

@ -130,10 +130,6 @@ static void process_devices(char **argv)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init();
#endif
create_manager(); create_manager();
if (argc < 2) { if (argc < 2) {

4
utils/verify.c
View File

@ -172,10 +172,6 @@ int main(int argc, char **argv)
DBusGProxy *dev; DBusGProxy *dev;
char *username; char *username;
#if !GLIB_CHECK_VERSION (2, 36, 0)
g_type_init();
#endif
dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN, dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN,
G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID); G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID);