[kdelibs/f18] respin solid_qt_no_debug_output.patch
Rex Dieter
rdieter at fedoraproject.org
Wed Dec 12 21:45:22 UTC 2012
commit f34f6c91b430705502c3436b5a88306be52ab132
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Dec 12 15:45:08 2012 -0600
respin solid_qt_no_debug_output.patch
kdelibs-solid_qt_no_debug_output.patch | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/kdelibs-solid_qt_no_debug_output.patch b/kdelibs-solid_qt_no_debug_output.patch
index f39c0ba..743f39c 100644
--- a/kdelibs-solid_qt_no_debug_output.patch
+++ b/kdelibs-solid_qt_no_debug_output.patch
@@ -1,6 +1,21 @@
-diff -up kdelibs-4.9.4/solid/solid/CMakeLists.txt.no_solid_spam kdelibs-4.9.4/solid/solid/CMakeLists.txt
---- kdelibs-4.9.4/solid/solid/CMakeLists.txt.no_solid_spam 2012-12-12 11:54:59.644811835 -0600
-+++ kdelibs-4.9.4/solid/solid/CMakeLists.txt 2012-12-12 12:03:11.093451554 -0600
+diff -up kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp
+--- kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp.solid_qt_no_debug_output 2012-12-12 14:52:52.199346662 -0600
++++ kdelibs-4.9.4/solid/solid/backends/udisks2/udisksstorageaccess.cpp 2012-12-12 15:44:40.854085494 -0600
+@@ -341,9 +341,10 @@ bool StorageAccess::requestPassphrase()
+ QDBusReply<void> reply = soliduiserver.call("showPassphraseDialog", udi, returnService,
+ m_lastReturnObject, wId, appId);
+ m_passphraseRequested = reply.isValid();
++#ifndef QT_NO_DEBUG_STREAM
+ if (!m_passphraseRequested)
+ qWarning() << "Failed to call the SolidUiServer, D-Bus said:" << reply.error();
+-
++#endif
+ return m_passphraseRequested;
+ }
+
+diff -up kdelibs-4.9.4/solid/solid/CMakeLists.txt.solid_qt_no_debug_output kdelibs-4.9.4/solid/solid/CMakeLists.txt
+--- kdelibs-4.9.4/solid/solid/CMakeLists.txt.solid_qt_no_debug_output 2012-12-12 14:52:52.194346712 -0600
++++ kdelibs-4.9.4/solid/solid/CMakeLists.txt 2012-12-12 14:52:52.203346619 -0600
@@ -240,7 +240,7 @@ if(NOT WIN32 AND NOT APPLE)
if ( WITH_SOLID_UDISKS2 )
More information about the scm-commits
mailing list