From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ShnsF-0000RW-T1 for garchives@archives.gentoo.org; Thu, 21 Jun 2012 20:21:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 932E8E0CB5; Thu, 21 Jun 2012 20:20:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4923DE0CB4 for ; Thu, 21 Jun 2012 20:20:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F8A51B4013 for ; Thu, 21 Jun 2012 20:20:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3F0BBE5435 for ; Thu, 21 Jun 2012 20:20:53 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1340308090.547648a0d41f2e5444f5e43f46fee68abf5489d5.dilfridge@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/, kde-base/kdelibs/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/files/kdelibs-4.8.4-power.patch kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch kde-base/kdelibs/kdelibs-4.8.4.ebuild kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild X-VCS-Directories: kde-base/kdelibs/ kde-base/kdelibs/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 547648a0d41f2e5444f5e43f46fee68abf5489d5 X-VCS-Branch: master Date: Thu, 21 Jun 2012 20:20:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f825d4d6-cc62-4ed5-b785-5d3ea004e323 X-Archives-Hash: 6c02971bb1cf4a960f5500ba8e2ac992 commit: 547648a0d41f2e5444f5e43f46fee68abf5489d5 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Thu Jun 21 19:48:10 2012 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Thu Jun 21 19:48:10 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D547648a0 [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: --for= ce, 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 +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/powermanageme= nt.cpp +index 8dc8535..faadea4 100644 +--- a/solid/solid/powermanagement.cpp ++++ b/solid/solid/powermanagement.cpp +@@ -73,7 +73,7 @@ Solid::PowerManagement::Notifier::Notifier() +=20 + bool Solid::PowerManagement::appShouldConserveResources() + { +- return globalPowerManager->powerSaveStatus; ++ return globalPowerManager->managerIface.GetPowerSaveStatus(); + } +=20 + QSet Solid::PowerManagement::suppor= tedSleepStates() +--=20 +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 +Date: Thu, 14 Jun 2012 02:55:32 +0530 +Subject: [PATCH 1/5] Revert "Disconnect before re-connecting. Soprano do= es + 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/nepomukmai= nmodel.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.is= Connected()) ) { + delete localSocketModel; + localSocketModel =3D 0; +- localSocketClient.disconnect(); + QString socketName =3D KGlobal::dirs()->locateLocal( "socke= t", "nepomuk-socket" ); + kDebug() << "Connecting to local socket" << socketName; + if ( localSocketClient.connect( socketName ) ) { +--=20 +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 +Date: Thu, 14 Jun 2012 02:56:31 +0530 +Subject: [PATCH 2/5] Revert "Always rec-connect if forced (ie. when Nepo= muk + 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/nepomukmai= nmodel.cpp +index ff742d7..be23b38 100644 +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/nepomuk/core/nepomukmainmodel.cpp +@@ -94,7 +94,7 @@ public: +=20 + // 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.is= Connected()) ) { ++ if ( !m_socketConnectFailed && !localSocketClient.isConnected()= ) { + delete localSocketModel; + localSocketModel =3D 0; + QString socketName =3D KGlobal::dirs()->locateLocal( "socke= t", "nepomuk-socket" ); +--=20 +1.7.9.2 + diff --git a/kde-base/kdelibs/kdelibs-4.8.4.ebuild b/kde-base/kdelibs/kde= libs-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=3D" policykit? ( >=3Dsys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=3Ddev-libs/shared-desktop-ontologies-0.8.1 - >=3Ddev-libs/soprano-2.7.56-r1[dbus,raptor,redland] + >=3Ddev-libs/soprano-2.7.6[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl ) @@ -128,6 +128,9 @@ PATCHES=3D( "${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" ) =20 pkg_pretend() { diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdeli= bs/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=3D" policykit? ( >=3Dsys-auth/polkit-qt-0.103.0 ) semantic-desktop? ( >=3Ddev-libs/shared-desktop-ontologies-0.8.1 - >=3Ddev-libs/soprano-2.7.56-r1[dbus,raptor,redland] + >=3Ddev-libs/soprano-2.7.6[dbus,raptor,redland] ) spell? ( app-text/enchant ) ssl? ( dev-libs/openssl )