From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C92515800A for ; Tue, 29 Apr 2025 14:59:42 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 82B2B342FE4 for ; Tue, 29 Apr 2025 14:59:42 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B0A791102BE; Tue, 29 Apr 2025 14:59:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id A86A71102BE for ; Tue, 29 Apr 2025 14:59:38 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53A96342FE4 for ; Tue, 29 Apr 2025 14:59:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2C5F1BAD for ; Tue, 29 Apr 2025 14:59:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1745938737.517d3b793ab51fa7442ace5459ebec1e74f13ae8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/lightdm/lightdm-1.32.0-r3.ebuild X-VCS-Directories: x11-misc/lightdm/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 517d3b793ab51fa7442ace5459ebec1e74f13ae8 X-VCS-Branch: master Date: Tue, 29 Apr 2025 14:59:36 +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: 52092740-20fc-42cd-8cfb-b96c348408f4 X-Archives-Hash: dd88f652d008ef014b776ab845a5e782 commit: 517d3b793ab51fa7442ace5459ebec1e74f13ae8 Author: Ian Jordan gmail com> AuthorDate: Mon Jan 27 08:27:46 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 29 14:58:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=517d3b79 x11-misc/lightdm: Drop Qt5 option, add IUSE X and missing X lib deps While upstream is working on Qt6 support being added to lightdm it is decided to drop Qt5 in the meantime as we have no supporting Qt5 greeter in ::gentoo and was unable to find one in any third party repos. Once https://github.com/canonical/lightdm/pull/373 is merged, support will be added back. * asturmlechner 2025-04-29: Actually configure w/ --disable-liblightdm-qt5 A common complaint for lightdm is that the package does not pull in X. This change adds an X USE flag to pull in x11-base/xorg-drivers. * asturmlechner 2025-04-29: mv to COMMON_DEPEND from RDEPEND+DEPEND Bug: https://bugs.gentoo.org/953261 Signed-off-by: Ian Jordan gmail.com> Closes: https://github.com/gentoo/gentoo/pull/40329 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-misc/lightdm/lightdm-1.32.0-r3.ebuild | 167 ++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/x11-misc/lightdm/lightdm-1.32.0-r3.ebuild b/x11-misc/lightdm/lightdm-1.32.0-r3.ebuild new file mode 100644 index 000000000000..4f218f66f3fb --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.32.0-r3.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils + +DESCRIPTION="A lightweight display manager" +HOMEPAGE="https://github.com/canonical/lightdm" +SRC_URI="https://github.com/canonical/lightdm/releases/download/${PV}/${P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="audit elogind +gnome +gtk +introspection non-root systemd vala X" + +REQUIRED_USE="^^ ( elogind systemd ) + vala? ( introspection )" + +RESTRICT="test" + +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2 + dev-libs/libgcrypt:= + dev-libs/libxml2 + sys-libs/pam + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libXdmcp + x11-libs/libxklavier:= + audit? ( sys-process/audit ) + gnome? ( sys-apps/accountsservice ) + introspection? ( >=dev-libs/gobject-introspection-1 ) + X? ( x11-base/xorg-drivers ) +" +RDEPEND="${COMMON_DEPEND} + acct-group/lightdm + acct-group/video + acct-user/lightdm + >=sys-auth/pambase-20101024-r2 + elogind? ( sys-auth/elogind[pam] ) + systemd? ( sys-apps/systemd[pam] ) +" +DEPEND="${COMMON_DEPEND} + gnome? ( gnome-base/gnome-common ) +" +BDEPEND=" + app-text/yelp-tools + dev-build/gtk-doc-am + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + vala? ( $(vala_depend) ) +" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" + +PATCHES=( + "${FILESDIR}"/${PN}-1.30.0-musl-locale.patch + "${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch +) + +DOCS=( NEWS ) + +pkg_setup() { + export LIGHTDM_USER=${LIGHTDM_USER:-lightdm} + vala_setup +} + +src_prepare() { + xdg_environment_reset + + sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 + sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die + + einfo "Fixing the session-wrapper variable in lightdm.conf" + sed -i -e \ + "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + data/lightdm.conf || die "Failed to fix lightdm.conf" + + # use correct version of qmake. bug #566950 + sed \ + -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \ + -i configure.ac || die + + default + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi +} + +src_configure() { + # Set default values if global vars unset + local _greeter _session _user + _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} + _session=${LIGHTDM_SESSION:=gnome} + _user="$(usex non-root "${LIGHTDM_USER}" root)" + # Let user know how lightdm is configured + einfo "Gentoo configuration" + einfo "Default greeter: ${_greeter}" + einfo "Default session: ${_session}" + einfo "Greeter user: ${_user}" + + # also disable tests because libsystem.c does not build. Tests are + # restricted so it does not matter anyway. + local myeconfargs=( + --localstatedir=/var + --disable-static + --disable-tests + $(use_enable audit libaudit) + $(use_enable introspection) + --disable-liblightdm-qt5 + $(use_enable vala) + --with-user-session=${_session} + --with-greeter-session=${_greeter} + --with-greeter-user=${_user} + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Delete apparmor profiles because they only work with Ubuntu's + # apparmor package. Bug #494426 + if [[ -d ${ED}/etc/apparmor.d ]]; then + rm -r "${ED}/etc/apparmor.d" || die \ + "Failed to remove apparmor profiles" + fi + + insinto /etc/${PN} + doins data/{${PN},keys}.conf + newins "${FILESDIR}"/Xsession-r1 Xsession + fperms +x /etc/${PN}/Xsession + # /var/lib/lightdm-data could be useful. Bug #522228 + keepdir /var/lib/${PN}-data + + find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die + rm -r "${ED}"/etc/init || die + + # Remove existing pam file. We will build a new one. Bug #524792 + rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die + pamd_mimic system-local-login ${PN} auth account password session #372229 + pamd_mimic system-local-login ${PN}-greeter auth account password session #372229 + dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163 + + readme.gentoo_create_doc + + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service +} + +pkg_postinst() { + systemd_reenable "${PN}.service" + + # Bug #886607 + ewarn + ewarn "If you have a Nvidia GPU and ${PN} fails to launch X, edit /etc/${PN}/${PN}.conf to include the line" + ewarn + ewarn "logind-check-graphical=false" + ewarn + ewarn "in the section [LightDM]. See https://github.com/canonical/lightdm/issues/263 for details." +}