diff options
| author | root <root@rshg054.dnsready.net> | 2011-11-01 23:15:01 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-11-01 23:15:01 +0000 |
| commit | 37a1064b8105764414f279ced442e6ba2f63bea1 (patch) | |
| tree | 173b87cd6535e622eff464080b398e0330df72bc /staging/kdebase-workspace | |
| parent | 560562e36a27da267f2f4f7989806790192888ef (diff) | |
Tue Nov 1 23:15:01 UTC 2011
Diffstat (limited to 'staging/kdebase-workspace')
| -rw-r--r-- | staging/kdebase-workspace/PKGBUILD | 12 | ||||
| -rw-r--r-- | staging/kdebase-workspace/fix-powerprofiles.patch | 23 |
2 files changed, 31 insertions, 4 deletions
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD index 3e541e11d..0a63ec61b 100644 --- a/staging/kdebase-workspace/PKGBUILD +++ b/staging/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 141514 2011-10-31 03:38:12Z andrea $ +# $Id: PKGBUILD 141627 2011-10-31 22:51:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -33,7 +33,8 @@ backup=('usr/share/config/kdm/kdmrc' options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' - 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'fix-powerprofiles.patch') sha1sums=('3f65d3f075cb3d71d26e768d0d8e1c26b49b4774' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' @@ -42,7 +43,8 @@ sha1sums=('3f65d3f075cb3d71d26e768d0d8e1c26b49b4774' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + '7c514a0727f904359d2ab12078e9868488ded3e6') build() { cd "${srcdir}"/${_pkgname}-${pkgver} @@ -51,6 +53,8 @@ build() { patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch + patch -Rp1 -i "${srcdir}"/fix-powerprofiles.patch + cd "${srcdir}" mkdir build cd build diff --git a/staging/kdebase-workspace/fix-powerprofiles.patch b/staging/kdebase-workspace/fix-powerprofiles.patch new file mode 100644 index 000000000..309fcf3db --- /dev/null +++ b/staging/kdebase-workspace/fix-powerprofiles.patch @@ -0,0 +1,23 @@ +From: Dario Freddi <drf@kde.org> +Date: Tue, 04 Oct 2011 14:09:09 +0000 +Subject: Use full config when reading settings +X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=8d59876457387d1c72ca3626ae2d267adf100014 +--- +Use full config when reading settings + +BUG: 267323 +--- + + +--- a/powerdevil/daemon/powerdevilcore.cpp ++++ b/powerdevil/daemon/powerdevilcore.cpp +@@ -88,7 +88,7 @@ void Core::onBackendReady() + { + kDebug() << "Backend is ready, KDE Power Management system initialized"; + +- m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig); ++ m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::FullConfig); + + // Is it brand new? + if (m_profilesConfig->groupList().isEmpty()) { + |