[webkitgtk] Rebase the aarch64 patch

[Tomas Popela]

commit cd3c7344e907a3fe283a640b4312fe4e261ffb7a
Author: Tomas Popela <tpopela at redhat.com>
Date:   Tue Sep 2 11:52:46 2014 +0200

    Rebase the aarch64 patch

 webkitgtk-aarch64.patch |   38 ++++++++++++++++++++------------------
 webkitgtk.spec          |    9 +++++----
 2 files changed, 25 insertions(+), 22 deletions(-)
---
diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch
index fe54daa..7272bc1 100644
--- a/webkitgtk-aarch64.patch
+++ b/webkitgtk-aarch64.patch
@@ -1,6 +1,19 @@
---- webkitgtk-2.3.5/Source/WTF/wtf/Platform.h.orig	2014-02-04 16:38:03.000000000 +0000
-+++ webkitgtk-2.3.5/Source/WTF/wtf/Platform.h	2014-02-07 10:50:32.639441614 +0000
-@@ -317,6 +317,14 @@
+diff -up webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h
+--- webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h.aarch64	2014-09-02 11:39:15.782812173 +0200
++++ webkitgtk-2.4.5/Source/WTF/wtf/dtoa/utils.h	2014-09-02 11:41:23.022637099 +0200
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
++#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(AARCH64) || CPU(HPPA)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+ #elif defined(_M_IX86) || defined(__i386__)
+ #if defined(_WIN32)
+diff -up webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.5/Source/WTF/wtf/Platform.h
+--- webkitgtk-2.4.5/Source/WTF/wtf/Platform.h.aarch64	2014-08-25 14:50:32.000000000 +0200
++++ webkitgtk-2.4.5/Source/WTF/wtf/Platform.h	2014-09-02 11:40:40.925033307 +0200
+@@ -331,6 +331,14 @@
  #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
  #endif
  
@@ -15,24 +28,13 @@
  /* ==== OS() - underlying operating system; only to be used for mandated low-level services like 
     virtual memory, not to choose a GUI toolkit ==== */
  
-@@ -641,7 +649,8 @@
-     || CPU(ALPHA) \
+@@ -656,7 +664,8 @@
      || CPU(ARM64) \
      || CPU(S390X) \
--    || CPU(PPC64)
-+    || CPU(PPC64) \
+     || CPU(PPC64) \
+-    || CPU(PPC64LE)
++    || CPU(PPC64LE) \
 +    || CPU(AARCH64)
  #define WTF_USE_JSVALUE64 1
  #else
  #define WTF_USE_JSVALUE32_64 1
---- webkitgtk-2.3.5/Source/WTF/wtf/dtoa/utils.h.orig	2014-02-07 10:50:15.238174894 +0000
-+++ webkitgtk-2.3.5/Source/WTF/wtf/dtoa/utils.h	2014-02-07 10:50:32.640441629 +0000
-@@ -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(ALPHA) || CPU(ARM64) || CPU(HPPA)
-+#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(AARCH64) || CPU(HPPA)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
diff --git a/webkitgtk.spec b/webkitgtk.spec
index c2c4dcf..5ab9bc4 100644
--- a/webkitgtk.spec
+++ b/webkitgtk.spec
@@ -10,7 +10,7 @@
 
 Name:		webkitgtk
 Version:	2.4.5
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GTK+ Web content engine library
 
 Group:		Development/Libraries
@@ -88,14 +88,12 @@ This package contains developer documentation for %{name}.
 %prep
 %setup -qn "webkitgtk-%{version}"
 %patch0 -p1 -b .nspluginwrapper
+%patch1 -p1 -b .aarch64
 %patch2 -p1 -b .cloop_fix
 # required for 32-bit big-endians
 %ifarch ppc s390
 %patch3 -p1 -b .cloop_fix_32
 %endif
-%ifarch aarch64
-%patch1 -p1 -b .aarch64
-%endif
 %ifarch %{power64} aarch64 ppc
 %patch4 -p1 -b .ppc64_align
 %endif
@@ -207,6 +205,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/webkitgtk
 
 %changelog
+* Tue Sep 02 2014 Tomas Popela <tpopela at redhat.com> - 2.4.5-3
+- Rebase the aarch64 patch
+
 * Tue Aug 26 2014 David Tardon <dtardon at redhat.com> - 2.4.5-2
 - rebuild for ICU 53.1