update to 4.5.2

changes: bugfixes and optimizations

6 files changed, 9 insertions, 40 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 2e231bc1e7a..de4dd8ac1ef 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2009/07/02 18:26:45 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2009/07/07 16:36:05 drochner Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
-PKGREVISION=	2
-
 PKGNAME=	qt4-libs-${QTVERSION}
 COMMENT=	C++ X GUI toolkit
 
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 46e0afef9c2..92ae15ba4cd 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.30 2009/06/29 12:54:19 drochner Exp $
+$NetBSD: distinfo,v 1.31 2009/07/07 16:36:05 drochner Exp $
 
-SHA1 (qt-x11-opensource-src-4.5.1.tar.bz2) = 50ba9b6d2eb7056e47dc53775be509c4ff6ec015
-RMD160 (qt-x11-opensource-src-4.5.1.tar.bz2) = 702d7c6bb9787cd5602dcb8afce52bdfcfd52179
-Size (qt-x11-opensource-src-4.5.1.tar.bz2) = 114667436 bytes
+SHA1 (qt-x11-opensource-src-4.5.2.tar.bz2) = bf2dd175cade15f3f505fe6aac1401bdbfeb4e5b
+RMD160 (qt-x11-opensource-src-4.5.2.tar.bz2) = 1af31d7fe66665e718f0c728b41becea9996fba7
+Size (qt-x11-opensource-src-4.5.2.tar.bz2) = 116015284 bytes
 SHA1 (patch-aa) = b3a0cbdd927ef7d3e2af6a49fc87048f2cd8012c
 SHA1 (patch-ab) = b0853b2ddfa53948e91c4f93e4d089c7dd56db43
 SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
@@ -24,5 +24,3 @@ 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
deleted file mode 100644
index 590c1a44d78..00000000000
--- a/x11/qt4-libs/patches/patch-ay
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
deleted file mode 100644
index c68052f4141..00000000000
--- a/x11/qt4-libs/patches/patch-az
+++ /dev/null
@@ -1,16 +0,0 @@
-$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);
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index f53221c1231..6f543160bda 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/06/14 18:25:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/07/07 16:36:05 drochner Exp $
 lib/pkgconfig/QtAssistantClient.pc
 lib/pkgconfig/QtCLucene.pc
 lib/pkgconfig/QtDesigner.pc
@@ -228,6 +228,7 @@ qt4/mkspecs/features/win32/embed_manifest_dll.prf
 qt4/mkspecs/features/win32/embed_manifest_exe.prf
 qt4/mkspecs/features/win32/exceptions.prf
 qt4/mkspecs/features/win32/exceptions_off.prf
+qt4/mkspecs/features/win32/ltcg.prf
 qt4/mkspecs/features/win32/opengl.prf
 qt4/mkspecs/features/win32/qaxcontainer.prf
 qt4/mkspecs/features/win32/qaxserver.prf
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index 3bd1fa8f163..4a9b42b99c0 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.16 2009/06/13 11:55:50 hasso Exp $
+# $NetBSD: Makefile.common,v 1.17 2009/07/07 16:36:05 drochner Exp $
 # used by x11/qt4-libs/Makefile.common
 # used by x11/qt4-tools/Makefile
 
-QTVERSION=	4.5.1
+QTVERSION=	4.5.2
 
 MAINTAINER?=	adam@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt/