Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm-gtk-greeter/files/, x11-misc/lightdm-gtk-greeter/
Date: Mon, 22 Oct 2018 07:26:07
Message-Id: 1540193149.58cad721d2e1e65ceb2d2898a927a252fba4ba4a.polynomial-c@gentoo
1 commit: 58cad721d2e1e65ceb2d2898a927a252fba4ba4a
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 22 07:25:49 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 22 07:25:49 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58cad721
7
8 x11-misc/lightdm-gtk-greeter: Removed old.
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 x11-misc/lightdm-gtk-greeter/Manifest | 1 -
14 .../files/lightdm-gtk-greeter-2.0.1-gcc6.patch | 25 --------
15 .../lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch | 64 ---------------------
16 .../lightdm-gtk-greeter-2.0.1-r1.ebuild | 67 ----------------------
17 4 files changed, 157 deletions(-)
18
19 diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
20 index b75fc71595a..b5b3df1018a 100644
21 --- a/x11-misc/lightdm-gtk-greeter/Manifest
22 +++ b/x11-misc/lightdm-gtk-greeter/Manifest
23 @@ -1,4 +1,3 @@
24 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
25 -DIST lightdm-gtk-greeter-2.0.1.tar.gz 467375 BLAKE2B 9b6e4c597b0dcace770609f7bbe55dac627445b609619b7965566e964f1584bb75ed3ff7d45567dbdded5fb777578043990b9f8ba6f17d27951adf222740cee8 SHA512 fd41cae828f7feafb462143519500d0d98a8b6729eb5ffd9be4247d47fa0074fa00ac9892c8cbdda9d7656e9d6949ae65e69911ae911269e99e80e4fefb19a08
26 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
27 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
28
29 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
30 deleted file mode 100644
31 index f72a93abfc1..00000000000
32 --- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-gcc6.patch
33 +++ /dev/null
34 @@ -1,25 +0,0 @@
35 -Bug: https://bugs.gentoo.org/show_bug.cgi?id=619782
36 -Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/349
37 -
38 ---- a/src/lightdm-gtk-greeter.c
39 -+++ b/src/lightdm-gtk-greeter.c
40 -@@ -677,6 +677,9 @@
41 -
42 - /* Clock */
43 -
44 -+#pragma GCC diagnostic push
45 -+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
46 -+
47 - static gboolean
48 - clock_timeout_thread (void)
49 - {
50 -@@ -697,6 +700,8 @@
51 - return TRUE;
52 - }
53 -
54 -+#pragma GCC diagnostic pop
55 -+
56 - /* Message label */
57 -
58 - static gboolean
59 -
60
61 diff --git a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch b/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch
62 deleted file mode 100644
63 index 81f158b2176..00000000000
64 --- a/x11-misc/lightdm-gtk-greeter/files/lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch
65 +++ /dev/null
66 @@ -1,64 +0,0 @@
67 -Bug: https://bugs.gentoo.org/show_bug.cgi?id=627208
68 -Upstream commit: http://bazaar.launchpad.net/~lightdm-gtk-greeter-team/lightdm-gtk-greeter/trunk/revision/350
69 -
70 ---- a/src/lightdm-gtk-greeter.c
71 -+++ b/src/lightdm-gtk-greeter.c
72 -@@ -1937,11 +1937,11 @@
73 - {
74 - gtk_widget_show (GTK_WIDGET (username_entry));
75 - gtk_widget_show (GTK_WIDGET (cancel_button));
76 -- lightdm_greeter_authenticate (greeter, NULL);
77 -+ lightdm_greeter_authenticate (greeter, NULL, NULL);
78 - }
79 - else if (g_strcmp0 (username, "*guest") == 0)
80 - {
81 -- lightdm_greeter_authenticate_as_guest (greeter);
82 -+ lightdm_greeter_authenticate_as_guest (greeter, NULL);
83 - }
84 - else
85 - {
86 -@@ -1961,7 +1961,7 @@
87 - set_language (NULL);
88 - }
89 -
90 -- lightdm_greeter_authenticate (greeter, username);
91 -+ lightdm_greeter_authenticate (greeter, username, NULL);
92 - }
93 - }
94 -
95 -@@ -1983,7 +1983,7 @@
96 - if (lightdm_greeter_get_in_authentication (greeter))
97 - {
98 - cancelling = TRUE;
99 -- lightdm_greeter_cancel_authentication (greeter);
100 -+ lightdm_greeter_cancel_authentication (greeter, NULL);
101 - set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, NULL);
102 - }
103 -
104 -@@ -2017,7 +2017,7 @@
105 -
106 - language = get_language ();
107 - if (language)
108 -- lightdm_greeter_set_language (greeter, language);
109 -+ lightdm_greeter_set_language (greeter, language, NULL);
110 - g_free (language);
111 -
112 - session = get_session ();
113 -@@ -2238,7 +2238,7 @@
114 - start_session ();
115 - else if (lightdm_greeter_get_in_authentication (greeter))
116 - {
117 -- lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry));
118 -+ lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry), NULL);
119 - /* If we have questions pending, then we continue processing
120 - * those, until we are done. (Otherwise, authentication will
121 - * not complete.) */
122 -@@ -2331,7 +2331,7 @@
123 - }
124 - }
125 - else
126 -- lightdm_greeter_authenticate_autologin (greeter);
127 -+ lightdm_greeter_authenticate_autologin (greeter, NULL);
128 - }
129 - }
130 -
131
132 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
133 deleted file mode 100644
134 index 0a245234b38..00000000000
135 --- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
136 +++ /dev/null
137 @@ -1,67 +0,0 @@
138 -# Copyright 1999-2018 Gentoo Foundation
139 -# Distributed under the terms of the GNU General Public License v2
140 -
141 -EAPI=4
142 -
143 -inherit versionator eutils
144 -
145 -DESCRIPTION="LightDM GTK+ Greeter"
146 -HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
147 -SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz branding? (
148 -https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
149 -
150 -LICENSE="GPL-3 LGPL-3
151 - branding? ( CC-BY-3.0 )"
152 -SLOT="0"
153 -KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
154 -IUSE="ayatana branding"
155 -
156 -COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
157 - x11-libs/gtk+:3
158 - >=x11-misc/lightdm-1.2.2"
159 -
160 -DEPEND="${COMMON_DEPEND}
161 - dev-util/intltool
162 - sys-devel/gettext"
163 -
164 -RDEPEND="${COMMON_DEPEND}
165 - x11-themes/gnome-themes-standard
166 - >=x11-themes/adwaita-icon-theme-3.14.1"
167 -
168 -GENTOO_BG="gentoo-bg_65.jpg"
169 -
170 -src_prepare() {
171 - epatch "${FILESDIR}"/${P}-gcc6.patch
172 - if has_version '>=x11-misc/lightdm-1.19.2'; then
173 - epatch "${FILESDIR}"/${P}-lightdm-1.19.2.patch
174 - fi
175 -
176 - # Ok, this has to be fixed in the tarball but I am too lazy to do it.
177 - # I will fix this once I decide to update the tarball with a new gentoo
178 - # background
179 - # Bug #404467
180 - if use branding; then
181 - sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
182 - "${WORKDIR}"/${PN}.conf || die
183 - fi
184 -}
185 -
186 -src_configure() {
187 - econf --enable-kill-on-sigterm \
188 - $(use_enable ayatana libindicator)
189 -}
190 -
191 -src_install() {
192 - default
193 -
194 - if use branding; then
195 - insinto /etc/lightdm/
196 - doins "${WORKDIR}"/${PN}.conf
197 - insinto /usr/share/lightdm/backgrounds/
198 - doins "${WORKDIR}"/${GENTOO_BG}
199 - sed -i -e \
200 - "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
201 - "${D}"/etc/lightdm/${PN}.conf || die
202 - newdoc "${WORKDIR}"/README.txt README-background.txt
203 - fi
204 -}