diff options
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/sddm/Manifest | 1 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch | 26 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch | 43 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch | 11 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch | 37 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-0.19.0_p20230608.ebuild | 137 |
6 files changed, 255 insertions, 0 deletions
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index d1006dba1575..4145f4344c73 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1 +1,2 @@ DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 +DIST sddm-0.19.0_p20230608.tar.gz 3553104 BLAKE2B 41622866f28f9a2aee3b1f6f02f66271d8fe762da71d2215bb6b4b87418504ce321db81625a6cfab099bdaa395da1bf4153a65e795612e745546c2a42e97f270 SHA512 76a591a41d3f171c6c3ec5d57837d3061f3dd094ec1e08003f0bacd90c061613505c899ce0b86c7bd4c5f8c346f7bb15f9cd574377dcece123a756329a805562 diff --git a/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch new file mode 100644 index 000000000000..b851c852cc9b --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch @@ -0,0 +1,26 @@ +From 20adb0eb3462e79ec76f93f2a622b99956145424 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 13 Oct 2020 01:04:44 +0200 +Subject: [PATCH] Disable /etc/debian_version check + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + services/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt +index 5032f33..afa5fd5 100644 +--- a/services/CMakeLists.txt ++++ b/services/CMakeLists.txt +@@ -11,7 +11,7 @@ else() + endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" "${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam") + +-if(EXISTS "/etc/debian_version") ++if(0) + install(FILES debian.sddm-autologin.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-autologin) + install(FILES debian.sddm-greeter.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-greeter) + install(FILES debian.sddm.pam DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm) +-- +2.39.1 + diff --git a/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch b/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch new file mode 100644 index 000000000000..2ad739a86761 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch @@ -0,0 +1,43 @@ +From 02a13d11dac72699e7580c538c152a7b5e0eb056 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 13 Oct 2020 01:10:00 +0200 +Subject: Don't add pam_systemd.so to pam.d/sddm-greeter in case of NO_SYSTEMD + +--- + services/CMakeLists.txt | 7 +++++-- + services/sddm-greeter.pam.in | 2 +- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt +index 3d12eec..2ff13a8 100644 +--- a/services/CMakeLists.txt ++++ b/services/CMakeLists.txt +@@ -4,10 +4,13 @@ if(SYSTEMD_FOUND) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sddm.service" DESTINATION "${SYSTEMD_SYSTEM_UNIT_DIR}") + endif() + ++set(LOGIND_PAM_MODULE "session optional") + if(USE_ELOGIND) +- set(LOGIND_PAM_MODULE "pam_elogind.so") ++ set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE} pam_elogind.so") ++elseif(NOT NO_SYSTEMD) ++ set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE} pam_systemd.so") + else() +- set(LOGIND_PAM_MODULE "pam_systemd.so") ++ set(LOGIND_PAM_MODULE "") + endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" "${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam") + +diff --git a/services/sddm-greeter.pam.in b/services/sddm-greeter.pam.in +index d41792d..35dcfd5 100644 +--- a/services/sddm-greeter.pam.in ++++ b/services/sddm-greeter.pam.in +@@ -14,4 +14,4 @@ password required pam_deny.so + + # Setup session + session required pam_unix.so +-session optional @LOGIND_PAM_MODULE@ ++@LOGIND_PAM_MODULE@ +-- +2.35.1 + 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 new file mode 100644 index 000000000000..daaf9f52dbcf --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-respect-user-flags.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,7 @@ + message(STATUS "Debug build") + add_definitions(-DDEBUG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") +-else() ++elseif(CMAKE_BUILD_TYPE MATCHES Release) + message(STATUS "Release build") + add_definitions(-DNDEBUG) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") diff --git a/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch b/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch new file mode 100644 index 000000000000..6267adc7dda8 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.20.0-sddm.pam-use-substack.patch @@ -0,0 +1,37 @@ +From 9cbeb07664f4bd4273c2b62a522a864f6d4f27ae Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 4 Feb 2023 13:31:36 +0100 +Subject: [PATCH] sddm.pam: Change to substack for system-login + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + services/sddm.pam | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/services/sddm.pam b/services/sddm.pam +index df11003..0a073f4 100644 +--- a/services/sddm.pam ++++ b/services/sddm.pam +@@ -1,15 +1,15 @@ + #%PAM-1.0 + +-auth include system-login ++auth substack system-login + -auth optional pam_gnome_keyring.so + -auth optional pam_kwallet5.so + +-account include system-login ++account substack system-login + +-password include system-login ++password substack system-login + -password optional pam_gnome_keyring.so use_authtok + + session optional pam_keyinit.so force revoke +-session include system-login ++session substack system-login + -session optional pam_gnome_keyring.so auto_start + -session optional pam_kwallet5.so auto_start +-- +2.39.1 + diff --git a/x11-misc/sddm/sddm-0.19.0_p20230608.ebuild b/x11-misc/sddm/sddm-0.19.0_p20230608.ebuild new file mode 100644 index 000000000000..40d21b378104 --- /dev/null +++ b/x11-misc/sddm/sddm-0.19.0_p20230608.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +COMMIT=40250a647291ea0cf587631c79f61903ced075e3 +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="" +fi + +QTMIN=5.15.2 +inherit cmake linux-info optfeature systemd tmpfiles + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="+elogind systemd test" + +REQUIRED_USE="^^ ( elogind systemd )" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + acct-group/sddm + acct-user/sddm + >=dev-qt/qtcore-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + 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/qttest-${QTMIN}:5 ) +" +RDEPEND="${COMMON_DEPEND} + !systemd? ( gui-libs/display-manager-init ) +" +BDEPEND=" + dev-python/docutils + >=dev-qt/linguist-tools-${QTMIN}:5 + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig +" + +PATCHES=( + # Downstream patches + "${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch" + "${FILESDIR}/${PN}-0.18.1-Xsession.patch" # bug 611210 + "${FILESDIR}/${PN}-0.20.0-sddm.pam-use-substack.patch" # bug 728550 + "${FILESDIR}/${PN}-0.20.0-disable-etc-debian-check.patch" + "${FILESDIR}/${PN}-0.20.0-no-default-pam_systemd-module.patch" # bug 669980 +) + +pkg_setup() { + local CONFIG_CHECK="~DRM" + use kernel_linux && linux-info_pkg_setup +} + +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 +} + +src_configure() { + local mycmakeargs=( + -DBUILD_MAN_PAGES=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 +} + +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 + + optfeature "X11 DisplayServer support" x11-base/xorg-server + optfeature "Weston DisplayServer support (EXPERIMENTAL)" dev-libs/weston + optfeature "KWin DisplayServer support (EXPERIMENTAL)" kde-plasma/kwin + + if has_version x11-base/xorg-server; then + ewarn "SDDM version no longer pulls in x11-base/xorg-server via USE=X." + fi + + systemd_reenable sddm.service +} |