summaryrefslogtreecommitdiff
path: root/extra/kdebase-workspace
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-05 14:32:52 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-05 14:32:52 -0300
commit2699a201e0f70a2e1c2f7a0cab8725321649893d (patch)
treeb9f1b7eaa65592b658bb922714a975725e244d3c /extra/kdebase-workspace
parent8d1750d5bec9ffb69b499a8452d7c2c52cea70e5 (diff)
parent359d940358dec836dd0acfe9d9caf0b1ff0a97fe (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bacula/PKGBUILD community/clementine/PKGBUILD community/dbus-sharp-glib/PKGBUILD community/dockmanager/PKGBUILD community/docky/PKGBUILD community/flightgear-atlas/PKGBUILD community/libdesktop-agnostic/PKGBUILD community/openmovieeditor/PKGBUILD community/perl-crypt-openssl-bignum/PKGBUILD community/perl-crypt-openssl-random/PKGBUILD community/perl-crypt-openssl-rsa/PKGBUILD community/tucan/PKGBUILD core/btrfs-progs-unstable/PKGBUILD core/module-init-tools/PKGBUILD core/sqlite3/PKGBUILD.mips64el extra/bogofilter/PKGBUILD extra/dirmngr/PKGBUILD extra/gluezilla/PKGBUILD extra/gnupg/PKGBUILD extra/gnupg2/PKGBUILD extra/gpgme/PKGBUILD extra/kdeaccessibility/PKGBUILD extra/kdelibs/PKGBUILD extra/kdeutils/PKGBUILD extra/libassuan/PKGBUILD extra/libksba/PKGBUILD extra/oxygen-gtk/PKGBUILD extra/pinentry/PKGBUILD extra/pth/PKGBUILD extra/smplayer-themes/PKGBUILD libre/kdeutils-libre/PKGBUILD libre/linux-libre/linux-libre.preset.mips64el
Diffstat (limited to 'extra/kdebase-workspace')
-rw-r--r--extra/kdebase-workspace/fix-powerprofiles.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/extra/kdebase-workspace/fix-powerprofiles.patch b/extra/kdebase-workspace/fix-powerprofiles.patch
deleted file mode 100644
index 309fcf3db..000000000
--- a/extra/kdebase-workspace/fix-powerprofiles.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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&amp;a=commitdiff&amp;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()) {
-