rpms/qt/devel qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.patch, NONE, 1.1 qt.spec, 1.381, 1.382

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15419/devel

Modified Files:
	qt.spec 
Added Files:
	qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.patch 
Log Message:
fix type cast in webkit bundled copy for sparc64

qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.patch:
 Platform.h |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.patch ---
diff -up qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.sparc qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.sparc	2010-03-23 10:39:06.138490870 -0400
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h	2010-03-23 10:42:09.660492875 -0400
@@ -729,7 +729,10 @@
 #endif
 
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA)
+#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) \
+    || PLATFORM(IA64)  \
+    || PLATFORM(ALPHA) \
+    || PLATFORM(SPARC64)
 #define WTF_USE_JSVALUE64 1
 #elif PLATFORM(ARM) || PLATFORM(PPC64)
 #define WTF_USE_JSVALUE32 1


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -p -r1.381 -r1.382
--- qt.spec	21 Mar 2010 00:52:37 -0000	1.381
+++ qt.spec	23 Mar 2010 14:57:26 -0000	1.382
@@ -15,7 +15,7 @@ Summary: Qt toolkit
 Name:    qt
 Epoch:   1
 Version: 4.7.0
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -60,6 +60,8 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
 # http://bugs.kde.org/show_bug.cgi?id=180051#c22
 Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch
+# fix webkit platform definitions for sparc64
+Patch56: qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.patch
 
 # security patches
 
@@ -396,6 +398,7 @@ Qt libraries used for drawing widgets an
 ## TODO: upstream me
 %patch54 -p1 -b .mysql_config
 %patch55 -p1 -b .cups-1
+%patch56 -p1 -b .sparc
 
 # security fixes
 
@@ -1015,6 +1018,9 @@ fi
 
 
 %changelog
+* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 4.7.0-0.4.tp
+- fix type cast issue on sparc64
+
 * Sun Mar 21 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.7.0-0.3.tp
 - also strip -lpulse from .prl files (fixes PyQt4 QtMultimedia binding build)