Hello community,
here is the log from the commit of package libqt4 for openSUSE:Factory checked
in at 2013-02-25 21:40:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt4 (Old)
and /work/SRC/openSUSE:Factory/.libqt4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "dmuel...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2013-02-21
14:55:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes
2013-02-25 21:40:26.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 22 16:33:27 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Added Fix-call-to-QMetaObject.patch, fixes qtbug29082 and kde#311751,
+ crashing of plasma-desktop on QML systray
+
+-------------------------------------------------------------------
libqt4-sql-plugins.changes: same change
libqt4.changes: same change
New:
----
Fix-call-to-QMetaObject.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt4-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.s6DbJu/_old 2013-02-25 21:40:37.000000000 +0100
+++ /var/tmp/diff_new_pack.s6DbJu/_new 2013-02-25 21:40:37.000000000 +0100
@@ -106,6 +106,8 @@
# and deregister objects very frequently (like nepomukstorage)
Patch146: garbage-collect-deleted-objects.patch
Patch147: libqt4-CVE-2013-0254.patch
+# PATCH-FIX-UPSTREAM Fix-call-to-QMetaObject.patch Fixes qtbug29082 and
kde#311751, crashing of plasma-desktop on QML systray
+Patch148: Fix-call-to-QMetaObject.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared
-xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama
-sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups
-stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir
%_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir
%{_libdir}/qt4/demos -plugindir %plugindir -translationdir
%{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir
%{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib
-optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support
-no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
@@ -187,6 +189,7 @@
%patch145 -p1
%patch146 -p1
%patch147 -p1
+%patch148 -p1
# ### 47 rediff
#%patch121 -p1
# be sure not to use them
libqt4-sql-plugins.spec: same change
++++++ libqt4.spec ++++++
--- /var/tmp/diff_new_pack.s6DbJu/_old 2013-02-25 21:40:37.000000000 +0100
+++ /var/tmp/diff_new_pack.s6DbJu/_new 2013-02-25 21:40:37.000000000 +0100
@@ -124,6 +124,8 @@
# and deregister objects very frequently (like nepomukstorage)
Patch146: garbage-collect-deleted-objects.patch
Patch147: libqt4-CVE-2013-0254.patch
+# PATCH-FIX-UPSTREAM Fix-call-to-QMetaObject.patch Fixes qtbug29082 and
kde#311751, crashing of plasma-desktop on QML systray
+Patch148: Fix-call-to-QMetaObject.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define common_options --opensource -fast -no-separate-debug-info -shared
-xkb -openssl-linked -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama
-sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups
-stl -nis -system-zlib -prefix /usr -L %{_libdir} -libdir %{_libdir} -docdir
%_docdir/%{base_name} -examplesdir %{_libdir}/qt4/examples -demosdir
%{_libdir}/qt4/demos -plugindir %plugindir -translationdir
%{_datadir}/qt4/translations -iconv -sysconfdir /etc/settings -datadir
%{_datadir}/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib
-optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support
-no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle
@@ -415,6 +417,7 @@
%patch145 -p1
%patch146 -p1
%patch147 -p1
+%patch148 -p1
# ### 47 rediff
#%patch121 -p1
# be sure not to use them
++++++ Fix-call-to-QMetaObject.patch ++++++
--- a/src/corelib/animation/qpropertyanimation.cpp
+++ b/src/corelib/animation/qpropertyanimation.cpp
@@ -135,8 +135,11 @@
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);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
