diff --git a/qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.patch b/qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.patch new file mode 100644 index 0000000..48ffa74 --- /dev/null +++ b/qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.patch @@ -0,0 +1,15 @@ +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 diff --git a/qt.spec b/qt.spec index da10fa5..db58456 100644 --- a/qt.spec +++ b/qt.spec @@ -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-qatomic-inline-asm.patch 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 to build for sparc64 +Patch56: qt-everywhere-opensource-src-4.6.2-sparc64-webkit-fix.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 and OpenGL items. ## TODO: upstream me %patch54 -p1 -b .mysql_config %patch55 -p1 -b .cups-1 +%patch56 -p1 -b .sparc64 # security fixes %patch100 -p1 -b .cve-2010-0046-css-format-mem-corruption @@ -1033,6 +1036,9 @@ fi %changelog +* Tue Mar 23 2010 Tom "spot" Callaway - 4.6.2-10 +- fix sparc64 webkit bits + * Mon Mar 22 2010 Than Ngo - 4.6.2-9 - backport patch to fix ix a crash when reparenting an item in QGraphicsView, QTBUG-6932