From da0ed0f065aa8bd21ab4e819ff028b71f4d6de1d Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 23 Sep 2018 03:11:12 -0300 Subject: [PATCH] lightdm-gtk-greeter: fix build with lightdm >= 1.19.3 resolves void-linux/void-packagaes#3014 --- .../fix-lightdm=1.19.3-compilation.patch | 75 +++++++++++++++++++ srcpkgs/lightdm-gtk-greeter/template | 2 +- 2 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/lightdm-gtk-greeter/patches/fix-lightdm=1.19.3-compilation.patch diff --git a/srcpkgs/lightdm-gtk-greeter/patches/fix-lightdm=1.19.3-compilation.patch b/srcpkgs/lightdm-gtk-greeter/patches/fix-lightdm=1.19.3-compilation.patch new file mode 100644 index 00000000000..161294ee0e5 --- /dev/null +++ b/srcpkgs/lightdm-gtk-greeter/patches/fix-lightdm=1.19.3-compilation.patch @@ -0,0 +1,75 @@ +Source: Gentoo (Adapted) +Upstream: No +Reason: Fixes compilation with lightdm newer than 1.19.3 + +diff --git a/src/lightdm-gtk-greeter.c b/src/lightdm-gtk-greeter.c +index 4204d14..80c2a2f 100644 +--- a/src/lightdm-gtk-greeter.c ++++ b/src/lightdm-gtk-greeter.c +@@ -948,11 +948,11 @@ start_authentication (const gchar *username) + { + gtk_widget_show (GTK_WIDGET (username_entry)); + gtk_widget_show (GTK_WIDGET (cancel_button)); +- lightdm_greeter_authenticate (greeter, NULL); ++ lightdm_greeter_authenticate (greeter, NULL, &error); + } + else if (g_strcmp0 (username, "*guest") == 0) + { +- lightdm_greeter_authenticate_as_guest (greeter); ++ lightdm_greeter_authenticate_as_guest (greeter, &error); + } + else + { +@@ -972,7 +972,7 @@ start_authentication (const gchar *username) + set_language (NULL); + } + +- lightdm_greeter_authenticate (greeter, username); ++ lightdm_greeter_authenticate (greeter, username, &error); + } + } + +@@ -982,6 +982,7 @@ cancel_authentication (void) + GtkTreeModel *model; + GtkTreeIter iter; + gboolean other = FALSE; ++ GError *error = NULL; + + if (pending_questions) + { +@@ -994,7 +995,7 @@ cancel_authentication (void) + if (lightdm_greeter_get_in_authentication (greeter)) + { + cancelling = TRUE; +- lightdm_greeter_cancel_authentication (greeter); ++ lightdm_greeter_cancel_authentication (greeter, &error); + set_message_label (""); + } + +@@ -1031,7 +1032,7 @@ start_session (void) + + language = get_language (); + if (language) +- lightdm_greeter_set_language (greeter, language); ++ lightdm_greeter_set_language (greeter, language, &error); + g_free (language); + + session = get_session (); +@@ -1362,6 +1363,8 @@ G_MODULE_EXPORT + void + login_cb (GtkWidget *widget) + { ++ GError *error = NULL; ++ + /* Reset to default screensaver values */ + if (lightdm_greeter_get_lock_hint (greeter)) + XSetScreenSaver(gdk_x11_display_get_xdisplay(gdk_display_get_default ()), timeout, interval, prefer_blanking, allow_exposures); +@@ -1375,7 +1378,7 @@ login_cb (GtkWidget *widget) + start_session (); + else if (lightdm_greeter_get_in_authentication (greeter)) + { +- lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry)); ++ lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry), &error); + /* If we have questions pending, then we continue processing + * those, until we are done. (Otherwise, authentication will + * not complete.) */ diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template index c2f8594630e..563861b1970 100644 --- a/srcpkgs/lightdm-gtk-greeter/template +++ b/srcpkgs/lightdm-gtk-greeter/template @@ -2,6 +2,7 @@ pkgname=lightdm-gtk-greeter version=1.8.5 revision=3 +patch_args="-Np1" build_style=gnu-configure configure_args="--disable-static --with-gtk2 --enable-compile-warnings=no" @@ -16,4 +17,3 @@ license="GPL-3, LGPL-3" homepage="https://launchpad.net/lightdm-gtk-greeter" distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz" checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68 -broken="lightdm-gtk-greeter.c:1378:9: error: too few arguments to function lightdm_greeter_respond"