diff options
| author |   Jauhien Piatlicki <jpiatlicki@zertisa.com> | 2014-10-18 20:12:53 +0200 |
|---|---|---|
| committer | Jauhien Piatlicki <jpiatlicki@zertisa.com> | 2014-10-18 20:12:53 +0200 |
| commit | 3543e0ac77a51f975e1c6175f2a64d2eacacd404 (patch) | |
| tree | eaeb830d4fb6d75d5dc6d8840822fe4d3481a34e /x11-misc/sddm | |
| parent | Merge pull request #82 from iXit/master (diff) | |
| download | qt-3543e0ac77a51f975e1c6175f2a64d2eacacd404.tar.gz qt-3543e0ac77a51f975e1c6175f2a64d2eacacd404.tar.bz2 qt-3543e0ac77a51f975e1c6175f2a64d2eacacd404.zip | |
[x11-misc/sddm] sync with tree: fix bug 524072 and temporary fix bug 523630
Diffstat (limited to 'x11-misc/sddm')
| -rw-r--r-- | x11-misc/sddm/files/sddm-9999-upower.patch | 12 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-9999.ebuild | 2 |
2 files changed, 14 insertions, 0 deletions
diff --git a/x11-misc/sddm/files/sddm-9999-upower.patch b/x11-misc/sddm/files/sddm-9999-upower.patch new file mode 100644 index 00000000..8c0f34c2 --- /dev/null +++ b/x11-misc/sddm/files/sddm-9999-upower.patch @@ -0,0 +1,12 @@ +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-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index 548297ac..48ba4c85 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -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||' \ |