* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.8.4-sopranorevert2.patch kdelibs-4.8.4-sopranorevert1.patch kdelibs-4.8.4-power.patch kdelibs-4.8.4-bytecode.patch
@ 2012-06-21 21:54 Andreas HAttel (dilfridge)
0 siblings, 0 replies; only message in thread
From: Andreas HAttel (dilfridge) @ 2012-06-21 21:54 UTC (permalink / raw
To: gentoo-commits
dilfridge 12/06/21 21:54:30
Added: kdelibs-4.8.4-sopranorevert2.patch
kdelibs-4.8.4-sopranorevert1.patch
kdelibs-4.8.4-power.patch
kdelibs-4.8.4-bytecode.patch
Log:
KDE 4.8.4 version bump
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64, RepoMan options: --force)
Revision Changes Path
1.1 kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert2.patch?rev=1.1&content-type=text/plain
Index: kdelibs-4.8.4-sopranorevert2.patch
===================================================================
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
1.1 kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.4-sopranorevert1.patch?rev=1.1&content-type=text/plain
Index: kdelibs-4.8.4-sopranorevert1.patch
===================================================================
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
1.1 kde-base/kdelibs/files/kdelibs-4.8.4-power.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.4-power.patch?rev=1.1&content-type=text/plain
Index: kdelibs-4.8.4-power.patch
===================================================================
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
1.1 kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kdelibs/files/kdelibs-4.8.4-bytecode.patch?rev=1.1&content-type=text/plain
Index: kdelibs-4.8.4-bytecode.patch
===================================================================
--- cmake/modules/PythonMacros.cmake.orig 2012-05-31 23:28:04.035788719 +0200
+++ cmake/modules/PythonMacros.cmake 2012-05-31 23:30:13.997840354 +0200
@@ -24,39 +24,41 @@
INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
# Byte compile and install the .pyc file.
- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
-
- if(WIN32)
- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
- endif(WIN32)
-
- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
-
- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
-
- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
-
- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
- ADD_CUSTOM_COMMAND(
- TARGET compile_python_files
- COMMAND ${CMAKE_COMMAND} -E echo ${_message}
- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
- DEPENDS ${_absfilename}
- )
- ELSE(_abs_bin_py STREQUAL ${_absfilename})
- ADD_CUSTOM_COMMAND(
- TARGET compile_python_files
- COMMAND ${CMAKE_COMMAND} -E echo ${_message}
- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
- DEPENDS ${_absfilename}
- )
- ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+ IF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
+ GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
+ GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
+ GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
+ GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+
+ if(WIN32)
+ string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
+ endif(WIN32)
+
+ SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+ SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+
+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+
+ SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+
+ GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+ IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
+ ADD_CUSTOM_COMMAND(
+ TARGET compile_python_files
+ COMMAND ${CMAKE_COMMAND} -E echo ${_message}
+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+ DEPENDS ${_absfilename}
+ )
+ ELSE(_abs_bin_py STREQUAL ${_absfilename})
+ ADD_CUSTOM_COMMAND(
+ TARGET compile_python_files
+ COMMAND ${CMAKE_COMMAND} -E echo ${_message}
+ COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+ COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+ DEPENDS ${_absfilename}
+ )
+ ENDIF(_abs_bin_py STREQUAL ${_absfilename})
- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
+ INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
+ ENDIF("$ENV{PYTHONDONTWRITEBYTECODE}" STREQUAL "")
ENDMACRO(PYTHON_INSTALL)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-21 21:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-21 21:54 [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs/files: kdelibs-4.8.4-sopranorevert2.patch kdelibs-4.8.4-sopranorevert1.patch kdelibs-4.8.4-power.patch kdelibs-4.8.4-bytecode.patch Andreas HAttel (dilfridge)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox