svn commit: r322590 - in head/devel/qt4-corelib: . files

[Raphael Kubo da Costa]

Author: rakuco
Date: Tue Jul  9 22:15:01 2013
New Revision: 322590
URL: http://svnweb.freebsd.org/changeset/ports/322590

Log:
  Add upstream commit that fixes a plasma-desktop crash in x11/kde4-workspace.
  
  The upstream bug report can be found in [1], the commit itself is in [2].
  
  [1] https://bugreports.qt-project.org/browse/QTBUG-29082
  [2] http://qt.gitorious.org/qt/qtbase/commit/f0221d359499f675115da1f47dd3669a4383653d
  
  Submitted by:	avg

Added:
  head/devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp   (contents, props changed)
Modified:
  head/devel/qt4-corelib/Makefile

Modified: head/devel/qt4-corelib/Makefile
==============================================================================
--- head/devel/qt4-corelib/Makefile	Tue Jul  9 22:06:15 2013	(r322589)
+++ head/devel/qt4-corelib/Makefile	Tue Jul  9 22:15:01 2013	(r322590)
@@ -3,7 +3,7 @@
 
 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 

Added: head/devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/qt4-corelib/files/patch-src__corelib__animation__qpropertyanimation.cpp	Tue Jul  9 22:15:01 2013	(r322590)
@@ -0,0 +1,16 @@
+--- src/corelib/animation/qpropertyanimation.cpp.orig
++++ src/corelib/animation/qpropertyanimation.cpp
+@@ -136,8 +136,11 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue)
+ 
+     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);
+     }