rpms/qt/F-13 qt-everywhere-opensource-src-4.6.2-webkit-s390x.patch, NONE, 1.1 qt.spec, 1.378, 1.379
Than Ngo
than at fedoraproject.org
Tue Mar 23 13:35:42 UTC 2010
Author: than
Update of /cvs/extras/rpms/qt/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31599
Modified Files:
qt.spec
Added Files:
qt-everywhere-opensource-src-4.6.2-webkit-s390x.patch
Log Message:
- fix type cast issue on s390x
qt-everywhere-opensource-src-4.6.2-webkit-s390x.patch:
javascriptcore/JavaScriptCore/wtf/Platform.h | 7 +++++++
webkit/JavaScriptCore/wtf/Platform.h | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
--- NEW FILE qt-everywhere-opensource-src-4.6.2-webkit-s390x.patch ---
diff -up qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.than qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
--- qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.than 2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2010-03-23 14:29:41.000000000 +0100
@@ -345,6 +345,11 @@
#define WTF_PLATFORM_BIG_ENDIAN 1
#endif
+/* PLATFORM(S390X) */
+#if defined(__s390x__) || defined(__s390x)
+#define WTF_PLATFORM_S390X 1
+#endif
+
/* PLATFORM(IA64) */
/* a.k.a. Itanium Processor Family, IPF */
#if defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
@@ -730,6 +735,8 @@
/* Using JSVALUE32_64 causes padding/alignement issues for JITStubArg
on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
#define WTF_USE_JSVALUE32 1
+#elif PLATFORM(S390X)
+#define WTF_USE_JSVALUE64 1
#else
#define WTF_USE_JSVALUE32_64 1
#endif
diff -up qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.than 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.than 2010-02-11 16:55:17.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h 2010-03-23 14:19:00.000000000 +0100
@@ -362,6 +362,11 @@
#define WTF_PLATFORM_IA64 1
#endif
+/* PLATFORM(S390X) */
+#if defined(__s390x__) || defined(__s390x)
+#define WTF_PLATFORM_S390X 1
+#endif
+
/* PLATFORM(ALPHA) */
#if defined(__alpha__)
#define WTF_PLATFORM_ALPHA 1
@@ -729,7 +734,7 @@
#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(S390X)
#define WTF_USE_JSVALUE64 1
#elif PLATFORM(ARM) || PLATFORM(PPC64)
#define WTF_USE_JSVALUE32 1
Index: qt.spec
===================================================================
RCS file: /cvs/extras/rpms/qt/F-13/qt.spec,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -p -r1.378 -r1.379
--- qt.spec 22 Mar 2010 10:44:36 -0000 1.378
+++ qt.spec 23 Mar 2010 13:35:42 -0000 1.379
@@ -13,7 +13,7 @@ Summary: Qt toolkit
Name: qt
Epoch: 1
Version: 4.6.2
-Release: 9%{?dist}
+Release: 10%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -58,6 +58,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 type cast issue on s390x
+Patch56: qt-everywhere-opensource-src-4.6.2-webkit-s390x.patch
# security patches
Patch100: qt-x11-opensource-src-4.5.3-cve-2010-0046-css-format-mem-corruption.patch
@@ -417,6 +419,7 @@ Qt libraries used for drawing widgets an
## TODO: upstream me
%patch54 -p1 -b .mysql_config
%patch55 -p1 -b .cups-1
+%patch56 -p1 -b .typecast_s390x
# security fixes
%patch100 -p1 -b .cve-2010-0046-css-format-mem-corruption
@@ -1033,6 +1036,9 @@ fi
%changelog
+* Tue Mar 23 2010 Than Ngo <than at redhat.com> - 4.6.2-10
+- fix type cast issue on s390x
+
* Mon Mar 22 2010 Than Ngo <than at redhat.com> - 4.6.2-9
- backport patch to fix ix a crash when reparenting an item
in QGraphicsView, QTBUG-6932
More information about the scm-commits
mailing list