rpms/kdelibs/devel kdelibs-3.5.4-kde#133529.patch, NONE, 1.1 kdelibs-3.5.4-kdebug-crash.patch, NONE, 1.1 kdelibs.spec, 1.175, 1.176

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31766

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.4-kde#133529.patch 
	kdelibs-3.5.4-kdebug-crash.patch 
Log Message:
   fix #133529, konqueror's performance issue
   fix kdebug crash


kdelibs-3.5.4-kde#133529.patch:
 loader.cpp |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE kdelibs-3.5.4-kde#133529.patch ---
Index: khtml/misc/loader.cpp
===================================================================
--- khtml/misc/loader.cpp	(Revision 581149)
+++ khtml/misc/loader.cpp	(Revision 581150)
@@ -527,6 +527,13 @@
 const QPixmap &CachedImage::tiled_pixmap(const QColor& newc, int xWidth, int xHeight)
 {
     static QRgb bgTransparent = qRgba( 0, 0, 0, 0xFF );
+
+    QSize s(pixmap_size());
+    int w = xWidth;
+    int h = xHeight;
+    if (w == -1) xWidth = w = s.width();
+    if (h == -1) xHeight = h = s.height();
+
     if ( ( (bgColor != bgTransparent) && (bgColor != newc.rgb()) ) ||
          ( bgSize != QSize(xWidth, xHeight)) )
     {
@@ -544,23 +551,18 @@
     if(m_hadError||m_wasBlocked) return *Cache::nullPixmap;
 
     bool isvalid = newc.isValid();
-    QSize s(pixmap_size());
-    int w = xWidth;
-    int h = xHeight;
-    if (w == -1) xWidth = w = s.width();
-    if (h == -1) xHeight = h = s.height();
 
     const QPixmap* src; //source for pretiling, if any
 
     //See whether we should scale
     if (xWidth != s.width() || xHeight != s.height()) {
         src = &scaled_pixmap(xWidth, xHeight);
-        bgSize = QSize(xWidth, xHeight);
     } else {
         src = &r;
-        bgSize = QSize(-1,-1);
     }
 
+    bgSize = QSize(xWidth, xHeight);
+
     //See whether we can - and should - pre-blend
     if (isvalid && (r.hasAlphaChannel() || r.mask() )) {
         bg = new QPixmap(xWidth, xHeight, r.depth());

kdelibs-3.5.4-kdebug-crash.patch:
 kdebug.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.4-kdebug-crash.patch ---
Index: kdecore/kdebug.cpp
===================================================================
--- kdecore/kdebug.cpp	(Revision 578149)
+++ kdecore/kdebug.cpp	(Revision 578150)
@@ -582,8 +582,10 @@
 
 void kdClearDebugConfig()
 {
-    delete kDebug_data->config;
-    kDebug_data->config = 0;
+    if (kDebug_data) {
+        delete kDebug_data->config;
+        kDebug_data->config = 0;
+    }
 }
 
 


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- kdelibs.spec	6 Sep 2006 11:10:52 -0000	1.175
+++ kdelibs.spec	6 Sep 2006 18:08:20 -0000	1.176
@@ -54,6 +54,8 @@
 Patch103: kdelibs-3.5.4-kde#90462.patch
 Patch104: kdelibs-3.5.4-kde#121528.patch
 Patch105: kdelibs-3.5.4-kde#123413.patch
+Patch106: kdelibs-3.5.4-kde#133529.patch
+Patch107: kdelibs-3.5.4-kdebug-crash.patch
 
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
@@ -190,6 +192,8 @@
 %patch103 -p0 -b .kde#90462
 %patch104 -p0 -b .kde#121528
 %patch105 -p0 -b .kde#123413
+%patch106 -p0 -b .kde#133529
+%patch107 -p0 -b .kdebug-crash
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -420,6 +424,8 @@
 * Tue Sep 05 2006 Than Ngo <than at redhat.com> 6:3.5.4-5
 - apply upstream patches
    fix #123413, kded crash when KDED modules make DCOP calls in their destructors
+   fix #133529, konqueror's performance issue
+   fix kdebug crash
 
 * Mon Sep 04 2006 Than Ngo <than at redhat.com> 6:3.5.4-4
 - apply upstream patches