Gentoo Archives: gentoo-commits

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