diff options
| author |   Jauhien Piatlicki <jauhien@gentoo.org> | 2014-10-18 17:53:58 +0000 |
|---|---|---|
| committer | Jauhien Piatlicki <jauhien@gentoo.org> | 2014-10-18 17:53:58 +0000 |
| commit | 92b4aa0c8ebce389f0cc06aa09d10751c7990f81 (patch) | |
| tree | d2488d8e34d9f6499730e3c18b2fdad30343b89c /x11-misc | |
| parent | version bump that fixes security issues, bug 524390 (diff) | |
| download | gentoo-2-92b4aa0c8ebce389f0cc06aa09d10751c7990f81.tar.gz gentoo-2-92b4aa0c8ebce389f0cc06aa09d10751c7990f81.tar.bz2 gentoo-2-92b4aa0c8ebce389f0cc06aa09d10751c7990f81.zip | |
fix ebuild (some fixes were lost during version bump as I used old ebuild)
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/sddm/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.9.0-consolekit.patch | 13 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.9.0-upower.patch | 12 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-0.10.0.ebuild | 4 |
4 files changed, 9 insertions, 27 deletions
diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog index cc4347e2fc0a..cece85b2169f 100644 --- a/x11-misc/sddm/ChangeLog +++ b/x11-misc/sddm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/sddm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.13 2014/10/18 17:49:16 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.14 2014/10/18 17:53:57 jauhien Exp $ + + 18 Oct 2014; Jauhien Piatlicki <jauhien@gentoo.org> + -files/sddm-0.9.0-consolekit.patch, -files/sddm-0.9.0-upower.patch, + sddm-0.10.0.ebuild: + fix ebuild (some fixes were lost during version bump as I used old ebuild) *sddm-0.10.0 (18 Oct 2014) diff --git a/x11-misc/sddm/files/sddm-0.9.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.9.0-consolekit.patch deleted file mode 100644 index acdfdc1a43e2..000000000000 --- a/x11-misc/sddm/files/sddm-0.9.0-consolekit.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/scripts/Xsession b/data/scripts/Xsession -index a5d270d..4b48524 100755 ---- a/data/scripts/Xsession -+++ b/data/scripts/Xsession -@@ -74,7 +74,7 @@ case $session in - exec xterm -geometry 80x24-0-0 - ;; - *) -- eval exec "$session" -+ eval exec ck-launch-session "$session" - ;; - esac - exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/x11-misc/sddm/files/sddm-0.9.0-upower.patch b/x11-misc/sddm/files/sddm-0.9.0-upower.patch deleted file mode 100644 index 8c0f34c27e8b..000000000000 --- a/x11-misc/sddm/files/sddm-0.9.0-upower.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp ---- sddm-0.9.0.orig/src/daemon/PowerManager.cpp 2014-10-01 18:40:37.402683578 +0200 -+++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164 +0200 -@@ -197,7 +197,7 @@ - m_backends << new Login1Backend(); - - // check if upower interface exists -- if (interface->isServiceRegistered(UPOWER_SERVICE)) -+// if (interface->isServiceRegistered(UPOWER_SERVICE)) - m_backends << new UPowerBackend(); - } - diff --git a/x11-misc/sddm/sddm-0.10.0.ebuild b/x11-misc/sddm/sddm-0.10.0.ebuild index 7a57840a6d01..d266f66d8dbf 100644 --- a/x11-misc/sddm/sddm-0.10.0.ebuild +++ b/x11-misc/sddm/sddm-0.10.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.10.0.ebuild,v 1.1 2014/10/18 17:49:16 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.10.0.ebuild,v 1.2 2014/10/18 17:53:57 jauhien Exp $ EAPI=5 inherit cmake-utils toolchain-funcs user @@ -16,6 +16,7 @@ IUSE="consolekit systemd +upower" REQUIRED_USE="?? ( upower systemd )" RDEPEND="sys-libs/pam + >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb(-)] dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -37,6 +38,7 @@ pkg_pretend() { src_prepare() { use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" + use upower && epatch "${FILESDIR}/${P}-upower.patch" # respect user's cflags sed -e 's|-Wall -march=native||' \ |