packages: qt4/qt4.spec, qt4/qt4-git.patch (NEW) - rel 3; segfault fix

[arekm]

Author: arekm                        Date: Mon Dec  7 15:37:30 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; segfault fix

---- Files affected:
packages/qt4:
   qt4.spec (1.231 -> 1.232) , qt4-git.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.231 packages/qt4/qt4.spec:1.232
--- packages/qt4/qt4.spec:1.231	Fri Dec  4 16:31:10 2009
+++ packages/qt4/qt4.spec	Mon Dec  7 16:37:25 2009
@@ -77,7 +77,7 @@
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt4
 Version:	4.6.0
-Release:	2
+Release:	3
 License:	LGPL v2.1 or GPL v3.0
 Group:		X11/Libraries
 Source0:	http://download.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
@@ -91,6 +91,7 @@
 # git checkout -b 4.6.0-patched origin/4.6.0-patched
 # git diff v4.6.0..4.6.0-patched > qt4-kde-git.patch
 Patch100:	%{name}-kde-git.patch
+Patch101:	%{name}-git.patch
 
 Patch0:		%{name}-tools.patch
 Patch1:		%{name}-qt_copy.patch
@@ -1349,6 +1350,7 @@
 %setup -q -n qt-everywhere-opensource-src-%{version}
 
 %patch100 -p1
+%patch101 -p1
 
 %patch0 -p1
 %patch1 -p0
@@ -2254,6 +2256,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.232  2009/12/07 15:37:25  arekm
+- rel 3; segfault fix
+
 Revision 1.231  2009/12/04 15:31:10  sparky
 - BR: alsa-lib-devel
 

================================================================
Index: packages/qt4/qt4-git.patch
diff -u /dev/null packages/qt4/qt4-git.patch:1.1
--- /dev/null	Mon Dec  7 16:37:30 2009
+++ packages/qt4/qt4-git.patch	Mon Dec  7 16:37:25 2009
@@ -0,0 +1,39 @@
+commit 705880f0045ac39140f980d69aec68869213e379
+Author: Alexis Menard <alexis.menard at nokia.com>
+Date:   Thu Nov 26 13:47:34 2009 +0100
+
+    Fix a crash in KDE/Plasma with QGraphicsView. TopLevel list of items
+    was corrupted.
+    
+    This nasty bug was triggered when the index sort the top level list of
+    items. We forgot to set the flag topLevelSequentialOrdering to false
+    so when an item was removed from the top level list it was using the
+    sibling index which can be not valid anymore since the list is not
+    sorted by sequential order. So it let some dangling pointers in the
+    list which make processDirtyItemRecursive crash the next paint event.
+    
+    Reviewed-by:bnilsen
+    Reviewed-by:andreas
+
+diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h
+index a1d0496..69e4d5b 100644
+--- a/src/gui/graphicsview/qgraphicsscene_p.h
++++ b/src/gui/graphicsview/qgraphicsscene_p.h
+@@ -78,7 +78,7 @@ class QGraphicsSceneIndex;
+ class QGraphicsView;
+ class QGraphicsWidget;
+ 
+-class QGraphicsScenePrivate : public QObjectPrivate
++class Q_AUTOTEST_EXPORT QGraphicsScenePrivate : public QObjectPrivate
+ {
+     Q_DECLARE_PUBLIC(QGraphicsScene)
+ public:
+@@ -265,6 +265,7 @@ public:
+     {
+         if (needSortTopLevelItems) {
+             qSort(topLevelItems.begin(), topLevelItems.end(), qt_notclosestLeaf);
++            topLevelSequentialOrdering = false;
+             needSortTopLevelItems = false;
+         }
+     }
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.231&r2=1.232&f=u