x11-misc/sddm/sddm-0.14.0-r4 : Fix Session selection in Elarun Theme

3 files changed, 183 insertions, 0 deletions

diff --git a/profiles/package.mask/elogind b/profiles/package.mask/elogind
index 758901c..555670b 100644
--- a/profiles/package.mask/elogind
+++ b/profiles/package.mask/elogind
@@ -20,3 +20,4 @@
 =x11-apps/xinit-1.3.4-r2
 =x11-base/xorg-server-1.18.4-r1
 =x11-misc/sddm-0.14.0-r3
+=x11-misc/sddm-0.14.0-r4
diff --git a/x11-misc/sddm/files/sddm-0.14.0-fix_session_selection.patch b/x11-misc/sddm/files/sddm-0.14.0-fix_session_selection.patch
new file mode 100644
index 0000000..23664d9
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.14.0-fix_session_selection.patch
@@ -0,0 +1,87 @@
+diff --git a/data/themes/elarun/Main.qml b/data/themes/elarun/Main.qml
+index 174a3b8..b5831c2 100644
+--- a/data/themes/elarun/Main.qml
++++ b/data/themes/elarun/Main.qml
+@@ -33,6 +33,8 @@ Rectangle {
+     LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft
+     LayoutMirroring.childrenInherit: true
+ 
++    property int sessionIndex: session.index
++
+     TextConstants { id: textConstants }
+ 
+     Connections {
+@@ -132,7 +134,7 @@ Rectangle {
+ 
+                             Keys.onPressed: {
+                                 if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+-                                    sddm.login(user_entry.text, pw_entry.text, menu_session.index)
++                                    sddm.login(user_entry.text, pw_entry.text, sessionIndex)
+                                     event.accepted = true
+                                 }
+                             }
+@@ -148,7 +150,7 @@ Rectangle {
+ 
+                     source: "images/login_normal.png"
+ 
+-                    onClicked: sddm.login(user_entry.text, pw_entry.text, menu_session.index)
++                    onClicked: sddm.login(user_entry.text, pw_entry.text, sessionIndex)
+ 
+                     KeyNavigation.backtab: pw_entry; KeyNavigation.tab: session_button
+                 }
+@@ -213,15 +215,6 @@ Rectangle {
+                         font.bold: true
+                         font.pixelSize: 12
+                     }
+-
+-                    Menu {
+-                        id: menu_session
+-                        width: 200; height: 0
+-                        anchors.top: buttonRow.bottom; anchors.left: buttonRow.left
+-
+-                        model: sessionModel
+-                        index: sessionModel.lastIndex
+-                    }
+                 }
+             }
+         }
+diff --git a/data/themes/maldives/Main.qml b/data/themes/maldives/Main.qml
+index 00feea4..49fbe02 100644
+--- a/data/themes/maldives/Main.qml
++++ b/data/themes/maldives/Main.qml
+@@ -33,6 +33,8 @@ Rectangle {
+     LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft
+     LayoutMirroring.childrenInherit: true
+ 
++    property int sessionIndex: session.index
++
+     TextConstants { id: textConstants }
+ 
+     Connections {
+@@ -121,7 +123,7 @@ Rectangle {
+ 
+                         Keys.onPressed: {
+                             if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+-                                sddm.login(name.text, password.text, session.index)
++                                sddm.login(name.text, password.text, sessionIndex)
+                                 event.accepted = true
+                             }
+                         }
+@@ -148,7 +150,7 @@ Rectangle {
+ 
+                         Keys.onPressed: {
+                             if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+-                                sddm.login(name.text, password.text, session.index)
++                                sddm.login(name.text, password.text, sessionIndex)
+                                 event.accepted = true
+                             }
+                         }
+@@ -237,7 +239,7 @@ Rectangle {
+                         text: textConstants.login
+                         width: parent.btnWidth
+ 
+-                        onClicked: sddm.login(name.text, password.text, session.index)
++                        onClicked: sddm.login(name.text, password.text, sessionIndex)
+ 
+                         KeyNavigation.backtab: layoutBox; KeyNavigation.tab: shutdownButton
+                     }
diff --git a/x11-misc/sddm/sddm-0.14.0-r4.ebuild b/x11-misc/sddm/sddm-0.14.0-r4.ebuild
new file mode 100644
index 0000000..02c35cc
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.14.0-r4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils 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.xz"
+KEYWORDS="~amd64 ~arm ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="debug consolekit elogind +pam systemd"
+
+REQUIRED_USE="elogind? ( !systemd )
+	systemd? ( !elogind )
+"
+
+RDEPEND=">=dev-qt/qtcore-5.6:5
+	>=dev-qt/qtdbus-5.6:5
+	>=dev-qt/qtgui-5.6:5
+	>=dev-qt/qtdeclarative-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 sys-power/upower-pm-utils ) )"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils
+	>=dev-qt/linguist-tools-5.6:5
+	>=dev-qt/qttest-5.6:5
+	kde-frameworks/extra-cmake-modules
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.0-pam_kwallet.patch
+	# fix for flags handling and bug 563108
+	"${FILESDIR}"/${PN}-0.12.0-respect-user-flags.patch
+	"${FILESDIR}"/${PN}-enable-elogind.patch
+	"${FILESDIR}"/${PN}-0.14.0-fix_session_selection.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
+		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
+			die 'The active compiler needs to be gcc 4.7 (or newer)'
+		fi
+	fi
+}
+
+src_prepare() {
+	use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	if use debug; then
+		CMAKE_BUILD_TYPE=debug
+	fi
+	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
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+	if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then
+		local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login)
+		if [[ -z ${line} ]]; then
+			ewarn
+			ewarn "Erroneous /etc/pam.d/system-login settings detected!"
+			ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:"
+			ewarn
+			ewarn "session      optional      pam_ck_connector.so nox11"
+			ewarn
+			ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update."
+			ewarn
+		fi
+	fi
+}