Added a patch from https://bugreports.qt-project.org/browse/QTBUG-29082 -

this solves a problem with KDE's plasma-desktop crashing whenever a
system tray is added to the panel. Change has already been merged into the
upstream version, see https://codereview.qt-project.org/#change,46616

3 files changed, 23 insertions, 3 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 8720661973e..1075f2f52b1 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.86 2013/02/16 11:18:08 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2013/04/13 10:29:26 jaapb Exp $
 
 PKGNAME=	qt4-libs-${QTVERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	C++ X GUI toolkit
 
 .include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 652af4836f7..450fdb0baba 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.83 2013/01/11 23:37:13 joerg Exp $
+$NetBSD: distinfo,v 1.84 2013/04/13 10:29:26 jaapb Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.4.tar.gz) = f5880f11c139d7d8d01ecb8d874535f7d9553198
 RMD160 (qt-everywhere-opensource-src-4.8.4.tar.gz) = 3c09a3b1411385d0917225f01ac2ff3a2ce83fda
@@ -51,6 +51,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_qt_PlatformKeyboardEventQt.cpp) = b28cf71983f8e71b82b1c634a10b3898ca13ede5
+SHA1 (patch-src_corelib_animation_qpropertyanimation.cpp) = c6fb5cdfed1013f904b4a194d3c9fcab86a2327c
 SHA1 (patch-src_corelib_io_io.pri) = cde98927b524c92fae1e053c2359e77bde2c240a
 SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = bb16b95d20286b1aa069dc25843d7e0067cc0268
 SHA1 (patch-src_declarative_util_qdeclarativefontloader.cpp) = 0bb76eac102a4325cadb5bcb4e7a1ac85a3d099f
diff --git a/x11/qt4-libs/patches/patch-src_corelib_animation_qpropertyanimation.cpp b/x11/qt4-libs/patches/patch-src_corelib_animation_qpropertyanimation.cpp
new file mode 100644
index 00000000000..8834c6ad2b1
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_corelib_animation_qpropertyanimation.cpp
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_corelib_animation_qpropertyanimation.cpp,v 1.1 2013/04/13 10:29:26 jaapb Exp $
+
+Patch from Qt bug 29082, solving a problem with KDE crashes
+--- src/corelib/animation/qpropertyanimation.cpp.orig	2012-11-23 10:09:55.000000000 +0000
++++ src/corelib/animation/qpropertyanimation.cpp
+@@ -135,8 +135,11 @@ void QPropertyAnimationPrivate::updatePr
+ 
+     if (newValue.userType() == propertyType) {
+         //no conversion is needed, we directly call the QMetaObject::metacall
+-        void *data = const_cast<void*>(newValue.constData());
+-        QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data);
++        //check QMetaProperty::write for an explanation of these
++        int status = -1;
++        int flags = 0;
++        void *argv[] = { const_cast<void *>(newValue.constData()), const_cast<QVariant *>(&newValue), &status, &flags };
++        QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv);
+     } else {
+         targetValue->setProperty(propertyName.constData(), newValue);
+     }