From 1f735db3e34bb4f294ed3f8ebdf72519a150b732 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Fri, 18 Oct 2013 15:00:15 +0200
Subject: [PATCH 01/12] Update to 2.2.1

---
 .gitignore      | 1 +
 sources         | 2 +-
 webkitgtk3.spec | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5033442..cd187b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ webkit-1.3.3.tar.gz
 /webkitgtk-2.1.91.tar.xz
 /webkitgtk-2.1.92.tar.xz
 /webkitgtk-2.2.0.tar.xz
+/webkitgtk-2.2.1.tar.xz
diff --git a/sources b/sources
index fb6e3e8..f983258 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c337812667c4885ebe29a54084dcd4c  webkitgtk-2.2.0.tar.xz
+f5decdd76b2c08ab6e01ac47342f680e  webkitgtk-2.2.1.tar.xz
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index ff1d2cd..de894ab 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,7 +6,7 @@
         cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
@@ -211,6 +211,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 
 
 %changelog
+* Fri Oct 18 2013 Tomas Popela <tpopela@redhat.com> - 2.2.1-1
+- Update to 2.2.1
+
 * Fri Sep 27 2013 Kalev Lember <kalevlember@gmail.com> - 2.2.0-1
 - Update to 2.2.0
 

From efa190af339796b34d269e88bb3390f0d19e3b63 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Mon, 11 Nov 2013 14:20:11 +0100
Subject: [PATCH 02/12] Update to 2.2.2

---
 .gitignore      | 1 +
 sources         | 2 +-
 webkitgtk3.spec | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index cd187b6..de2ad85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,4 @@ webkit-1.3.3.tar.gz
 /webkitgtk-2.1.92.tar.xz
 /webkitgtk-2.2.0.tar.xz
 /webkitgtk-2.2.1.tar.xz
+/webkitgtk-2.2.2.tar.xz
diff --git a/sources b/sources
index f983258..fa91ba6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f5decdd76b2c08ab6e01ac47342f680e  webkitgtk-2.2.1.tar.xz
+49cc8fd065de72603776a494e41c1977  webkitgtk-2.2.2.tar.xz
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index de894ab..552c7d7 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,7 +6,7 @@
         cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
@@ -211,6 +211,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 
 
 %changelog
+* Mon Nov 11 2013 Tomas Popela <tpopela@redhat.com> - 2.2.2-1
+- Update to 2.2.2
+
 * Fri Oct 18 2013 Tomas Popela <tpopela@redhat.com> - 2.2.1-1
 - Update to 2.2.1
 

From 11fb1f0df21ef4c9c731ac0d5697d66a47edb929 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Thu, 28 Nov 2013 13:34:21 +0100
Subject: [PATCH 03/12] Fix for RH bug #1035764 - Crashes with certain Google
 Drive documents

---
 webkitgtk-2.2.2-get_by_val.patch | 21 +++++++++++++++++++++
 webkitgtk3.spec                  |  9 ++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 webkitgtk-2.2.2-get_by_val.patch

