From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E027F15ACFC for ; Sat, 6 May 2023 00:40:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0AD8E095C; Sat, 6 May 2023 00:40:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F994E095C for ; Sat, 6 May 2023 00:40:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4E79834126D for ; Sat, 6 May 2023 00:40:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66B0AA59 for ; Sat, 6 May 2023 00:40:30 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1683333577.6882c586ef38fa018de5486a2d9ce9d523e31fdf.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gdm/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gdm/Manifest gnome-base/gdm/gdm-44.1.ebuild X-VCS-Directories: gnome-base/gdm/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 6882c586ef38fa018de5486a2d9ce9d523e31fdf X-VCS-Branch: master Date: Sat, 6 May 2023 00:40:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6416645-3b9a-47ac-9439-21ad353817f7 X-Archives-Hash: 7deb5d8a6b32e89defcce7dd4955d97d commit: 6882c586ef38fa018de5486a2d9ce9d523e31fdf Author: Guillermo Joandet gmail com> AuthorDate: Fri May 5 19:57:48 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat May 6 00:39:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6882c586 gnome-base/gdm: Version bump to 44.1 Signed-off-by: Guillermo Joandet gmail.com> Closes: https://github.com/gentoo/gentoo/pull/30883 Signed-off-by: Matt Turner gentoo.org> gnome-base/gdm/Manifest | 1 + gnome-base/gdm/gdm-44.1.ebuild | 215 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 216 insertions(+) diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 12ea64d01997..7735b6b310a6 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -1,3 +1,4 @@ DIST gdm-43.0.tar.xz 830668 BLAKE2B cd9fa9864ba075a85d16128ce2faba9c360357d900719c8e7cbb6c638f91750ff80ef0d970b24d0d858aa56f8ab95b8cac0d93624bcced8e6f98ca2d1f06fbc3 SHA512 e3eaa7a50e224939b6e535963171a800bb175ed9480a88ce14034929760dd579b91c4f3117be6a4404b2de13afdee881dafe09695eebf42872d4a13fbc5fb8ba DIST gdm-44.0.tar.xz 846848 BLAKE2B ce81771b119c912be0557e21db666aa99e61eb34bbbbd03a5c341a68eb060e7a956b95eeff5450a9bb879dbb177b11db65596e7cc3e8627e09d1fccd6cfe5c30 SHA512 eab556d0cab43ce4fe04b918f22281831f1dd8de836866de009884a637f11c83a626cdedb46cee5efb53cf1ad8139aa6e9568fd90a4d01704605347deca7bc2c +DIST gdm-44.1.tar.xz 855472 BLAKE2B 61a6be1ae9b616b5147c372841a521eea14f91b7295423d65417692ab6bc9969211c6bfeaa5141651a580decb8c0748483eede498ef35e3e8e85e0fd2f318627 SHA512 bb761a6dd032ae5d411162b638bf5bd15bef5103c9a9d7c4de5e39db496faa62b932218a9923ef4743d17207eb890e256e910bde5c573e9fba4619f159f18e85 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 diff --git a/gnome-base/gdm/gdm-44.1.ebuild b/gnome-base/gdm/gdm-44.1.ebuild new file mode 100644 index 000000000000..be6bdc9ecea6 --- /dev/null +++ b/gnome-base/gdm/gdm-44.1.ebuild @@ -0,0 +1,215 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop gnome2 meson pam readme.gentoo-r1 systemd udev + +DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins" +HOMEPAGE="https://wiki.gnome.org/Projects/GDM https://gitlab.gnome.org/GNOME/gdm" + +SRC_URI="${SRC_URI} + branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) +" + +LICENSE=" + GPL-2+ + branding? ( CC-BY-SA-4.0 ) +" + +SLOT="0" + +IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE="^^ ( elogind systemd )" + +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + +# dconf, dbus and g-s-d are needed at install time for dconf update +# keyutils is automagic dep that makes autologin unlock login keyring +# when all the passwords match (disk encryption, user pw and login keyring) +# dbus-run-session used at runtime +COMMON_DEPEND=" + virtual/udev + >=dev-libs/libgudev-232:= + >=dev-libs/glib-2.56:2 + >=x11-libs/gtk+-2.91.1:3 + >=media-libs/libcanberra-0.4[gtk3] + >=sys-apps/accountsservice-0.6.35 + x11-libs/libxcb + sys-apps/keyutils:= + selinux? ( sys-libs/libselinux ) + + x11-libs/libX11 + x11-libs/libXau + x11-base/xorg-server[-minimal] + x11-libs/libXdmcp + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + + systemd? ( >=sys-apps/systemd-186:0=[pam] ) + elogind? ( >=sys-auth/elogind-239.3[pam] ) + + plymouth? ( sys-boot/plymouth ) + audit? ( sys-process/audit ) + + sys-libs/pam + sys-auth/pambase[elogind?,systemd?] + + >=gnome-base/dconf-0.20 + >=gnome-base/gnome-settings-daemon-3.1.4 + gnome-base/gsettings-desktop-schemas + sys-apps/dbus + + >=x11-misc/xdg-utils-1.0.2-r3 + + >=dev-libs/gobject-introspection-0.9.12:= +" +# XXX: These deps are from session and desktop files in data/ directory +# fprintd is used via dbus by gdm-fingerprint-extension +RDEPEND="${COMMON_DEPEND} + acct-group/gdm + acct-user/gdm + >=gnome-base/gnome-session-3.6 + >=gnome-base/gnome-shell-3.1.90 + x11-apps/xhost + + accessibility? ( + >=app-accessibility/orca-3.10 + gnome-extra/mousetweaks + ) + fprint? ( sys-auth/fprintd[pam] ) +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-text/docbook-xml-dtd:4.1.2 + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/itstool + >=gnome-base/dconf-0.20 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + test? ( >=dev-libs/check-0.9.4 ) + app-text/yelp-tools +" + +DOC_CONTENTS=" + To start GDM at boot with systemd, run:\n + # systemctl enable gdm.service\n + \n + To start GDM at boot with OpenRC, set DISPLAYMANAGER=\"gdm\"\n + in /etc/conf.d/display-manager and enable the display-manager service:\n + # rc-update add display-manager\n + \n + For passwordless login to unlock your keyring, you need to install + sys-auth/pambase with USE=gnome-keyring and set an empty password + on your keyring. Use app-crypt/seahorse for that.\n + \n + You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11 + for smartcard support +" + +PATCHES=( + # Add elogind support + "${FILESDIR}/${PN}-44.0-meson-allow-building-with-elogind.patch" +) + +src_prepare() { + default + + # Show logo when branding is enabled + use branding && eapply "${FILESDIR}/${PN}-3.30.3-logo.patch" +} + +src_configure() { + # --with-initial-vt=7 conflicts with plymouth, bug #453392 + # gdm-3.30 now reaps (stops) the login screen when the login VT isn't active, which + # saves on memory. However this means if we don't start on VT1, gdm doesn't start up + # before user manually goes to VT7. Thus as-is we can not keep gdm away from VT1, + # so lets try always having it in VT1 and see if that is an issue for people before + # hacking up workarounds for the initial start case. + local emesonargs=( + --localstatedir /var + + -Ddefault-pam-config=exherbo + -Dgdm-xsession=true + -Dgroup=gdm + -Dipv6=true + $(meson_feature audit libaudit) + -Dlogind-provider=$(usex systemd systemd elogind) + -Dpam-mod-dir=$(getpam_mod_dir) + $(meson_feature plymouth) + -Drun-dir=/run/gdm + $(meson_feature selinux) + $(meson_use systemd systemd-journal) + $(meson_use tcpd tcp-wrappers) + -Dudev-dir=$(get_udevdir)/rules.d + -Duser=gdm + -Duser-display-server=true + $(meson_use wayland wayland-support) + -Dxdmcp=enabled + ) + + if use elogind; then + emesonargs+=( + -Dinitial-vt=7 # TODO: Revisit together with startDM.sh and other xinit talks; also ignores plymouth possibility + -Dsystemdsystemunitdir=no + -Dsystemduserunitdir=no + ) + else + emesonargs+=( + -Dinitial-vt=1 + -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + if ! use accessibility ; then + rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die + fi + + if ! use bluetooth-sound ; then + # Workaround https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/10 + # bug #679526 + insinto /var/lib/gdm/.config/pulse + doins "${FILESDIR}"/default.pa + fi + + # install XDG_DATA_DIRS gdm changes + echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm + doenvd 99xdg-gdm + + use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + local d ret + + # bug #669146; gdm may crash if /var/lib/gdm subdirs are not owned by gdm:gdm + ret=0 + ebegin "Fixing ${EROOT}/var/lib/gdm ownership" + chown --no-dereference gdm:gdm "${EROOT}/var/lib/gdm" || ret=1 + for d in "${EROOT}/var/lib/gdm/"{.cache,.color,.config,.dbus,.local}; do + [[ ! -e "${d}" ]] || chown --no-dereference -R gdm:gdm "${d}" || ret=1 + done + eend ${ret} + + systemd_reenable gdm.service + readme.gentoo_print_elog + + udev_reload +} + +pkg_postrm() { + udev_reload +}