commit: dc186212892ef0c9872c16b73f55f79a96f0198e Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun May 27 20:26:08 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun May 27 21:34:11 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc186212
x11-misc/sddm: Upstream adj. to sddm.service to fix logind race cond. Closes: https://bugs.gentoo.org/656286 Package-Manager: Portage-2.3.40, Repoman-2.3.9 x11-misc/sddm/files/sddm-0.17.0-logind-race.patch | 26 +++++++ x11-misc/sddm/sddm-0.17.0-r3.ebuild | 83 +++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch new file mode 100644 index 00000000000..a55702061c9 --- /dev/null +++ b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch @@ -0,0 +1,26 @@ +From fca8c808b7fa4a947a0c60157f0eb5227b3ccfff Mon Sep 17 00:00:00 2001 +From: Pier Luigi Fiorini <[email protected]> +Date: Mon, 26 Feb 2018 09:03:05 +0100 +Subject: [PATCH] Fix race between sddm and logind + +Make sure sddm is run after logind. +An explicit dependency will make sddm run after logind every time. + +Closes: #978 +--- + services/sddm.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/services/sddm.service.in b/services/sddm.service.in +index df03d92a..9d7618c6 100644 +--- a/services/sddm.service.in ++++ b/services/sddm.service.in +@@ -2,7 +2,7 @@ + Description=Simple Desktop Display Manager + Documentation=man:sddm(1) man:sddm.conf(5) + [email protected] +-After=systemd-user-sessions.service [email protected] plymouth-quit.service ++After=systemd-user-sessions.service [email protected] plymouth-quit.service systemd-logind.service + + [Service] + ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm diff --git a/x11-misc/sddm/sddm-0.17.0-r3.ebuild b/x11-misc/sddm/sddm-0.17.0-r3.ebuild new file mode 100644 index 00000000000..623e779a6f1 --- /dev/null +++ b/x11-misc/sddm/sddm-0.17.0-r3.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW" +inherit cmake-utils l10n systemd user + +DESCRIPTION="Simple Desktop Display Manager" +HOMEPAGE="https://github.com/sddm/sddm"; +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"; +KEYWORDS="amd64 ~arm ~arm64 x86" + +LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" +SLOT="0" +IUSE="consolekit elogind +pam systemd test" + +REQUIRED_USE="?? ( elogind systemd )" + +RDEPEND=" + >=dev-qt/qtcore-5.6:5 + >=dev-qt/qtdbus-5.6:5 + >=dev-qt/qtdeclarative-5.6:5 + >=dev-qt/qtgui-5.6:5 + >=dev-qt/qtnetwork-5.6:5 + >=x11-base/xorg-server-1.15.1 + x11-libs/libxcb[xkb] + consolekit? ( >=sys-auth/consolekit-0.9.4 ) + elogind? ( sys-auth/elogind ) + pam? ( sys-libs/pam ) + systemd? ( sys-apps/systemd:= ) + !systemd? ( sys-power/upower )" + +DEPEND="${RDEPEND} + dev-python/docutils + >=dev-qt/linguist-tools-5.6:5 + kde-frameworks/extra-cmake-modules + virtual/pkgconfig + test? ( >=dev-qt/qttest-5.6:5 )" + +PATCHES=( + "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108 + "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210 + "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920 + "${FILESDIR}/${P}-logind-race.patch" # bug 656286 + # TODO: not yet upstream + "${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888 +) + +src_prepare() { + cmake-utils_src_prepare + + disable_locale() { + sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die + } + l10n_find_plocales_changes "data/translations" "" ".ts" + l10n_for_each_disabled_locale_do disable_locale + + use test || cmake_comment_add_subdirectory test +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PAM=$(usex pam) + -DNO_SYSTEMD=$(usex '!systemd') + -DUSE_ELOGIND=$(usex 'elogind') + -DBUILD_MAN_PAGES=ON + -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die +} + +pkg_postinst() { + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video + + systemd_reenable sddm.service +}
