[qtwebkit] 2.3.3-8

[Rex Dieter]

commit c22af0555b8878a022dc77f01115f35307aeb70a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Feb 28 13:29:12 2014 -0600

    2.3.3-8
    
    - initial backport aarch64 javascriptcore fixes, needswork (#1070446)
    - apply downstream patches *after* upstream ones

 qtwebkit-aarch64.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 qtwebkit.spec          |   28 ++++++++++++++++++----------
 2 files changed, 60 insertions(+), 10 deletions(-)
---
diff --git a/qtwebkit-aarch64.patch b/qtwebkit-aarch64.patch
new file mode 100644
index 0000000..daba20c
--- /dev/null
+++ b/qtwebkit-aarch64.patch
@@ -0,0 +1,42 @@
+diff -up webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h.aarch64 webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h
+--- webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h.aarch64	2014-02-28 13:01:16.157141081 -0600
++++ webkit-qtwebkit-23/Source/WTF/wtf/dtoa/utils.h	2014-02-28 13:07:09.189431851 -0600
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(AARCH64)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
+diff -up webkit-qtwebkit-23/Source/WTF/wtf/Platform.h.aarch64 webkit-qtwebkit-23/Source/WTF/wtf/Platform.h
+--- webkit-qtwebkit-23/Source/WTF/wtf/Platform.h.aarch64	2014-02-28 13:01:16.156141091 -0600
++++ webkit-qtwebkit-23/Source/WTF/wtf/Platform.h	2014-02-28 13:04:57.961813306 -0600
+@@ -312,7 +312,16 @@
+ 
+ #endif /* ARM */
+ 
+-#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC)
++/* CPU(AARCH64) - AArch64 */
++#if defined(__aarch64__)
++#define WTF_CPU_AARCH64 1
++#if defined(__AARCH64EB__)
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++#endif
++
++/* Not sure about this one, qt5-qtwebkit doesn't include it -- rex */
++#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(AARCH64)
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
+@@ -874,7 +883,7 @@
+     || CPU(ALPHA) \
+     || CPU(SPARC64) \
+     || CPU(S390X) \
+-    || CPU(PPC64)
++    || CPU(PPC64) || CPU(AARCH64) \
+ #define WTF_USE_JSVALUE64 1
+ #else
+ #define WTF_USE_JSVALUE32_64 1
diff --git a/qtwebkit.spec b/qtwebkit.spec
index b509262..7a8d7f4 100644
--- a/qtwebkit.spec
+++ b/qtwebkit.spec
@@ -3,7 +3,7 @@ Name: qtwebkit
 Summary: Qt WebKit bindings
 
 Version: 2.3.3
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 URL: http://trac.webkit.org/wiki/QtWebKit
@@ -46,6 +46,9 @@ Patch11: qtwebkit-23-LLInt-C-Loop-backend-ppc.patch
 # https://qt.gitorious.org/qt/qtwebkit/commit/60ba8bd5b3575d
 Patch12: glslang_bison3.patch
 
+# support aarch64
+Patch13: qtwebkit-aarch64.patch 
+
 ## upstream patches
 Patch102: 0002-Texmap-GTK-The-poster-circle-doesn-t-appear.patch
 Patch103: 0003-Qt-Tiled-backing-store-not-clipped-to-frame-or-visib.patch
@@ -115,15 +118,6 @@ Provides:  qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
 %prep
 %setup -q -n webkit-qtwebkit-23
 
-%patch1 -p1 -b .pluginpath
-%patch3 -p1 -b .debuginfo
-%patch4 -p1 -b .save_memory
-# all big-endian arches require the Double2Ints fix
-%ifarch ppc ppc64 s390 s390x
-%patch10 -p1 -b .system-malloc
-%patch11 -p1 -b .Double2Ints
-%endif
-%patch12 -p1 -b .bison3
 %patch102 -p1 -b .0002
 %patch103 -p1 -b .0003
 %patch104 -p1 -b .0004
@@ -143,6 +137,16 @@ Provides:  qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
 %patch119 -p1 -b .0019
 %patch120 -p1 -b .0020
 
+%patch1 -p1 -b .pluginpath
+%patch3 -p1 -b .debuginfo
+%patch4 -p1 -b .save_memory
+# all big-endian arches require the Double2Ints fix
+%ifarch ppc ppc64 s390 s390x
+%patch10 -p1 -b .system-malloc
+%patch11 -p1 -b .Double2Ints
+%endif
+%patch12 -p1 -b .bison3
+%patch13 -p1 -b .aarch64
 
 
 %build 
@@ -223,6 +227,10 @@ popd
 
 
 %changelog
+* Fri Feb 28 2014 Rex Dieter <rdieter at fedoraproject.org> 2.3.3-8
+- initial backport aarch64 javascriptcore fixes, needswork (#1070446)
+- apply downstream patches *after* upstream ones
+
 * Thu Feb 13 2014 Rex Dieter <rdieter at fedoraproject.org> 2.3.3-7
 - backport more upstream fixes