commit: 74fd8aa97757eb583822d3f4bb0ea9d8d03b4828
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 19:48:01 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 20:01:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74fd8aa9
x11-misc/sddm: drop 0.20.0-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-misc/sddm/Manifest | 2 -
x11-misc/sddm/files/sddm-0.18.1-Xsession.patch | 24 -----
x11-misc/sddm/sddm-0.20.0-r1.ebuild | 143 -------------------------
3 files changed, 169 deletions(-)
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 62a7a158873c..8d6ee0946cd6 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,6 +1,4 @@
DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B
b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1
SHA512
30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4
DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
SHA512
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
-DIST sddm-0.20.0-patchset.tar.xz 4024 BLAKE2B
cb138568a158fb1070c3f4ed4182867973abef257e7b551a373a5d17adf19c15474cff27a3662de9fa674da218e9b04374802d0f1813569ce2966257903ac791
SHA512
fe07102ac4e41cc9e212f795405db8e4dac342c1dde2ec3b47002aaf251fc6a7641af4226f4729ef3325f070a77d6448602fffe7b5ff775b9dbfb57db9004d3c
-DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B
8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105
SHA512
0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a
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
diff --git a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
deleted file mode 100644
index e1e3c1527be7..000000000000
--- a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -50,6 +50,10 @@
- ;;
- esac
-
-+# Make D-Bus start properly, see:
-+# /etc/X11/xinit/xinitrc.d/80-dbus
-+command="$@"
-+
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f $HOME/.xprofile ] && . $HOME/.xprofile
-
-@@ -94,8 +98,8 @@
- . "$USERXSESSION"
- fi
-
--if [ -z "$*" ]; then
-+if [ -z "$command" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION
is no valid session."
- else
-- exec $@
-+ exec $command
- fi
diff --git a/x11-misc/sddm/sddm-0.20.0-r1.ebuild
b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
deleted file mode 100644
index 813a5d7bf9e0..000000000000
--- a/x11-misc/sddm/sddm-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET="${P}-patchset"
-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/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-QTMIN=5.15.2
-inherit cmake linux-info optfeature systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm";
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz";
-
-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}
- x11-base/xorg-server
- !systemd? ( gui-libs/display-manager-init )
-"
-BDEPEND="
- dev-python/docutils
- >=dev-qt/linguist-tools-${QTMIN}:5
- kde-frameworks/extra-cmake-modules:0
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Downstream patches
- "${FILESDIR}/${P}-respect-user-flags.patch"
- "${FILESDIR}/${PN}-0.18.1-Xsession.patch" # bug 611210
- "${WORKDIR}/${PATCHSET}/${P}-sddm.pam-use-substack.patch" # bug 728550
- "${WORKDIR}/${PATCHSET}/${P}-disable-etc-debian-check.patch"
- "${WORKDIR}/${PATCHSET}/${P}-no-default-pam_systemd-module.patch" # bug
669980
- # git master
- "${WORKDIR}/${PATCHSET}/${P}-fix-use-development-sessions.patch"
- "${WORKDIR}/${PATCHSET}/${P}-greeter-platform-detection.patch"
- "${WORKDIR}/${PATCHSET}/${P}-no-qtvirtualkeyboard-on-wayland.patch"
- "${WORKDIR}/${PATCHSET}/${P}-dbus-policy-in-usr.patch"
-)
-
-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
-}
-
-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 "Weston DisplayServer support (EXPERIMENTAL)" dev-libs/weston
- optfeature "KWin DisplayServer support (EXPERIMENTAL)" kde-plasma/kwin
-
- systemd_reenable sddm.service
-}
