[kdelibs/f18] Debug output in kdelibs-udisks2-backend.patch should be disabled (#882731)

[Rex Dieter]

commit ec28fb10f962d26dacd75856ae2f0a00276414fc
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Dec 12 14:32:31 2012 -0600

    Debug output in kdelibs-udisks2-backend.patch should be disabled (#882731)

 kdelibs-solid_qt_no_debug_output.patch       |   12 +
 kdelibs-udisks2-kfileplacesdevicecache.patch |  406 --------------------------
 kdelibs.spec                                 |   15 +-
 3 files changed, 21 insertions(+), 412 deletions(-)
---
diff --git a/kdelibs-solid_qt_no_debug_output.patch b/kdelibs-solid_qt_no_debug_output.patch
new file mode 100644
index 0000000..f39c0ba
--- /dev/null
+++ b/kdelibs-solid_qt_no_debug_output.patch
@@ -0,0 +1,12 @@
+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
+@@ -240,7 +240,7 @@ if(NOT WIN32 AND NOT APPLE)
+ 
+        if ( WITH_SOLID_UDISKS2 )
+            message(STATUS "Building Solid UDisks2 backend." )
+-           add_definitions(-DWITH_SOLID_UDISKS2)
++           add_definitions(-DWITH_SOLID_UDISKS2 -DQT_NO_DEBUG_OUTPUT)
+            set(solid_LIB_SRCS ${solid_LIB_SRCS}
+            backends/udisks2/udisksmanager.cpp
+            backends/udisks2/udisksdevice.cpp
diff --git a/kdelibs.spec b/kdelibs.spec
index 59c736c..e94651d 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -25,7 +25,7 @@
 
 Summary: KDE Libraries
 Version: 4.9.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -124,10 +124,10 @@ Patch45: kdelibs-4.7.3-halectomy.patch
 # udisks2 Solid backend
 Patch47: kdelibs-udisks2-backend.patch
 
-# cache to improve performance of apps using Solid with udisks2 (#868530)
-# disable now, this patch causes new regression, backend devices are destroyed!
-# the latest solid backend works fine without this patch
-# Patch48: kdelibs-udisks2-kfileplacesdevicecache.patch
+# limit solid qDebug spam
+# http://bugzilla.redhat.com/882731
+# TODO: could make uptreamable and conditional only on Release-type builds
+Patch49: kdelibs-solid_qt_no_debug_output.patch
 
 ## upstreamable
 # knewstuff2 variant of:
@@ -324,7 +324,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 
 %if "%{?udisks}" == "udisks2"
 %patch47 -p1 -b .udisks2backend
-#patch48 -p1 -b .kfileplacesdevicescache
+%patch49 -p1 -b .solid_qt_no_debug_output
 %else
 %patch45 -p1 -b .halectomy
 %endif
@@ -602,6 +602,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 11 2012 Rex Dieter <rdieter at fedoraproject.org> 6:4.9.4-5
+- Debug output in kdelibs-udisks2-backend.patch should be disabled (#882731)
+
 * Thu Dec 06 2012 Than Ngo <than at redhat.com> - 6:4.9.4-4
 - apply upstream patch to fix crash when no service was selected