commit: 8e38dfc25fd9f07b845e167a3b4da426ce4d6a00 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon May 27 22:00:07 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon May 27 22:23:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e38dfc2
x11-misc/sddm: add 0.21.0_p20240302, Qt6-only Closes: https://bugs.gentoo.org/925866 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> profiles/package.mask | 1 + x11-misc/sddm/Manifest | 1 + .../files/sddm-0.20.0-respect-user-flags.patch | 16 ++- x11-misc/sddm/sddm-0.21.0_p20240302.ebuild | 148 +++++++++++++++++++++ 4 files changed, 165 insertions(+), 1 deletion(-) diff --git a/profiles/package.mask b/profiles/package.mask index e891430ff0ee..2935bfaf6d95 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -769,6 +769,7 @@ sec-keys/openpgp-keys-jiatan =net-libs/signond-8.61-r100 =net-misc/smb4k-3.2.5-r2 ~sys-auth/polkit-qt-0.200.0 +~x11-misc/sddm-0.21.0_p20240302 ~app-office/libreoffice-24.2.3.2 ~app-office/libreoffice-l10n-24.2.3.2 diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 8d6ee0946cd6..9daaf7abe4e4 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -2,3 +2,4 @@ DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B b79738c58f19ebac24dd790ba7613d85ae DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144 SHA512 6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2 DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0 SHA512 2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370caaaa70f458 +DIST sddm-0.21.0_p20240302.tar.gz 3555893 BLAKE2B 2c0d6b5185088750f3e656f593b1f9cd212e76d250c6285e03c8d86fad99412dce4a784dd8dfdd8cf7759552101ce36971b6c292f8ce51e9aecc3e9a1a785daa SHA512 0e0a143ec2007b09c406773ff81a5d722b9a7fadd0c5c6c8ef23d67623c16f8327cf54617dcc273b0b690ca5447b6707ff1dd48a8a563a6efed8d9aac70bd522 diff --git a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch index daaf9f52dbcf..7f5bc400f43c 100644 --- a/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch +++ b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch @@ -1,6 +1,17 @@ +From f03f4c977b8038559c4f26e0e10cec4a3167c00c Mon Sep 17 00:00:00 2001 +From: Lorenzo Porta <[email protected]> +Date: Wed, 23 Sep 2015 23:34:38 2015 +0100 +Subject: Respect user flags + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b883a5e..77cd263 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ +@@ -39,7 +39,7 @@ if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug) message(STATUS "Debug build") add_definitions(-DDEBUG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") @@ -9,3 +20,6 @@ message(STATUS "Release build") add_definitions(-DNDEBUG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") +-- +2.43.0 + diff --git a/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild new file mode 100644 index 000000000000..f065cde096a5 --- /dev/null +++ b/x11-misc/sddm/sddm-0.21.0_p20240302.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PAM_TAR="${PN}-0.21.0-pam" +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"; +else + COMMIT=ae072f901671b68861da9577e3e12e350a9053d5 + SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64" +fi + +QTMIN=6.7.1 +inherit cmake linux-info pam systemd tmpfiles + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm"; +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz"; + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="+elogind systemd test +X" + +REQUIRED_USE="^^ ( elogind systemd )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + acct-group/sddm + acct-user/sddm + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network] + >=dev-qt/qtdeclarative-${QTMIN}:6 + sys-libs/pam + x11-libs/libXau + x11-libs/libxcb:= + elogind? ( sys-auth/elogind[pam] ) + systemd? ( sys-apps/systemd:=[pam] ) + !systemd? ( sys-power/upower ) +" +DEPEND="${COMMON_DEPEND} + test? ( >=dev-qt/qtbase-${QTMIN}:6[network,test] ) +" +RDEPEND="${COMMON_DEPEND} + X? ( x11-base/xorg-server ) + !systemd? ( gui-libs/display-manager-init ) +" +BDEPEND=" + dev-python/docutils + >=dev-build/cmake-3.25.0 + >=dev-qt/qttools-${QTMIN}[linguist] + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +PATCHES=( + # Downstream patches + "${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch" + "${FILESDIR}/${PN}-0.21.0-Xsession.patch" # bug 611210 +) + +pkg_setup() { + local CONFIG_CHECK="~DRM" + use kernel_linux && linux-info_pkg_setup +} + +src_unpack() { + [[ ${PV} == *9999* ]] && git-r3_src_unpack + default +} + +src_prepare() { + touch 01gentoo.conf || die + +cat <<-EOF >> 01gentoo.conf +[General] +# Remove qtvirtualkeyboard as InputMethod default +InputMethod= +EOF + + cmake_src_prepare + + if ! use test; then + sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die + cmake_comment_add_subdirectory test + fi + + if use systemd; then + sed -e "/pam_elogind.so/s/elogind/systemd/" \ + -i "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam || die + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_MAN_PAGES=ON + -DBUILD_WITH_QT6=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + -DRUNTIME_DIR=/run/sddm + -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d" + -DNO_SYSTEMD=$(usex !systemd) + -DUSE_ELOGIND=$(usex elogind) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /etc/sddm.conf.d/ + doins "${S}"/01gentoo.conf + + # with systemd logs are sent to journald, so no point to bother in that case + if ! use systemd; then + insinto /etc/logrotate.d + newins "${FILESDIR}/sddm.logrotate" sddm + fi + + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}.pam ${PN} + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-autologin.pam ${PN}-autologin + newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam ${PN}-greeter +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" + + elog "NOTE: If SDDM startup appears to hang then entropy pool is too low." + elog "This can be fixed by configuring one of the following:" + elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel" + elog " - # emerge sys-apps/haveged && rc-update add haveged boot" + elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot" + elog + elog "SDDM example config can be shown with:" + elog " ${EROOT}/usr/bin/sddm --example-config" + elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific options." + elog + elog "For more information on how to configure SDDM, please visit the wiki:" + elog " https://wiki.gentoo.org/wiki/SDDM"; + if has_version x11-drivers/nvidia-drivers; then + elog + elog " Nvidia GPU owners in particular should pay attention" + elog " to the troubleshooting section." + fi + + systemd_reenable sddm.service +}
