From owner-svn-ports-all@FreeBSD.ORG Tue Jul 9 22:15:02 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 60B6C982; Tue, 9 Jul 2013 22:15:02 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3A9CC1048; Tue, 9 Jul 2013 22:15:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r69MF2CN065653; Tue, 9 Jul 2013 22:15:02 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r69MF1Uo065650; Tue, 9 Jul 2013 22:15:01 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201307092215.r69MF1Uo065650@svn.freebsd.org> From: Raphael Kubo da Costa Date: Tue, 9 Jul 2013 22:15:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322590 - in head/devel/qt4-corelib: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jul 2013 22:15:02 -0000 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(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(newValue.constData()), const_cast(&newValue), &status, &flags }; ++ QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, argv); + } else { + targetValue->setProperty(propertyName.constData(), newValue); + }