diff --git a/webkitgtk-2.2.2-get_by_val.patch b/webkitgtk-2.2.2-get_by_val.patch
new file mode 100644
index 0000000..c4e2f1b
--- /dev/null
+++ b/webkitgtk-2.2.2-get_by_val.patch
@@ -0,0 +1,21 @@
+--- webkitgtk-2.2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp	(revision 158679)
++++ webkitgtk-2.2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp	(working copy)
+@@ -2023,17 +2023,9 @@ void SpeculativeJIT::compileGetByValOnSt
+     // 8 bit string values don't need the isASCII check.
+     cont8Bit.link(&m_jit);
+ 
+-#if CPU(X86)
+-    // Don't have enough register, construct our own indexed address and load.
+-    m_jit.lshift32(MacroAssembler::TrustedImm32(2), scratchReg);
++    m_jit.lshift32(MacroAssembler::TrustedImm32(sizeof(void*) == 4 ? 2 : 3), scratchReg);
+     m_jit.addPtr(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), scratchReg);
+     m_jit.loadPtr(scratchReg, scratchReg);
+-#else
+-    GPRTemporary smallStrings(this);
+-    GPRReg smallStringsReg = smallStrings.gpr();
+-    m_jit.move(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), smallStringsReg);
+-    m_jit.loadPtr(MacroAssembler::BaseIndex(smallStringsReg, scratchReg, MacroAssembler::ScalePtr, 0), scratchReg);
+-#endif
+ 
+     addSlowPathGenerator(
+         slowPathCall(
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 552c7d7..eeefbf0 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
 
 Name:           webkitgtk3
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -22,6 +22,9 @@ Patch0:         webkit-1.1.14-nspluginwrapper.patch
 Patch1:         webkitgtk-2.1.1-yarr.patch
 # https://bugs.webkit.org/show_bug.cgi?id=103128
 Patch4:         webkit-2.1.90-double2intsPPC32.patch
+# https://bugs.webkit.org/show_bug.cgi?id=123816
+# Remove when 2.2.3 will be out
+Patch5:         webkitgtk-2.2.2-get_by_val.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -96,6 +99,7 @@ This package contains developer documentation for %{name}.
 %ifarch ppc s390
 %patch4 -p1 -b .double2intsPPC32
 %endif
+%patch5 -p1
 
 %build
 # Use linker flags to reduce memory consumption
@@ -211,6 +215,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 
 
 %changelog
+* Thu Nov 28 2013 Tomas Popela <tpopela@redhat.com> - 2.2.2-2
+- Fix for RH bug #1035764 - Crashes with certain Google Drive documents
+
 * Mon Nov 11 2013 Tomas Popela <tpopela@redhat.com> - 2.2.2-1
 - Update to 2.2.2
 

From ebcd466fd1676970a33d912de5ef392239e986f9 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Wed, 4 Dec 2013 15:19:05 +0100
Subject: [PATCH 04/12] Update to 2.2.3

---
 .gitignore      |  1 +
 sources         |  2 +-
 webkitgtk3.spec | 11 +++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index de2ad85..25eb0bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ webkit-1.3.3.tar.gz
 /webkitgtk-2.2.0.tar.xz
 /webkitgtk-2.2.1.tar.xz
 /webkitgtk-2.2.2.tar.xz
+/webkitgtk-2.2.3.tar.xz
diff --git a/sources b/sources
index fa91ba6..bdc6def 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49cc8fd065de72603776a494e41c1977  webkitgtk-2.2.2.tar.xz
+613e81c460368ff4d6e02c7887206572  webkitgtk-2.2.3.tar.xz
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index eeefbf0..5bed007 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,8 @@
         cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.2.2
-Release:        2%{?dist}
+Version:        2.2.3
+Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -22,9 +22,6 @@ Patch0:         webkit-1.1.14-nspluginwrapper.patch
 Patch1:         webkitgtk-2.1.1-yarr.patch
 # https://bugs.webkit.org/show_bug.cgi?id=103128
 Patch4:         webkit-2.1.90-double2intsPPC32.patch
-# https://bugs.webkit.org/show_bug.cgi?id=123816
-# Remove when 2.2.3 will be out
-Patch5:         webkitgtk-2.2.2-get_by_val.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -99,7 +96,6 @@ This package contains developer documentation for %{name}.
 %ifarch ppc s390
 %patch4 -p1 -b .double2intsPPC32
 %endif
-%patch5 -p1
 
 %build
 # Use linker flags to reduce memory consumption
@@ -215,6 +211,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 
 
 %changelog
+* Wed Dec 4 2013 Tomas Popela <tpopela@redhat.com> - 2.2.3-1
+- Update to 2.2.3
+
 * Thu Nov 28 2013 Tomas Popela <tpopela@redhat.com> - 2.2.2-2
 - Fix for RH bug #1035764 - Crashes with certain Google Drive documents
 

From 6f6f3c3b59dc9843b5297fc025f9466b8dd314d1 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Wed, 4 Dec 2013 15:28:35 +0100
Subject: [PATCH 05/12] Remove unneeded patch

---
 webkitgtk-2.2.2-get_by_val.patch | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 webkitgtk-2.2.2-get_by_val.patch

diff --git a/webkitgtk-2.2.2-get_by_val.patch b/webkitgtk-2.2.2-get_by_val.patch
deleted file mode 100644
index c4e2f1b..0000000
--- a/webkitgtk-2.2.2-get_by_val.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- webkitgtk-2.2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp	(revision 158679)
-+++ webkitgtk-2.2.2/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp	(working copy)
-@@ -2023,17 +2023,9 @@ void SpeculativeJIT::compileGetByValOnSt
-     // 8 bit string values don't need the isASCII check.
-     cont8Bit.link(&m_jit);
- 
--#if CPU(X86)
--    // Don't have enough register, construct our own indexed address and load.
--    m_jit.lshift32(MacroAssembler::TrustedImm32(2), scratchReg);
-+    m_jit.lshift32(MacroAssembler::TrustedImm32(sizeof(void*) == 4 ? 2 : 3), scratchReg);
-     m_jit.addPtr(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), scratchReg);
-     m_jit.loadPtr(scratchReg, scratchReg);
--#else
--    GPRTemporary smallStrings(this);
--    GPRReg smallStringsReg = smallStrings.gpr();
--    m_jit.move(MacroAssembler::TrustedImmPtr(m_jit.vm()->smallStrings.singleCharacterStrings()), smallStringsReg);
--    m_jit.loadPtr(MacroAssembler::BaseIndex(smallStringsReg, scratchReg, MacroAssembler::ScalePtr, 0), scratchReg);
--#endif
- 
-     addSlowPathGenerator(
-         slowPathCall(

From de65fc3157e494230818c2be05e061ca3731f061 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 5 Dec 2013 08:44:28 +0000
Subject: [PATCH 06/12] Add %{?_isa} to the libwebkit2gtk subpackage

This ensures that dnf does the right thing if the metadata gets out of sync.
---
 webkitgtk3.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 5bed007..c4acbc9 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -65,7 +65,7 @@ This package contains WebKitGTK+ for GTK+ 3.
 %package -n     libwebkit2gtk
 Summary:        The libwebkit2gtk library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description -n libwebkit2gtk
 The libwebkit2gtk package contains the libwebkit2gtk library
@@ -74,7 +74,7 @@ that is part of %{name}.
 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries, build data, and header

From aa05d7e0c97c2ff32a6832e5f81e5fa0e28e90a7 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 8 May 2014 09:22:10 +0100
Subject: [PATCH 07/12] Update to 2.4.1

---
 .gitignore                 | 51 +-------------------------------------
 sources                    |  2 +-
 webkitgtk-2.1.1-yarr.patch | 12 ---------
 webkitgtk-aarch64.patch    | 38 ++++++++++++++++++++++++++++
 webkitgtk3.spec            | 34 +++++++++++++++++--------
 5 files changed, 63 insertions(+), 74 deletions(-)
 delete mode 100644 webkitgtk-2.1.1-yarr.patch
 create mode 100644 webkitgtk-aarch64.patch

diff --git a/.gitignore b/.gitignore
index 25eb0bf..90f2733 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,50 +1 @@
-webkit-1.3.3.tar.gz
-/webkit-1.3.4.tar.gz
-/webkit-1.3.5.tar.gz
-/webkit-1.3.6.tar.gz
-/webkit-1.3.7.tar.gz
-/webkit-1.3.9.tar.gz
-/webkit-1.3.10.tar.gz
-/webkit-1.3.11.tar.gz
-/webkit-1.3.13.tar.gz
-/webkit-1.4.0.tar.gz
-/webkit-1.5.1.tar.gz
-/webkit-1.6.1.tar.gz
-/webkit-1.7.1.tar.gz
-/webkit-1.7.2.tar.xz
-/webkit-1.7.3.tar.xz
-/webkit-1.7.4.tar.xz
-/webkit-1.7.5.tar.xz
-/webkit-1.7.91.tar.xz
-/webkit-1.7.92.tar.xz
-/webkit-1.8.0.tar.xz
-/webkit-1.8.1.tar.xz
-/webkit-1.9.3.tar.xz
-/webkit-1.9.4.tar.xz
-/webkit-1.9.5.tar.xz
-/webkit-1.9.90.tar.xz
-/webkit-1.9.91.tar.xz
-/webkit-1.9.92.tar.xz
-/webkitgtk-1.10.0.tar.xz
-/webkitgtk-1.10.1.tar.xz
-/webkitgtk-1.11.2.tar.xz
-/webkitgtk-1.11.4.tar.xz
-/webkitgtk-1.11.5.tar.xz
-/webkitgtk-1.11.90.tar.xz
-/webkitgtk-1.11.91.tar.xz
-/webkitgtk-1.11.92.tar.xz
-/webkitgtk-2.0.0.tar.xz
-/webkitgtk-2.0.1.tar.xz
-/webkitgtk-2.0.2.tar.xz
-/webkitgtk-2.1.1.tar.xz
-/webkitgtk-2.1.2.tar.xz
-/webkitgtk-2.1.3.tar.xz
-/webkitgtk-2.1.4.tar.xz
-/webkitgtk-2.1.90.tar.xz
-/webkitgtk-2.1.90.1.tar.xz
-/webkitgtk-2.1.91.tar.xz
-/webkitgtk-2.1.92.tar.xz
-/webkitgtk-2.2.0.tar.xz
-/webkitgtk-2.2.1.tar.xz
-/webkitgtk-2.2.2.tar.xz
-/webkitgtk-2.2.3.tar.xz
+/webkitgtk-2.*.tar.xz
diff --git a/sources b/sources
index bdc6def..eda5de3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-613e81c460368ff4d6e02c7887206572  webkitgtk-2.2.3.tar.xz
+c57ebecff1ba7663b303e21a64840c48  webkitgtk-2.4.1.tar.xz
diff --git a/webkitgtk-2.1.1-yarr.patch b/webkitgtk-2.1.1-yarr.patch
deleted file mode 100644
index 6752c20..0000000
--- a/webkitgtk-2.1.1-yarr.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr webkitgtk-2.1.1/Source/WTF/wtf/Platform.h
---- webkitgtk-2.1.1/Source/WTF/wtf/Platform.h.yarr	2013-05-29 15:41:14.572995439 +0200
-+++ webkitgtk-2.1.1/Source/WTF/wtf/Platform.h	2013-05-29 15:42:04.434993292 +0200
-@@ -823,7 +823,7 @@
- #define ENABLE_REGEXP_TRACING 0
- 
- /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */
--#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT))
-+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && ENABLE(LLINT_C_LOOP) && !(OS(QNX) && PLATFORM(QT))
- #define ENABLE_YARR_JIT 1
- 
- /* Setting this flag compares JIT results with interpreter results. */
diff --git a/webkitgtk-aarch64.patch b/webkitgtk-aarch64.patch
new file mode 100644
index 0000000..fe54daa
--- /dev/null
+++ b/webkitgtk-aarch64.patch
@@ -0,0 +1,38 @@
+--- 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 @@
+ #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
+ #endif
+ 
++/* CPU(AARCH64) - AArch64 */
++#if defined(__aarch64__)
++#define WTF_CPU_AARCH64 1
++#if defined(__AARCH64BE__)
++#define WTF_CPU_BIG_ENDIAN 1
++#endif
++#endif
++
+ /* ==== 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) \
+     || CPU(ARM64) \
+     || CPU(S390X) \
+-    || CPU(PPC64)
++    || CPU(PPC64) \
++    || 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/webkitgtk3.spec b/webkitgtk3.spec
index c4acbc9..e3c8569 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,8 @@
         cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.2.3
-Release:        1%{?dist}
+Version:        2.4.1
+Release:        2%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -17,11 +17,9 @@ URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
 Patch0:         webkit-1.1.14-nspluginwrapper.patch
-# workarounds for non-JIT arches
-# https://bugs.webkit.org/show_bug.cgi?id=104270
-Patch1:         webkitgtk-2.1.1-yarr.patch
 # https://bugs.webkit.org/show_bug.cgi?id=103128
 Patch4:         webkit-2.1.90-double2intsPPC32.patch
+Patch10:        webkitgtk-aarch64.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -31,7 +29,7 @@ BuildRequires:  enchant-devel
 BuildRequires:  flex
 BuildRequires:  fontconfig-devel >= 2.5
 BuildRequires:  freetype-devel
-BuildRequires:  geoclue-devel
+BuildRequires:  geoclue2-devel
 BuildRequires:  gettext
 BuildRequires:  gperf
 BuildRequires:  gstreamer1-devel
@@ -55,6 +53,7 @@ BuildRequires:  gobject-introspection-devel >= 1.32.0
 BuildRequires:  perl-Switch
 BuildRequires:  ruby
 BuildRequires:  mesa-libGL-devel
+Requires:       geoclue2
 
 %description
 WebKitGTK+ is the port of the portable web rendering engine WebKit to the
@@ -66,6 +65,7 @@ This package contains WebKitGTK+ for GTK+ 3.
 Summary:        The libwebkit2gtk library
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       geoclue2
 
 %description -n libwebkit2gtk
 The libwebkit2gtk package contains the libwebkit2gtk library
@@ -75,6 +75,7 @@ that is part of %{name}.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       libwebkit2gtk%{?_isa} = %{version}-%{release}
 
 %description    devel
 The %{name}-devel package contains libraries, build data, and header
@@ -92,28 +93,32 @@ This package contains developer documentation for %{name}.
 %prep
 %setup -qn "webkitgtk-%{version}"
 %patch0 -p1 -b .nspluginwrapper
-%patch1 -p1 -b .yarr
 %ifarch ppc s390
 %patch4 -p1 -b .double2intsPPC32
 %endif
+%patch10 -p1 -b .aarch64
 
 %build
 # Use linker flags to reduce memory consumption
 %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
 
-%ifarch s390 s390x %{arm}
+%ifarch s390 %{arm}
 # Decrease debuginfo verbosity to reduce memory consumption even more
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
 %ifarch ppc
 # Use linker flag -relax to get WebKit2 build under ppc(32) with JIT disabled
-%global optflags %{optflags} -Wl,-relax
+%global optflags %{optflags} -Wl,-relax -latomic
+%endif
+
+%ifarch s390 s390x ppc ppc64 aarch64
+%global optflags %{optflags} -DENABLE_YARR_JIT=0
 %endif
 
 %configure                                                      \
                         --with-gtk=3.0                          \
-%ifarch s390 s390x ppc ppc64
+%ifarch s390 s390x ppc ppc64 aarch64
                         --disable-jit                           \
 %else
                         --enable-jit                            \
@@ -186,7 +191,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %{_libdir}/libwebkit2gtk-3.0.so.*
 %{_libdir}/webkit2gtk-3.0/
 %{_libdir}/girepository-1.0/WebKit2-3.0.typelib
+%{_libdir}/girepository-1.0/WebKit2WebExtension-3.0.typelib
 %{_libexecdir}/%{name}/MiniBrowser
+%{_libexecdir}/WebKitNetworkProcess
 %{_libexecdir}/WebKitPluginProcess
 %{_libexecdir}/WebKitWebProcess
 
@@ -198,9 +205,11 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %{_libdir}/libjavascriptcoregtk-3.0.so
 %{_libdir}/pkgconfig/webkitgtk-3.0.pc
 %{_libdir}/pkgconfig/webkit2gtk-3.0.pc
+%{_libdir}/pkgconfig/webkit2gtk-web-extension-3.0.pc
 %{_libdir}/pkgconfig/javascriptcoregtk-3.0.pc
 %{_datadir}/gir-1.0/WebKit-3.0.gir
 %{_datadir}/gir-1.0/WebKit2-3.0.gir
+%{_datadir}/gir-1.0/WebKit2WebExtension-3.0.gir
 %{_datadir}/gir-1.0/JavaScriptCore-3.0.gir
 
 %files doc
@@ -208,9 +217,12 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/webkitgtk
 %{_datadir}/gtk-doc/html/webkit2gtk
-
+%{_datadir}/gtk-doc/html/webkitdomgtk
 
 %changelog
+* Thu May 08 2014 Richard Hughes <richard@hughsie.com> - 2.4.1-2
+- Update to 2.4.1
+
 * Wed Dec 4 2013 Tomas Popela <tpopela@redhat.com> - 2.2.3-1
 - Update to 2.2.3
 

From a5753f3df4a86ce4e100f0b749be00ec7dfcb895 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Thu, 8 May 2014 09:22:34 +0100
Subject: [PATCH 08/12] Reduce debuginfo verbosity to build in the COPR

---
 webkitgtk3.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index e3c8569..9d49fce 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -102,10 +102,10 @@ This package contains developer documentation for %{name}.
 # Use linker flags to reduce memory consumption
 %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
 
-%ifarch s390 %{arm}
+#%ifarch s390 %{arm}
 # Decrease debuginfo verbosity to reduce memory consumption even more
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
-%endif
+#%endif
 
 %ifarch ppc
 # Use linker flag -relax to get WebKit2 build under ppc(32) with JIT disabled

From 595d8595dde686975d85e29ace51c8f9d76497cd Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Mon, 12 May 2014 11:04:26 +0200
Subject: [PATCH 09/12] Update to 2.4.2

---
 sources         | 2 +-
 webkitgtk3.spec | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources b/sources
index eda5de3..083f89b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c57ebecff1ba7663b303e21a64840c48  webkitgtk-2.4.1.tar.xz
+da2b1b0f0863f3f21bdbc0476001589f  webkitgtk-2.4.2.tar.xz
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index 9d49fce..63ac8e5 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,8 @@
         cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.4.1
-Release:        2%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -220,6 +220,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %{_datadir}/gtk-doc/html/webkitdomgtk
 
 %changelog
+* Mon May 12 2014 Kalev Lember <kalevlember@gmail.com> - 2.4.2-1
+- Update to 2.4.2
+
 * Thu May 08 2014 Richard Hughes <richard@hughsie.com> - 2.4.1-2
 - Update to 2.4.1
 

From 9a5128b218aabaabf1de462854971d52135d0b28 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Thu, 2 Oct 2014 13:58:07 +0200
Subject: [PATCH 10/12] Update to 2.4.6

... and sync with the f21 branch.
---
 sources                                       |   2 +-
 webkitgtk-2.4.1-cloop_fix.patch               | 199 ++++++++++++++++++
 webkitgtk-2.4.1-ppc64_align.patch             |  45 ++++
 ...atch => webkitgtk-2.4.5-cloop_fix_32.patch |  12 +-
 webkitgtk-aarch64.patch                       |  38 ++--
 webkitgtk3.spec                               |  27 ++-
 6 files changed, 290 insertions(+), 33 deletions(-)
 create mode 100644 webkitgtk-2.4.1-cloop_fix.patch
 create mode 100644 webkitgtk-2.4.1-ppc64_align.patch
 rename webkit-2.1.90-double2intsPPC32.patch => webkitgtk-2.4.5-cloop_fix_32.patch (54%)

diff --git a/sources b/sources
index 083f89b..6f48645 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da2b1b0f0863f3f21bdbc0476001589f  webkitgtk-2.4.2.tar.xz
+b0d019777754bb5779de8b9ad1dd6bfe  webkitgtk-2.4.6.tar.xz
diff --git a/webkitgtk-2.4.1-cloop_fix.patch b/webkitgtk-2.4.1-cloop_fix.patch
new file mode 100644
index 0000000..2675caf
--- /dev/null
+++ b/webkitgtk-2.4.1-cloop_fix.patch
@@ -0,0 +1,199 @@
+diff -up webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h
+--- webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix	2014-07-23 14:15:45.497658648 +0200
++++ webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h	2014-07-23 14:16:46.997687779 +0200
+@@ -36,7 +36,7 @@ struct ProtoCallFrame {
+     Register calleeValue;
+     Register argCountAndCodeOriginValue;
+     Register thisArg;
+-    size_t paddedArgCount;
++    uint32_t paddedArgCount;
+     JSValue *args;
+ 
+     void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0);
+@@ -53,7 +53,7 @@ struct ProtoCallFrame {
+     int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); }
+     int argumentCount() const { return argumentCountIncludingThis() - 1; }
+     void setArgumentCountIncludingThis(int count) { argCountAndCodeOriginValue.payload() = count; }
+-    void setPaddedArgsCount(size_t argCount) { paddedArgCount = argCount; }
++    void setPaddedArgsCount(uint32_t argCount) { paddedArgCount = argCount; }
+ 
+     void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; }
+     
+diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
+--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix	2014-07-23 14:16:02.057667404 +0200
++++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp	2014-07-23 14:16:46.997687779 +0200
+@@ -1354,7 +1354,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_
+             CodeBlock* codeBlock = exec->codeBlock();
+             ConcurrentJITLocker locker(codeBlock->m_lock);
+             pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
+-            pc[6].u.operand = slot.cachedOffset();
++            pc[6].u.pointer = reinterpret_cast<void*>(slot.cachedOffset());
+         }
+     }
+ 
+@@ -1381,7 +1381,7 @@ LLINT_SLOW_PATH_DECL(slow_path_put_to_sc
+         if (slot.isCacheable() && slot.base() == scope && scope->structure()->propertyAccessesAreCacheable()) {
+             ConcurrentJITLocker locker(codeBlock->m_lock);
+             pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
+-            pc[6].u.operand = slot.cachedOffset();
++            pc[6].u.pointer = reinterpret_cast<void*>(slot.cachedOffset());
+         }
+     }
+ 
+diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix	2014-07-23 14:16:13.047672325 +0200
++++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2014-07-23 14:18:27.547721786 +0200
+@@ -282,7 +282,7 @@ macro doCallToJavaScript(makeCall, doRet
+     storep temp3, CodeBlock+4[cfr, temp1, 8]
+     btinz temp1, .copyHeaderLoop
+ 
+-    loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
++    loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
+     subi 1, temp2
+     loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3
+     subi 1, temp3
+@@ -321,7 +321,7 @@ macro doCallToJavaScript(makeCall, doRet
+ 
+ .calleeFramePopped:
+     loadp Callee[cfr], temp3 # VM.topCallFrame
+-    loadp ScopeChain[cfr], temp4
++    loadp ScopeChain + PayloadOffset[cfr], temp4
+     storep temp4, [temp3]
+ 
+     doReturn(extraStackSpace)
+@@ -598,7 +598,7 @@ end
+ 
+ 
+ macro branchIfException(label)
+-    loadp ScopeChain[cfr], t3
++    loadp ScopeChain + PayloadOffset[cfr], t3
+     andp MarkedBlockMask, t3
+     loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
+     bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException
+@@ -2039,7 +2039,7 @@ _llint_op_catch:
+     # the interpreter's throw trampoline (see _llint_throw_trampoline).
+     # The throwing code must have known that we were throwing to the interpreter,
+     # and have set VM::targetInterpreterPCForThrow.
+-    loadp ScopeChain[cfr], t3
++    loadp ScopeChain + PayloadOffset[cfr], t3
+     andp MarkedBlockMask, t3
+     loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
+     loadp VM::callFrameForThrow[t3], cfr
+@@ -2159,7 +2159,7 @@ macro nativeCallTrampoline(executableOff
+         andp MarkedBlockMask, t3
+         loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
+     elsif C_LOOP
+-        loadp ScopeChain[cfr], t3
++        loadp ScopeChain + PayloadOffset[cfr], t3
+         andp MarkedBlockMask, t3
+         loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
+         storep cfr, VM::topCallFrame[t3]
+@@ -2172,7 +2172,7 @@ macro nativeCallTrampoline(executableOff
+         move t2, cfr
+         cloopCallNative executableOffsetToFunction[t1]
+         restoreReturnAddressBeforeReturn(t3)
+-        loadp ScopeChain[cfr], t3
++        loadp ScopeChain + PayloadOffset[cfr], t3
+         andp MarkedBlockMask, t3
+         loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
+     else
+@@ -2212,7 +2212,7 @@ macro resolveScope()
+     addi 1, t2
+ 
+ .resolveScopeAfterActivationCheck:
+-    loadp ScopeChain[cfr], t0
++    loadp ScopeChain + PayloadOffset[cfr], t0
+     btiz t2, .resolveScopeLoopEnd
+ 
+ .resolveScopeLoop:
+@@ -2271,13 +2271,13 @@ _llint_op_resolve_scope:
+ 
+ macro loadWithStructureCheck(operand, slowPath)
+     loadisFromInstruction(operand, t0)
+-    loadp [cfr, t0, 8], t0
++    loadp PayloadOffset[cfr, t0, 8], t0
+     loadpFromInstruction(5, t1)
+     bpneq JSCell::m_structure[t0], t1, slowPath
+ end
+ 
+ macro getProperty()
+-    loadisFromInstruction(6, t3)
++    loadpFromInstruction(6, t3)
+     loadPropertyAtVariableOffset(t3, t0, t1, t2)
+     valueProfile(t1, t2, 28, t0)
+     loadisFromInstruction(1, t0)
+@@ -2297,7 +2297,7 @@ end
+ 
+ macro getClosureVar()
+     loadp JSVariableObject::m_registers[t0], t0
+-    loadisFromInstruction(6, t3)
++    loadpFromInstruction(6, t3)
+     loadp TagOffset[t0, t3, 8], t1
+     loadp PayloadOffset[t0, t3, 8], t2
+     valueProfile(t1, t2, 28, t0)
+@@ -2356,7 +2356,7 @@ _llint_op_get_from_scope:
+ macro putProperty()
+     loadisFromInstruction(3, t1)
+     loadConstantOrVariable(t1, t2, t3)
+-    loadisFromInstruction(6, t1)
++    loadpFromInstruction(6, t1)
+     storePropertyAtVariableOffset(t1, t0, t2, t3)
+ end
+ 
+@@ -2374,7 +2374,7 @@ macro putClosureVar()
+     loadisFromInstruction(3, t1)
+     loadConstantOrVariable(t1, t2, t3)
+     loadp JSVariableObject::m_registers[t0], t0
+-    loadisFromInstruction(6, t1)
++    loadpFromInstruction(6, t1)
+     storei t2, TagOffset[t0, t1, 8]
+     storei t3, PayloadOffset[t0, t1, 8]
+ end
+diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix	2014-07-23 14:16:19.147675074 +0200
++++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm	2014-07-23 14:16:46.997687779 +0200
+@@ -171,7 +171,7 @@ macro doCallToJavaScript(makeCall, doRet
+     storep temp3, CodeBlock[cfr, temp1, 8]
+     btinz temp1, .copyHeaderLoop
+ 
+-    loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
++    loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
+     subi 1, temp2
+     loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3
+     subi 1, temp3
+@@ -2047,7 +2047,7 @@ macro loadWithStructureCheck(operand, sl
+ end
+ 
+ macro getProperty()
+-    loadisFromInstruction(6, t1)
++    loadpFromInstruction(6, t1)
+     loadPropertyAtVariableOffset(t1, t0, t2)
+     valueProfile(t2, 7, t0)
+     loadisFromInstruction(1, t0)
+@@ -2064,7 +2064,7 @@ end
+ 
+ macro getClosureVar()
+     loadp JSVariableObject::m_registers[t0], t0
+-    loadisFromInstruction(6, t1)
++    loadpFromInstruction(6, t1)
+     loadq [t0, t1, 8], t0
+     valueProfile(t0, 7, t1)
+     loadisFromInstruction(1, t1)
+@@ -2121,7 +2121,7 @@ _llint_op_get_from_scope:
+ macro putProperty()
+     loadisFromInstruction(3, t1)
+     loadConstantOrVariable(t1, t2)
+-    loadisFromInstruction(6, t1)
++    loadpFromInstruction(6, t1)
+     storePropertyAtVariableOffset(t1, t0, t2)
+ end
+ 
+@@ -2138,7 +2138,7 @@ macro putClosureVar()
+     loadisFromInstruction(3, t1)
+     loadConstantOrVariable(t1, t2)
+     loadp JSVariableObject::m_registers[t0], t0
+-    loadisFromInstruction(6, t1)
++    loadpFromInstruction(6, t1)
+     storeq t2, [t0, t1, 8]
+ end
+ 
diff --git a/webkitgtk-2.4.1-ppc64_align.patch b/webkitgtk-2.4.1-ppc64_align.patch
new file mode 100644
index 0000000..5186d60
--- /dev/null
+++ b/webkitgtk-2.4.1-ppc64_align.patch
@@ -0,0 +1,45 @@
+diff -up webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h
+--- webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align	2014-05-12 08:03:53.000000000 +0200
++++ webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h	2014-05-14 15:16:36.946318596 +0200
+@@ -81,7 +81,7 @@ public:
+     size_t size();
+     size_t capacity();
+ 
+-    static const size_t blockSize = 32 * KB;
++    static const size_t blockSize = 64 * KB;
+ 
+     bool hasWorkList();
+     CopyWorkList& workList();
+diff -up webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp
+--- webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align	2014-05-12 08:03:53.000000000 +0200
++++ webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp	2014-05-14 15:17:35.617171141 +0200
+@@ -49,7 +49,8 @@ JSStack::JSStack(VM& vm, size_t capacity
+ {
+     ASSERT(capacity && isPageAligned(capacity));
+ 
+-    m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages);
++    size_t commitsize = pageSize();
++    m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitsize), OSAllocator::JSVMStackPages);
+     updateStackLimit(highAddress());
+     m_commitEnd = highAddress();
+ 
+@@ -78,7 +79,8 @@ bool JSStack::growSlowCase(Register* new
+     // Compute the chunk size of additional memory to commit, and see if we
+     // have it is still within our budget. If not, we'll fail to grow and
+     // return false.
+-    long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitSize);
++    size_t commitsize = pageSize();
++    long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitsize);
+     if (reinterpret_cast<char*>(m_commitEnd) - delta <= reinterpret_cast<char*>(m_useableEnd))
+         return false;
+ 
+@@ -134,7 +136,8 @@ void JSStack::enableErrorStackReserve()
+ 
+ void JSStack::disableErrorStackReserve()
+ {
+-    char* useableEnd = reinterpret_cast<char*>(reservationEnd()) + commitSize;
++    size_t commitsize = pageSize();
++    char* useableEnd = reinterpret_cast<char*>(reservationEnd()) + commitsize;
+     m_useableEnd = reinterpret_cast_ptr<Register*>(useableEnd);
+ 
+     // By the time we get here, we are guaranteed to be destructing the last
diff --git a/webkit-2.1.90-double2intsPPC32.patch b/webkitgtk-2.4.5-cloop_fix_32.patch
similarity index 54%
rename from webkit-2.1.90-double2intsPPC32.patch
rename to webkitgtk-2.4.5-cloop_fix_32.patch
index b904490..96c53ad 100644
--- a/webkit-2.1.90-double2intsPPC32.patch
+++ b/webkitgtk-2.4.5-cloop_fix_32.patch
@@ -1,6 +1,6 @@
-diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
---- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32	2013-08-28 21:06:29.000000000 +0200
-+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2013-09-12 15:32:34.000000000 +0200
+diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32	2013-08-28 21:06:29.000000000 +0200
++++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2013-09-12 15:32:34.000000000 +0200
 @@ -1679,7 +1679,7 @@ _llint_op_next_pname:
      loadi 20[PC], t2
      loadi PayloadOffset[cfr, t2, 8], t2
@@ -10,9 +10,9 @@ diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64
      addi 1, t0
      storei t0, PayloadOffset[cfr, t1, 8]
      loadi 4[PC], t1
-diff -up webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
---- webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32	2013-08-28 21:06:29.000000000 +0200
-+++ webkitgtk-2.1.90.1/Source/JavaScriptCore/llint/LowLevelInterpreter.asm	2013-09-12 15:32:34.000000000 +0200
+diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32	2013-08-28 21:06:29.000000000 +0200
++++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm	2013-09-12 15:32:34.000000000 +0200
 @@ -276,13 +276,13 @@ macro assertNotConstant(index)
  end
  
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/webkitgtk3.spec b/webkitgtk3.spec
index 63ac8e5..f0f0aeb 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,7 +6,7 @@
         cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.4.2
+Version:        2.4.6
 Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
@@ -17,9 +17,10 @@ URL:            http://www.webkitgtk.org/
 Source0:        http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
 Patch0:         webkit-1.1.14-nspluginwrapper.patch
-# https://bugs.webkit.org/show_bug.cgi?id=103128
-Patch4:         webkit-2.1.90-double2intsPPC32.patch
-Patch10:        webkitgtk-aarch64.patch
+Patch1:         webkitgtk-aarch64.patch
+Patch2:         webkitgtk-2.4.1-cloop_fix.patch
+Patch3:         webkitgtk-2.4.5-cloop_fix_32.patch
+Patch4:         webkitgtk-2.4.1-ppc64_align.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -53,6 +54,9 @@ BuildRequires:  gobject-introspection-devel >= 1.32.0
 BuildRequires:  perl-Switch
 BuildRequires:  ruby
 BuildRequires:  mesa-libGL-devel
+%ifarch ppc
+BuildRequires:  libatomic
+%endif
 Requires:       geoclue2
 
 %description
@@ -93,10 +97,14 @@ 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
 %ifarch ppc s390
-%patch4 -p1 -b .double2intsPPC32
+%patch3 -p1 -b .cloop_fix_32
+%endif
+%ifarch %{power64} aarch64 ppc
+%patch4 -p1 -b .ppc64_align
 %endif
-%patch10 -p1 -b .aarch64
 
 %build
 # Use linker flags to reduce memory consumption
@@ -112,13 +120,13 @@ This package contains developer documentation for %{name}.
 %global optflags %{optflags} -Wl,-relax -latomic
 %endif
 
-%ifarch s390 s390x ppc ppc64 aarch64
+%ifarch s390 s390x ppc %{power64} aarch64
 %global optflags %{optflags} -DENABLE_YARR_JIT=0
 %endif
 
 %configure                                                      \
                         --with-gtk=3.0                          \
-%ifarch s390 s390x ppc ppc64 aarch64
+%ifarch s390 s390x ppc %{power64} aarch64
                         --disable-jit                           \
 %else
                         --enable-jit                            \
@@ -220,6 +228,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %{_datadir}/gtk-doc/html/webkitdomgtk
 
 %changelog
+* Thu Oct 02 2014 Kalev Lember <kalevlember@gmail.com> - 2.4.6-1
+- Update to 2.4.6
+
 * Mon May 12 2014 Kalev Lember <kalevlember@gmail.com> - 2.4.2-1
 - Update to 2.4.2
 

From a8ba36193d2d6409a956a2b282a0920efb266719 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Tue, 21 Oct 2014 10:47:58 +0200
Subject: [PATCH 11/12] Disable the SSLv3 to address the POODLE vulnerability

---
 webkitgtk-2.4.6-poodle.patch | 47 ++++++++++++++++++++++++++++++++++++
 webkitgtk3.spec              |  7 +++++-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 webkitgtk-2.4.6-poodle.patch

diff --git a/webkitgtk-2.4.6-poodle.patch b/webkitgtk-2.4.6-poodle.patch
new file mode 100644
index 0000000..2404f6f
--- /dev/null
+++ b/webkitgtk-2.4.6-poodle.patch
@@ -0,0 +1,47 @@
+diff -up webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp.poodle webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp
+--- webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp.poodle	2014-10-21 10:08:32.851222903 +0200
++++ webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp	2014-10-21 10:08:31.234199110 +0200
+@@ -26,7 +26,19 @@
+ 
+ #include "WebProcessMainGtk.h"
+ 
++#include <cstdlib>
++
+ int main(int argc, char** argv)
+ {
++    // Disable SSLv3 very early because it is practically impossible to safely
++    // use setenv() when multiple threads are running, as another thread calling
++    // getenv() could cause a crash, and many functions use getenv() internally.
++    // This workaround will stop working if glib-networking switches away from
++    // GnuTLS or simply stops parsing this variable. We intentionally do not
++    // overwrite this priority string if it's already set by the user.
++    // Keep this in sync with NetworkMainUnix.cpp.
++    // https://bugzilla.gnome.org/show_bug.cgi?id=738633
++    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0);
++
+     return WebKit::WebProcessMainGtk(argc, argv);
+ }
+diff -up webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp.poodle webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp
+--- webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp.poodle	2014-10-21 10:03:39.622908372 +0200
++++ webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp	2014-10-21 10:07:38.017416084 +0200
+@@ -30,8 +30,20 @@
+ 
+ #include "NetworkProcessMainUnix.h"
+ 
++#include <cstdlib>
++
+ int main(int argc, char** argv)
+ {
++    // Disable SSLv3 very early because it is practically impossible to safely
++    // use setenv() when multiple threads are running, as another thread calling
++    // getenv() could cause a crash, and many functions use getenv() internally.
++    // This workaround will stop working if glib-networking switches away from
++    // GnuTLS or simply stops parsing this variable. We intentionally do not
++    // overwrite this priority string if it's already set by the user.
++    // Keep this in sync with MainGtk.cpp.
++    // https://bugzilla.gnome.org/show_bug.cgi?id=738633
++    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0);
++
+     return WebKit::NetworkProcessMain(argc, argv);
+ }
+ 
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index f0f0aeb..a531b5a 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -7,7 +7,7 @@
 
 Name:           webkitgtk3
 Version:        2.4.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -21,6 +21,7 @@ Patch1:         webkitgtk-aarch64.patch
 Patch2:         webkitgtk-2.4.1-cloop_fix.patch
 Patch3:         webkitgtk-2.4.5-cloop_fix_32.patch
 Patch4:         webkitgtk-2.4.1-ppc64_align.patch
+Patch5:         webkitgtk-2.4.6-poodle.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -99,6 +100,7 @@ This package contains developer documentation for %{name}.
 %patch0 -p1 -b .nspluginwrapper
 %patch1 -p1 -b .aarch64
 %patch2 -p1 -b .cloop_fix
+%patch5 -p1 -b .poodle
 %ifarch ppc s390
 %patch3 -p1 -b .cloop_fix_32
 %endif
@@ -228,6 +230,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %{_datadir}/gtk-doc/html/webkitdomgtk
 
 %changelog
+* Tue Oct 21 2014 Tomas Popela <tpopela@redhat.com> - 2.4.6-2
+- Disable the SSLv3 to address the POODLE vulnerability
+
 * Thu Oct 02 2014 Kalev Lember <kalevlember@gmail.com> - 2.4.6-1
 - Update to 2.4.6
 

From 20a37fe0ea36275f6ff90dfb09c6090ba96972cd Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Wed, 22 Oct 2014 14:50:23 +0200
Subject: [PATCH 12/12] Update to 2.4.7

---
 sources                      |  2 +-
 webkitgtk-2.4.6-poodle.patch | 47 ------------------------------------
 webkitgtk3.spec              |  9 ++++---
 3 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 webkitgtk-2.4.6-poodle.patch

diff --git a/sources b/sources
index 6f48645..3390423 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0d019777754bb5779de8b9ad1dd6bfe  webkitgtk-2.4.6.tar.xz
+e1a10b4730f501980e3681db9b0e5d25  webkitgtk-2.4.7.tar.xz
diff --git a/webkitgtk-2.4.6-poodle.patch b/webkitgtk-2.4.6-poodle.patch
deleted file mode 100644
index 2404f6f..0000000
--- a/webkitgtk-2.4.6-poodle.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -up webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp.poodle webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp
---- webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp.poodle	2014-10-21 10:08:32.851222903 +0200
-+++ webkitgtk-2.4.6/Source/WebKit2/gtk/MainGtk.cpp	2014-10-21 10:08:31.234199110 +0200
-@@ -26,7 +26,19 @@
- 
- #include "WebProcessMainGtk.h"
- 
-+#include <cstdlib>
-+
- int main(int argc, char** argv)
- {
-+    // Disable SSLv3 very early because it is practically impossible to safely
-+    // use setenv() when multiple threads are running, as another thread calling
-+    // getenv() could cause a crash, and many functions use getenv() internally.
-+    // This workaround will stop working if glib-networking switches away from
-+    // GnuTLS or simply stops parsing this variable. We intentionally do not
-+    // overwrite this priority string if it's already set by the user.
-+    // Keep this in sync with NetworkMainUnix.cpp.
-+    // https://bugzilla.gnome.org/show_bug.cgi?id=738633
-+    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0);
-+
-     return WebKit::WebProcessMainGtk(argc, argv);
- }
-diff -up webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp.poodle webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp
---- webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp.poodle	2014-10-21 10:03:39.622908372 +0200
-+++ webkitgtk-2.4.6/Source/WebKit2/unix/NetworkMainUnix.cpp	2014-10-21 10:07:38.017416084 +0200
-@@ -30,8 +30,20 @@
- 
- #include "NetworkProcessMainUnix.h"
- 
-+#include <cstdlib>
-+
- int main(int argc, char** argv)
- {
-+    // Disable SSLv3 very early because it is practically impossible to safely
-+    // use setenv() when multiple threads are running, as another thread calling
-+    // getenv() could cause a crash, and many functions use getenv() internally.
-+    // This workaround will stop working if glib-networking switches away from
-+    // GnuTLS or simply stops parsing this variable. We intentionally do not
-+    // overwrite this priority string if it's already set by the user.
-+    // Keep this in sync with MainGtk.cpp.
-+    // https://bugzilla.gnome.org/show_bug.cgi?id=738633
-+    setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0", 0);
-+
-     return WebKit::NetworkProcessMain(argc, argv);
- }
- 
diff --git a/webkitgtk3.spec b/webkitgtk3.spec
index a531b5a..d4d2f51 100644
--- a/webkitgtk3.spec
+++ b/webkitgtk3.spec
@@ -6,8 +6,8 @@
         cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk3
-Version:        2.4.6
-Release:        2%{?dist}
+Version:        2.4.7
+Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
 Group:          Development/Libraries
@@ -21,7 +21,6 @@ Patch1:         webkitgtk-aarch64.patch
 Patch2:         webkitgtk-2.4.1-cloop_fix.patch
 Patch3:         webkitgtk-2.4.5-cloop_fix_32.patch
 Patch4:         webkitgtk-2.4.1-ppc64_align.patch
-Patch5:         webkitgtk-2.4.6-poodle.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -100,7 +99,6 @@ This package contains developer documentation for %{name}.
 %patch0 -p1 -b .nspluginwrapper
 %patch1 -p1 -b .aarch64
 %patch2 -p1 -b .cloop_fix
-%patch5 -p1 -b .poodle
 %ifarch ppc s390
 %patch3 -p1 -b .cloop_fix_32
 %endif
@@ -230,6 +228,9 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" -delete
 %{_datadir}/gtk-doc/html/webkitdomgtk
 
 %changelog
+* Wed Oct 22 2014 Tomas Popela <tpopela@redhat.com> - 2.4.7-1
+- Update to 2.4.7
+
 * Tue Oct 21 2014 Tomas Popela <tpopela@redhat.com> - 2.4.6-2
 - Disable the SSLv3 to address the POODLE vulnerability