add two patches from upstream to fix rendering problems which

garble the KDE4 desktop, from Sverre Froyen
bump PKGREVISION

4 files changed, 34 insertions, 2 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index aa01acfe0c0..dec05067758 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.28 2009/06/13 11:55:51 hasso Exp $
+# $NetBSD: Makefile,v 1.29 2009/06/29 12:54:19 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
+PKGREVISION=	1
+
 PKGNAME=	qt4-libs-${QTVERSION}
 COMMENT=	C++ X GUI toolkit
 
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index d15d20e3db8..46e0afef9c2 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2009/06/13 11:55:51 hasso Exp $
+$NetBSD: distinfo,v 1.30 2009/06/29 12:54:19 drochner Exp $
 
 SHA1 (qt-x11-opensource-src-4.5.1.tar.bz2) = 50ba9b6d2eb7056e47dc53775be509c4ff6ec015
 RMD160 (qt-x11-opensource-src-4.5.1.tar.bz2) = 702d7c6bb9787cd5602dcb8afce52bdfcfd52179
@@ -24,3 +24,5 @@ SHA1 (patch-ar) = 5bc9a1d384c9a888f1295b87968a09236b48af65
 SHA1 (patch-as) = 818c3d6eecab7706dde7f47b077c3c676e69d67b
 SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
 SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061
+SHA1 (patch-ay) = f16464b8a9a1d7aac421025e208af59706244ba5
+SHA1 (patch-az) = ad22f6f0039ce2ca12077e3e6ad4e025474e13a4
diff --git a/x11/qt4-libs/patches/patch-ay b/x11/qt4-libs/patches/patch-ay
new file mode 100644
index 00000000000..590c1a44d78
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-ay
@@ -0,0 +1,12 @@
+$NetBSD: patch-ay,v 1.1 2009/06/29 12:54:19 drochner Exp $
+
+--- ./src/svg/qsvgstyle.cpp.orig	2009-04-22 01:57:42.000000000 +0200
++++ ./src/svg/qsvgstyle.cpp
+@@ -808,6 +808,7 @@ void QSvgGradientStyle::resolveStops()
+                     static_cast<QSvgGradientStyle*>(prop);
+                 st->resolveStops();
+                 m_gradient->setStops(st->qgradient()->stops());
++                m_gradientStopsSet = st->gradientStopsSet();
+             }
+         }
+         m_link = QString();
diff --git a/x11/qt4-libs/patches/patch-az b/x11/qt4-libs/patches/patch-az
new file mode 100644
index 00000000000..c68052f4141
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-az
@@ -0,0 +1,16 @@
+$NetBSD: patch-az,v 1.1 2009/06/29 12:54:19 drochner Exp $
+
+--- src/gui/image/qpixmapcache.cpp.orig	2009-04-22 01:57:41.000000000 +0200
++++ src/gui/image/qpixmapcache.cpp
+@@ -187,6 +187,11 @@ bool QPMCache::insert(const QString& key
+         cacheKeys.insert(key, cacheKey);
+         return true;
+     }
++    qint64 oldCacheKey = cacheKeys.value(key, -1);
++    //If for the same key we add already a pixmap we should delete it
++    if (oldCacheKey != -1)
++        QCache<qint64, QDetachedPixmap>::remove(oldCacheKey);
++
+     bool success = QCache<qint64, QDetachedPixmap>::insert(cacheKey, new QDetachedPixmap(pixmap), cost);
+     if (success) {
+         cacheKeys.insert(key, cacheKey);