diff options
| author | Jonathan Callen <abcd@gentoo.org> | 2013-05-10 05:16:43 -0400 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2013-05-10 05:16:43 -0400 |
| commit | b84c1c23fae6298a15046983ac55ac58da5e9ec2 (patch) | |
| tree | 2f496c34de592697b9c878ad094890a66f7a3f1e | |
| parent | debea7518c1fc22244ff4fd126422d64df3e3a40 (diff) | |
| download | kde-b84c1c23fae6298a15046983ac55ac58da5e9ec2.tar.gz kde-b84c1c23fae6298a15046983ac55ac58da5e9ec2.tar.bz2 kde-b84c1c23fae6298a15046983ac55ac58da5e9ec2.zip | |
[kde-base/ksmserver] Update patch, remove unneeded solid dep
| -rw-r--r-- | kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch | 22 | ||||
| -rw-r--r-- | kde-base/ksmserver/ksmserver-9999.ebuild | 4 |
2 files changed, 23 insertions, 3 deletions
diff --git a/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch b/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch new file mode 100644 index 00000000000..4e3753ad09b --- /dev/null +++ b/kde-base/ksmserver/files/ksmserver-4.10.50-noplasmalock.patch @@ -0,0 +1,22 @@ +diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp +index f0526cf..feb3c8e 100644 +--- a/ksmserver/screenlocker/ksldapp.cpp ++++ b/ksmserver/screenlocker/ksldapp.cpp +@@ -278,12 +278,12 @@ void KSldApp::lockProcessReady() + + bool KSldApp::startLockProcess() + { +- if (m_plasmaEnabled) { +- m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")), +- QStringList() << QLatin1String("--nofork")); +- } else { ++// if (m_plasmaEnabled) { ++// m_lockProcess->start(KStandardDirs::findExe(QLatin1String("plasma-overlay")), ++// QStringList() << QLatin1String("--nofork")); ++// } else { + m_lockProcess->start(KStandardDirs::findExe(QLatin1String("kscreenlocker_greet"))); +- } ++// } + // we wait one minute + if (!m_lockProcess->waitForStarted(60000)) { + m_lockProcess->kill(); diff --git a/kde-base/ksmserver/ksmserver-9999.ebuild b/kde-base/ksmserver/ksmserver-9999.ebuild index f164aee030b..44f6f1614a0 100644 --- a/kde-base/ksmserver/ksmserver-9999.ebuild +++ b/kde-base/ksmserver/ksmserver-9999.ebuild @@ -15,7 +15,6 @@ IUSE="debug" DEPEND=" $(add_kdebase_dep kcminit) $(add_kdebase_dep libkworkspace) - $(add_kdebase_dep solid) media-libs/qimageblitz x11-libs/libICE x11-libs/libSM @@ -30,9 +29,8 @@ KMEXTRACTONLY=" kcheckpass/ libs/kephal/ libs/kworkspace/ - solid/ " KMLOADLIBS="libkworkspace" -PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" ) +PATCHES=( "${FILESDIR}/${PN}-4.10.50-noplasmalock.patch" ) |