commit: b48e290c7510b8cbdf8c9f440b52dd3720d772a4 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Aug 7 06:32:45 2017 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Aug 7 06:36:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48e290c
x11-misc/lightdm-gtk-greeter: fix 2.0.1-r1 for bug 627208 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../files/lightdm-gtk-greeter-2.0.1-gcc6.patch | 63 +--------------------- ...lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch} | 36 +++---------- .../lightdm-gtk-greeter-2.0.1-r1.ebuild | 3 ++ 3 files changed, 13 insertions(+), 89 deletions(-) diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch index 2ce0b68f85e..f72a93abfc1 100644 --- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch +++ b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch @@ -1,6 +1,5 @@ Bug: https://bugs.gentoo.org/show_bug.cgi?id=619782 -Upstream commits: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/349 - http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/350 +Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/349 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c @@ -23,62 +22,4 @@ Upstream commits: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm- /* Message label */ static gboolean -@@ -1932,11 +1937,11 @@ - { - gtk_widget_show (GTK_WIDGET (username_entry)); - gtk_widget_show (GTK_WIDGET (cancel_button)); -- lightdm_greeter_authenticate (greeter, NULL); -+ lightdm_greeter_authenticate (greeter, NULL, NULL); - } - else if (g_strcmp0 (username, "*guest") == 0) - { -- lightdm_greeter_authenticate_as_guest (greeter); -+ lightdm_greeter_authenticate_as_guest (greeter, NULL); - } - else - { -@@ -1956,7 +1961,7 @@ - set_language (NULL); - } - -- lightdm_greeter_authenticate (greeter, username); -+ lightdm_greeter_authenticate (greeter, username, NULL); - } - } - -@@ -1978,7 +1983,7 @@ - if (lightdm_greeter_get_in_authentication (greeter)) - { - cancelling = TRUE; -- lightdm_greeter_cancel_authentication (greeter); -+ lightdm_greeter_cancel_authentication (greeter, NULL); - set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, NULL); - } - -@@ -2012,7 +2017,7 @@ - - language = get_language (); - if (language) -- lightdm_greeter_set_language (greeter, language); -+ lightdm_greeter_set_language (greeter, language, NULL); - g_free (language); - - session = get_session (); -@@ -2233,7 +2238,7 @@ - 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), NULL); - /* If we have questions pending, then we continue processing - * those, until we are done. (Otherwise, authentication will - * not complete.) */ -@@ -2326,7 +2331,7 @@ - } - } - else -- lightdm_greeter_authenticate_autologin (greeter); -+ lightdm_greeter_authenticate_autologin (greeter, NULL); - } - } - + diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch similarity index 72% copy from x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch copy to x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch index 2ce0b68f85e..81f158b2176 100644 --- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch +++ b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch @@ -1,29 +1,9 @@ -Bug: https://bugs.gentoo.org/show_bug.cgi?id=619782 -Upstream commits: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/349 - http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/350 +Bug: https://bugs.gentoo.org/show_bug.cgi?id=627208 +Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/350 --- a/src/lightdm-gtk-greeter.c +++ b/src/lightdm-gtk-greeter.c -@@ -677,6 +677,9 @@ - - /* Clock */ - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" -+ - static gboolean - clock_timeout_thread (void) - { -@@ -697,6 +700,8 @@ - return TRUE; - } - -+#pragma GCC diagnostic pop -+ - /* Message label */ - - static gboolean -@@ -1932,11 +1937,11 @@ +@@ -1937,11 +1937,11 @@ { gtk_widget_show (GTK_WIDGET (username_entry)); gtk_widget_show (GTK_WIDGET (cancel_button)); @@ -37,7 +17,7 @@ Upstream commits: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm- } else { -@@ -1956,7 +1961,7 @@ +@@ -1961,7 +1961,7 @@ set_language (NULL); } @@ -46,7 +26,7 @@ Upstream commits: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm- } } -@@ -1978,7 +1983,7 @@ +@@ -1983,7 +1983,7 @@ if (lightdm_greeter_get_in_authentication (greeter)) { cancelling = TRUE; @@ -55,7 +35,7 @@ Upstream commits: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm- set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, NULL); } -@@ -2012,7 +2017,7 @@ +@@ -2017,7 +2017,7 @@ language = get_language (); if (language) @@ -64,7 +44,7 @@ Upstream commits: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm- g_free (language); session = get_session (); -@@ -2233,7 +2238,7 @@ +@@ -2238,7 +2238,7 @@ start_session (); else if (lightdm_greeter_get_in_authentication (greeter)) { @@ -73,7 +53,7 @@ Upstream commits: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm- /* If we have questions pending, then we continue processing * those, until we are done. (Otherwise, authentication will * not complete.) */ -@@ -2326,7 +2331,7 @@ +@@ -2331,7 +2331,7 @@ } } else diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild index 6c97d7dc89b..8e116169544 100644 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild +++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild @@ -32,6 +32,9 @@ GENTOO_BG="gentoo-bg_65.jpg" src_prepare() { epatch "${FILESDIR}"/${P}-gcc6.patch + if has_version '>=x11-misc/lightdm-1.19.2'; then + epatch "${FILESDIR}"/${P}-lightdm-1.19.2.patch + fi # Ok, this has to be fixed in the tarball but I am too lazy to do it. # I will fix this once I decide to update the tarball with a new gentoo
