rpms/kdelibs/F-12 kdelibs-4.4.1-k3passworddialog_qt47.patch, NONE, 1.1 kdelibs-4.4.2-kdebug.patch, NONE, 1.1 kdelibs.spec, 1.547, 1.548

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17102/F-12

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.4.1-k3passworddialog_qt47.patch 
	kdelibs-4.4.2-kdebug.patch 
Log Message:
* Sat Mar 20 2010 Rex Dieter <rdieter at fedoraproject.org> 6:4.4.1-7
- KDE default in noisy debug mode to stdout/stderr (kde#227089)
- backport trunk/ fix building against qt-4.7


kdelibs-4.4.1-k3passworddialog_qt47.patch:
 k3passworddialog.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdelibs-4.4.1-k3passworddialog_qt47.patch ---
--- kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp.qt47	2008-05-21 06:06:15.000000000 -0500
+++ kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp	2010-03-20 08:13:23.892254206 -0500
@@ -83,7 +83,7 @@ class K3PasswordDialog::K3PasswordDialog
 {
     public:
 	K3PasswordDialogPrivate()
-	 : m_MatchLabel( 0 ), iconName( 0 ), allowEmptyPasswords( false ),
+        : m_MatchLabel( 0 ), allowEmptyPasswords( false ),
 	   minimumPasswordLength(0), maximumPasswordLength(K3PasswordEdit::PassLen - 1),
 	   passwordStrengthWarningLevel(1), m_strengthBar(0),
 	   reasonablePasswordLength(8)

kdelibs-4.4.2-kdebug.patch:
 kdebug.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-4.4.2-kdebug.patch ---
--- branches/KDE/4.4/kdelibs/kdecore/io/kdebug.cpp	2010/01/06 22:46:33	1070858
+++ branches/KDE/4.4/kdelibs/kdecore/io/kdebug.cpp	2010/03/20 01:43:08	1105396
@@ -317,7 +317,7 @@
         return groupName;
     }
 
-    OutputMode areaOutputMode(QtMsgType type, unsigned int area)
+    OutputMode areaOutputMode(QtMsgType type, unsigned int area, bool enableByDefault)
     {
         if (!config)
             return QtOutput;
@@ -343,7 +343,7 @@
         }
 
         const KConfigGroup cg(config, groupNameForArea(area));
-        const int mode = cg.readEntry(key, int(DefaultOutput));
+        const int mode = cg.readEntry(key, int(enableByDefault ? DefaultOutput : NoOutput));
         return OutputMode(mode);
     }
 
@@ -418,7 +418,7 @@
         const int lev = level(type);
         //qDebug() << "in cache for" << num << ":" << it->mode[lev];
         if (it->mode[lev] == Unknown)
-            it->mode[lev] = areaOutputMode(type, num);
+            it->mode[lev] = areaOutputMode(type, num, enableByDefault);
         if (it->mode[lev] == FileOutput && it->logFileName[lev].isEmpty())
             it->logFileName[lev] = logFileName(type, num);
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-12/kdelibs.spec,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -p -r1.547 -r1.548
--- kdelibs.spec	17 Mar 2010 13:04:53 -0000	1.547
+++ kdelibs.spec	20 Mar 2010 14:33:32 -0000	1.548
@@ -8,7 +8,7 @@
 
 Summary: KDE Libraries
 Version: 4.4.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -88,10 +88,15 @@ Patch28: kdelibs-4.4.2-kpixmapcache.patc
 
 # upstreamable
 
-# 4.4 upstream
+## 4.4 upstream
+# https://bugs.kde.org/show_bug.cgi?id=227089
+Patch100: kdelibs-4.4.2-kdebug.patch 
 
-# security fix
-## Not Upstreamed? why not ? -- Rex
+## trunk upstream
+Patch110: kdelibs-4.4.1-k3passworddialog_qt47.patch 
+
+## security fix
+# Not Upstreamed? why not ? -- Rex
 Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 
 %if 0%{?fedora} && 0%{?fedora} < 13
@@ -238,6 +243,8 @@ format for easy browsing.
 # upstreamable patches
 
 # upstream patches
+%patch100 -p4 -b .kdebug
+%{?_qt47:%patch110 -p1 -b .k3passworddialog_qt47}
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -429,6 +436,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Mar 20 2010 Rex Dieter <rdieter at fedoraproject.org> 6:4.4.1-7
+- KDE default in noisy debug mode to stdout/stderr (kde#227089)
+- backport trunk/ fix building against qt-4.7
+
 * Wed Mar 17 2010 Lukas Tinkl <ltinkl at redhat.com> - 6:4.4.1-6
 - fix crash in KPixmapCache (bug#568389)