- fix type cast issue on s390x
This commit is contained in:
parent
3eb1514284
commit
1dbbcc5dd9
48
qt-everywhere-opensource-src-4.6.2-webkit-s390x.patch
Normal file
48
qt-everywhere-opensource-src-4.6.2-webkit-s390x.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
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
|
8
qt.spec
8
qt.spec
@ -13,7 +13,7 @@ Summary: Qt toolkit
|
|||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.6.2
|
Version: 4.6.2
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||||
@ -58,6 +58,8 @@ Patch53: qt-x11-opensource-src-4.5.0-fix-qatomic-inline-asm.patch
|
|||||||
Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
|
Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
|
||||||
# http://bugs.kde.org/show_bug.cgi?id=180051#c22
|
# http://bugs.kde.org/show_bug.cgi?id=180051#c22
|
||||||
Patch55: qt-everywhere-opensource-src-4.6.2-cups.patch
|
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
|
# security patches
|
||||||
Patch100: qt-x11-opensource-src-4.5.3-cve-2010-0046-css-format-mem-corruption.patch
|
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 and OpenGL items.
|
|||||||
## TODO: upstream me
|
## TODO: upstream me
|
||||||
%patch54 -p1 -b .mysql_config
|
%patch54 -p1 -b .mysql_config
|
||||||
%patch55 -p1 -b .cups-1
|
%patch55 -p1 -b .cups-1
|
||||||
|
%patch56 -p1 -b .typecast_s390x
|
||||||
|
|
||||||
# security fixes
|
# security fixes
|
||||||
%patch100 -p1 -b .cve-2010-0046-css-format-mem-corruption
|
%patch100 -p1 -b .cve-2010-0046-css-format-mem-corruption
|
||||||
@ -1033,6 +1036,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 23 2010 Than Ngo <than@redhat.com> - 4.6.2-10
|
||||||
|
- fix type cast issue on s390x
|
||||||
|
|
||||||
* Mon Mar 22 2010 Than Ngo <than@redhat.com> - 4.6.2-9
|
* Mon Mar 22 2010 Than Ngo <than@redhat.com> - 4.6.2-9
|
||||||
- backport patch to fix ix a crash when reparenting an item
|
- backport patch to fix ix a crash when reparenting an item
|
||||||
in QGraphicsView, QTBUG-6932
|
in QGraphicsView, QTBUG-6932
|
||||||
|
Loading…
Reference in New Issue
Block a user