[gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/

["Andreas Hüttel" <dilfridge@gentoo.org>]

commit:     547648a0d41f2e5444f5e43f46fee68abf5489d5
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jun 21 19:48:10 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 19:48:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=547648a0

[kde-base/kdelibs] make 4.8.x work with soprano-2.7.6 again

(Portage version: 2.2.0_alpha110/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 kde-base/kdelibs/files/kdelibs-4.8.4-power.patch   |   25 +++++++++++++++++
 .../files/kdelibs-4.8.4-sopranorevert1.patch       |   28 +++++++++++++++++++
 .../files/kdelibs-4.8.4-sopranorevert2.patch       |   29 ++++++++++++++++++++
 kde-base/kdelibs/kdelibs-4.8.4.ebuild              |    5 +++-
 kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild        |    2 +-
 5 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch
new file mode 100644
index 0000000..61ea0aa
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch
@@ -0,0 +1,25 @@
+From 5926264d13900efec70aaac434b7b67f9d8e6837 Mon Sep 17 00:00:00 2001
+From: Lukas Tinkl <lukas@kde.org>
+Date: Tue, 19 Jun 2012 18:27:04 +0200
+Subject: [PATCH 5/5] correctly report power saving status
+
+---
+ solid/solid/powermanagement.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/solid/solid/powermanagement.cpp b/solid/solid/powermanagement.cpp
+index 8dc8535..faadea4 100644
+--- a/solid/solid/powermanagement.cpp
++++ b/solid/solid/powermanagement.cpp
+@@ -73,7 +73,7 @@ Solid::PowerManagement::Notifier::Notifier()
+ 
+ bool Solid::PowerManagement::appShouldConserveResources()
+ {
+-    return globalPowerManager->powerSaveStatus;
++    return globalPowerManager->managerIface.GetPowerSaveStatus();
+ }
+ 
+ QSet<Solid::PowerManagement::SleepState> Solid::PowerManagement::supportedSleepStates()
+-- 
+1.7.9.2
+

diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch
new file mode 100644
index 0000000..59c3174
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch
@@ -0,0 +1,28 @@
+From 76e0376d7582cfe5b898c56bf3779ca2279dace8 Mon Sep 17 00:00:00 2001
+From: Vishesh Handa <me@vhanda.in>
+Date: Thu, 14 Jun 2012 02:55:32 +0530
+Subject: [PATCH 1/5] Revert "Disconnect before re-connecting. Soprano does
+ not do that for us."
+
+This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf.
+
+This is being done so that KDE 4.8.x works with Soprano 2.7.6
+---
+ nepomuk/core/nepomukmainmodel.cpp |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
+index 8dc0b1f..ff742d7 100644
+--- a/nepomuk/core/nepomukmainmodel.cpp
++++ b/nepomuk/core/nepomukmainmodel.cpp
+@@ -97,7 +97,6 @@ public:
+         if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
+             delete localSocketModel;
+             localSocketModel = 0;
+-            localSocketClient.disconnect();
+             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
+             kDebug() << "Connecting to local socket" << socketName;
+             if ( localSocketClient.connect( socketName ) ) {
+-- 
+1.7.9.2
+

diff --git a/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch
new file mode 100644
index 0000000..206e654
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch
@@ -0,0 +1,29 @@
+From bde5aad1e9f7bfb6f8d5c60197797de4a315158d Mon Sep 17 00:00:00 2001
+From: Vishesh Handa <me@vhanda.in>
+Date: Thu, 14 Jun 2012 02:56:31 +0530
+Subject: [PATCH 2/5] Revert "Always rec-connect if forced (ie. when Nepomuk
+ server restarts)"
+
+This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91.
+
+This is done so that 4.8.x works with Soprano 2.7.6
+---
+ nepomuk/core/nepomukmainmodel.cpp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
+index ff742d7..be23b38 100644
+--- a/nepomuk/core/nepomukmainmodel.cpp
++++ b/nepomuk/core/nepomukmainmodel.cpp
+@@ -94,7 +94,7 @@ public:
+ 
+         // we may get disconnected from the server but we don't want to try
+         // to connect every time the model is requested
+-        if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
++        if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
+             delete localSocketModel;
+             localSocketModel = 0;
+             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
+-- 
+1.7.9.2
+

diff --git a/kde-base/kdelibs/kdelibs-4.8.4.ebuild b/kde-base/kdelibs/kdelibs-4.8.4.ebuild
index 28d09d4..c56902b 100644
--- a/kde-base/kdelibs/kdelibs-4.8.4.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.8.4.ebuild
@@ -77,7 +77,7 @@ COMMONDEPEND="
 	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
 	semantic-desktop? (
 		>=dev-libs/shared-desktop-ontologies-0.8.1
-		>=dev-libs/soprano-2.7.56-r1[dbus,raptor,redland]
+		>=dev-libs/soprano-2.7.6[dbus,raptor,redland]
 	)
 	spell? ( app-text/enchant )
 	ssl? ( dev-libs/openssl )
@@ -128,6 +128,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.8.1-norpath.patch"
 	"${FILESDIR}/${PN}-4.8.2-calculator_key.patch"
 	"${FILESDIR}/${PN}-4.8.4-bytecode.patch"
+	"${FILESDIR}/${PN}-4.8.4-sopranorevert1.patch"
+	"${FILESDIR}/${PN}-4.8.4-sopranorevert2.patch"
+	"${FILESDIR}/${PN}-4.8.4-power.patch"
 )
 
 pkg_pretend() {

diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild
index c1bc0d0..89d0593 100644
--- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild
@@ -78,7 +78,7 @@ COMMONDEPEND="
 	policykit? ( >=sys-auth/polkit-qt-0.103.0 )
 	semantic-desktop? (
 		>=dev-libs/shared-desktop-ontologies-0.8.1
-		>=dev-libs/soprano-2.7.56-r1[dbus,raptor,redland]
+		>=dev-libs/soprano-2.7.6[dbus,raptor,redland]
 	)
 	spell? ( app-text/enchant )
 	ssl? ( dev-libs/openssl )