rpms/qt/F-12 qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch, NONE, 1.1 qt.spec, 1.334, 1.335

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27964

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch 
Log Message:
* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-25
- qt webkit crash on drag (#528094)


qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch:
 html/HTMLElement.cpp    |    1 +
 page/DragController.cpp |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch ---
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp
index 4caf336..b21a3fe 100644
--- qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/html/HTMLElement.cpp
@@ -44,6 +44,7 @@
 #include "XMLTokenizer.h"
 #include "markup.h"
 #include <wtf/StdLibExtras.h>
+#include <stdio.h>
 
 namespace WebCore {
 
diff -up qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/page/DragController.cpp qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/page/DragController.cpp
index 10a11f2..c756da8 100644
--- qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/page/DragController.cpp
+++ qt-x11-opensource-src-4.5.2/src/3rdparty/webkit/WebCore/page/DragController.cpp
@@ -157,7 +157,7 @@ void DragController::dragExited(DragData* dragData)
     Frame* mainFrame = m_page->mainFrame();
     
     if (RefPtr<FrameView> v = mainFrame->view()) {
-        ClipboardAccessPolicy policy = m_document->securityOrigin()->isLocal() ? ClipboardReadable : ClipboardTypesReadable;
+        ClipboardAccessPolicy policy = (!m_document || m_document->securityOrigin()->isLocal()) ? ClipboardReadable : ClipboardTypesReadable;
         RefPtr<Clipboard> clipboard = dragData->createClipboard(policy);
         clipboard->setSourceOperation(dragData->draggingSourceOperationMask());
         mainFrame->eventHandler()->cancelDragAndDrop(createMouseEvent(dragData), clipboard.get());
-- 
1.6.2.5



Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-12/qt.spec,v
retrieving revision 1.334
retrieving revision 1.335
diff -u -p -r1.334 -r1.335
--- qt.spec	9 Oct 2009 13:57:16 -0000	1.334
+++ qt.spec	9 Oct 2009 15:04:45 -0000	1.335
@@ -10,7 +10,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.5.2
-Release: 24%{?dist}
+Release: 25%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -61,9 +61,10 @@ Patch55: qt-x11-opensource-src-4.5.2-tim
 # compile with openssl-1.0
 Patch56: qt-x11-opensource-src-4.5.2-ossl10.patch
 
-# security patches
+## upstream/security patches
 Patch100: qt-x11-opensource-src-4.5.2-CVE-2009-1725.patch
 Patch101: qt-x11-opensource-src-4.5.2-CVE-2009-2700.patch
+Patch102: qt-x11-opensource-src-4.5.2-fix-webkit-drag-crash.patch
 
 # switch to kde-qt branches, qt-copy doesn't exist anymore
 Patch200: kde-qt-patches-20090820git.patch
@@ -372,9 +373,10 @@ Qt libraries used for drawing widgets an
 %patch55 -p1 -b .timestamp
 %patch56 -p1 -b .ossl10
 
-# security fixes
+# upstream/security fixes
 %patch100 -p1 -b .CVE-2009-1725
 %patch101 -p1 -b .CVE-2009-2700
+%patch102 -p1 -b .webkit_drag_crash
 
 # kde-qt branch
 %patch200 -p1 -b .kde-qt-patches-20090820git
@@ -384,10 +386,6 @@ Qt libraries used for drawing widgets an
 
 # drop -fexceptions from $RPM_OPT_FLAGS
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
-# hack around (hopefully temporary) gcc borkage (#522576)
-#if 0%{?fedora} > 11
-#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-var-tracking-assignments"
-#endif
 
 %define platform linux-g++
 %if "%{_qt4_datadir}" != "%{_qt4_prefix}" && "%{_lib}" == "lib64"                                  
@@ -945,6 +943,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.5.2-25
+- qt webkit crash on drag (#528094)
+
 * Tue Oct 06 2009 Jaroslav Reznik <jreznik at redhat.com> - 4.5.2-24
 - disable JavaScriptCore JIT, SE Linux crashes (#527079)