1 |
commit: 68cc4e48ccdff1488300644672e27741ab2b2c04 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 15 12:24:12 2021 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 15 12:31:59 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cc4e48 |
7 |
|
8 |
gnome-base/gdm: bump to 41.0 with patchset |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-base/gdm/Manifest | 2 + |
14 |
gnome-base/gdm/gdm-41.0.ebuild | 216 +++++++++++++++++++++++++++++++++++++++++ |
15 |
profiles/package.mask | 1 + |
16 |
3 files changed, 219 insertions(+) |
17 |
|
18 |
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest |
19 |
index d486cfd45a5..55705914eaf 100644 |
20 |
--- a/gnome-base/gdm/Manifest |
21 |
+++ b/gnome-base/gdm/Manifest |
22 |
@@ -1,3 +1,5 @@ |
23 |
DIST gdm-40.0.tar.xz 800296 BLAKE2B 9c2038758cec09f13c18bd79d431e82a29fb1a2b8ab099498a0b8d920cb93896abceab9157edae8cc15312e03d21eb36b649c2cc8761f9af5fec387c5f28a261 SHA512 b20d02f8a80f6aff8909a69c6c621c20c5aa1b25cfedd68bf95faaaa56d5f7cd5d607d1a7388b97aa06510684f1e9e474248042a00203f496c39930e001bb64c |
24 |
DIST gdm-40.1.tar.xz 803488 BLAKE2B a0f5349c15c281b666e2e1eb35b81bd4fe3561d7dfa48e43fab7b6ac5c6f9f187f3907fc88eb169ef5e7951c815dec849f64ff2a2b630742b47521bc5c33f618 SHA512 34e3d905195c9d44f3681fcf8170b67e739cef60fe3987802b7006e5063b9cdf5ca047470d0aebd6e9b47dbbb660040648a647ed8d3186a3099b8c6532c5ded7 |
25 |
+DIST gdm-41.0-patchset.tar.xz 12076 BLAKE2B 900ad267bdbb0c189ba36c215aa4bd18f170efd4df02341b1b6f98bdb09b4bbcfcf795ec5a63b5364f47486767a347f60193168749f10823fa816f9500cd3073 SHA512 6c7940ec9c91d0e28f5e9d728abd49814d4d9c7b964e753436f0ceaa11f6c58a559ac3ef0d2e14bf5410a097abdf72cf16dad191017c9ee5c59e6f68de8f2ca8 |
26 |
+DIST gdm-41.0.tar.xz 806668 BLAKE2B 12bd10ff4c5799683665127e5ff543e07f13cffde1d668213b43d6471812c727cb18e93c3305923019c3f522aa0484779dd861afc7ac939115b5f169657722e8 SHA512 b1dd99beb8339c6cf93f10e0aec1c946c615b4efaf1724392585985fb32cee156a9e44fd3041ab87ab9ba6a6bd6c9a9d0ecf8b40dc9c098b3c7ee47f7a7e9a97 |
27 |
DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 |
28 |
|
29 |
diff --git a/gnome-base/gdm/gdm-41.0.ebuild b/gnome-base/gdm/gdm-41.0.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..26502e30286 |
32 |
--- /dev/null |
33 |
+++ b/gnome-base/gdm/gdm-41.0.ebuild |
34 |
@@ -0,0 +1,216 @@ |
35 |
+# Copyright 1999-2021 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=7 |
39 |
+ |
40 |
+inherit desktop gnome2 meson pam readme.gentoo-r1 systemd toolchain-funcs udev |
41 |
+ |
42 |
+DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" |
43 |
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM" |
44 |
+ |
45 |
+SRC_URI="${SRC_URI} |
46 |
+ https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz |
47 |
+ branding? ( https://www.mail-archive.com/tango-artists@×××××××××××××××××.org/msg00043/tango-gentoo-v1.1.tar.gz ) |
48 |
+" |
49 |
+ |
50 |
+LICENSE=" |
51 |
+ GPL-2+ |
52 |
+ branding? ( CC-BY-SA-4.0 ) |
53 |
+" |
54 |
+ |
55 |
+SLOT="0" |
56 |
+ |
57 |
+IUSE="accessibility audit bluetooth-sound branding elogind fprint ipv6 plymouth selinux systemd tcpd test wayland" |
58 |
+RESTRICT="!test? ( test )" |
59 |
+REQUIRED_USE="^^ ( elogind systemd )" |
60 |
+ |
61 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" |
62 |
+ |
63 |
+# dconf, dbus and g-s-d are needed at install time for dconf update |
64 |
+# keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring) |
65 |
+# dbus-run-session used at runtime |
66 |
+COMMON_DEPEND=" |
67 |
+ virtual/udev |
68 |
+ >=dev-libs/glib-2.56:2 |
69 |
+ >=x11-libs/gtk+-2.91.1:3 |
70 |
+ >=media-libs/libcanberra-0.4[gtk3] |
71 |
+ >=sys-apps/accountsservice-0.6.35 |
72 |
+ x11-libs/libxcb |
73 |
+ sys-apps/keyutils:= |
74 |
+ selinux? ( sys-libs/libselinux ) |
75 |
+ |
76 |
+ x11-libs/libX11 |
77 |
+ x11-libs/libXau |
78 |
+ x11-base/xorg-server[-minimal] |
79 |
+ x11-libs/libXdmcp |
80 |
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
81 |
+ |
82 |
+ systemd? ( >=sys-apps/systemd-186:0=[pam] ) |
83 |
+ elogind? ( >=sys-auth/elogind-239.3[pam] ) |
84 |
+ |
85 |
+ plymouth? ( sys-boot/plymouth ) |
86 |
+ audit? ( sys-process/audit ) |
87 |
+ |
88 |
+ sys-libs/pam |
89 |
+ sys-auth/pambase[elogind?,systemd?] |
90 |
+ |
91 |
+ >=gnome-base/dconf-0.20 |
92 |
+ >=gnome-base/gnome-settings-daemon-3.1.4 |
93 |
+ gnome-base/gsettings-desktop-schemas |
94 |
+ sys-apps/dbus |
95 |
+ |
96 |
+ >=x11-misc/xdg-utils-1.0.2-r3 |
97 |
+ |
98 |
+ >=dev-libs/gobject-introspection-0.9.12:= |
99 |
+" |
100 |
+# XXX: These deps are from session and desktop files in data/ directory |
101 |
+# fprintd is used via dbus by gdm-fingerprint-extension |
102 |
+RDEPEND="${COMMON_DEPEND} |
103 |
+ acct-group/gdm |
104 |
+ acct-user/gdm |
105 |
+ >=gnome-base/gnome-session-3.6 |
106 |
+ >=gnome-base/gnome-shell-3.1.90 |
107 |
+ x11-apps/xhost |
108 |
+ |
109 |
+ accessibility? ( |
110 |
+ >=app-accessibility/orca-3.10 |
111 |
+ gnome-extra/mousetweaks |
112 |
+ ) |
113 |
+ fprint? ( sys-auth/fprintd[pam] ) |
114 |
+" |
115 |
+DEPEND="${COMMON_DEPEND} |
116 |
+ x11-base/xorg-proto |
117 |
+" |
118 |
+BDEPEND=" |
119 |
+ app-text/docbook-xml-dtd:4.1.2 |
120 |
+ dev-util/gdbus-codegen |
121 |
+ dev-util/glib-utils |
122 |
+ dev-util/itstool |
123 |
+ >=gnome-base/dconf-0.20 |
124 |
+ >=sys-devel/gettext-0.19.8 |
125 |
+ virtual/pkgconfig |
126 |
+ test? ( >=dev-libs/check-0.9.4 ) |
127 |
+ app-text/yelp-tools |
128 |
+" |
129 |
+ |
130 |
+DOC_CONTENTS=" |
131 |
+ To make GDM start at boot with systemd, run:\n |
132 |
+ # systemctl enable gdm.service\n |
133 |
+ \n |
134 |
+ To make GDM start at boot with OpenRC, edit /etc/conf.d to have |
135 |
+ DISPLAYMANAGER=\"gdm\" and enable the xdm service:\n |
136 |
+ # rc-update add xdm |
137 |
+ \n |
138 |
+ For passwordless login to unlock your keyring, you need to install |
139 |
+ sys-auth/pambase with USE=gnome-keyring and set an empty password |
140 |
+ on your keyring. Use app-crypt/seahorse for that.\n |
141 |
+ \n |
142 |
+ You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 |
143 |
+ for smartcard support |
144 |
+" |
145 |
+ |
146 |
+PATCHES=( |
147 |
+ "${WORKDIR}"/patches/ |
148 |
+ |
149 |
+ # Gentoo does not have a fingerprint-auth pam stack |
150 |
+ "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch" |
151 |
+ |
152 |
+ # Add elogind support |
153 |
+ "${FILESDIR}/${PN}-40.0-meson-allow-building-with-elogind.patch" |
154 |
+ |
155 |
+ # Support pam_elogind.so in gdm-launch-environment.pam |
156 |
+ "${FILESDIR}/pam-elogind.patch" |
157 |
+) |
158 |
+ |
159 |
+src_prepare() { |
160 |
+ default |
161 |
+ |
162 |
+ # Show logo when branding is enabled |
163 |
+ use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" |
164 |
+} |
165 |
+ |
166 |
+src_configure() { |
167 |
+ # --with-initial-vt=7 conflicts with plymouth, bug #453392 |
168 |
+ # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which |
169 |
+ # saves on memory. However this means if we don't start on VT1, gdm doesn't start up |
170 |
+ # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, |
171 |
+ # so lets try always having it in VT1 and see if that is an issue for people before |
172 |
+ # hacking up workarounds for the initial start case. |
173 |
+ local emesonargs=( |
174 |
+ --localstatedir /var |
175 |
+ |
176 |
+ -Ddefault-pam-config=exherbo |
177 |
+ -Dgdm-xsession=true |
178 |
+ -Dgroup=gdm |
179 |
+ $(meson_use ipv6) |
180 |
+ $(meson_feature audit libaudit) |
181 |
+ -Dlogind-provider=$(usex systemd systemd elogind) |
182 |
+ -Dpam-mod-dir=$(getpam_mod_dir) |
183 |
+ $(meson_feature plymouth) |
184 |
+ -Drun-dir=/run/gdm |
185 |
+ $(meson_feature selinux) |
186 |
+ $(meson_use systemd systemd-journal) |
187 |
+ $(meson_use tcpd tcp-wrappers) |
188 |
+ -Dudev-dir=$(get_udevdir)/rules.d |
189 |
+ -Duser=gdm |
190 |
+ -Duser-display-server=true |
191 |
+ $(meson_use wayland wayland-support) |
192 |
+ -Dxdmcp=enabled |
193 |
+ ) |
194 |
+ |
195 |
+ if use elogind; then |
196 |
+ emesonargs+=( |
197 |
+ -Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility |
198 |
+ -Dsystemdsystemunitdir=no |
199 |
+ -Dsystemduserunitdir=no |
200 |
+ ) |
201 |
+ else |
202 |
+ emesonargs+=( |
203 |
+ -Dinitial-vt=1 |
204 |
+ -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" |
205 |
+ -Dsystemduserunitdir="$(systemd_get_userunitdir)" |
206 |
+ ) |
207 |
+ fi |
208 |
+ |
209 |
+ meson_src_configure |
210 |
+} |
211 |
+ |
212 |
+src_install() { |
213 |
+ meson_src_install |
214 |
+ |
215 |
+ if ! use accessibility ; then |
216 |
+ rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die |
217 |
+ fi |
218 |
+ |
219 |
+ if ! use bluetooth-sound ; then |
220 |
+ # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 |
221 |
+ # bug #679526 |
222 |
+ insinto /var/lib/gdm/.config/pulse |
223 |
+ doins "${FILESDIR}"/default.pa |
224 |
+ fi |
225 |
+ |
226 |
+ # install XDG_DATA_DIRS gdm changes |
227 |
+ echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm |
228 |
+ doenvd 99xdg-gdm |
229 |
+ |
230 |
+ use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg |
231 |
+ |
232 |
+ readme.gentoo_create_doc |
233 |
+} |
234 |
+ |
235 |
+pkg_postinst() { |
236 |
+ gnome2_pkg_postinst |
237 |
+ local d ret |
238 |
+ |
239 |
+ # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm |
240 |
+ ret=0 |
241 |
+ ebegin "Fixing "${EROOT}"/var/lib/gdm ownership" |
242 |
+ chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1 |
243 |
+ for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do |
244 |
+ [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 |
245 |
+ done |
246 |
+ eend ${ret} |
247 |
+ |
248 |
+ systemd_reenable gdm.service |
249 |
+ readme.gentoo_print_elog |
250 |
+} |
251 |
|
252 |
diff --git a/profiles/package.mask b/profiles/package.mask |
253 |
index d0bd0a56b71..ac3fab54a36 100644 |
254 |
--- a/profiles/package.mask |
255 |
+++ b/profiles/package.mask |
256 |
@@ -135,6 +135,7 @@ x11-drivers/nvidia-drivers:0/vulkan |
257 |
>=gnome-base/gsettings-desktop-schemas-41.0 |
258 |
>=gnome-base/gnome-shell-41.0 |
259 |
>=gnome-extra/gnome-shell-extensions-41.0 |
260 |
+>=gnome-base/gdm-41.0 |
261 |
|
262 |
# Fabian Groffen <grobian@g.o> (2021-10-03) |
263 |
# Masked for erratic behaviour |