Update to 2.2.8

Disable yarr jit through flag and don't use patch for it

.gitignore

@@ -26,3 +26,11 @@ webkit-1.3.2.tar.gz
 /webkitgtk-2.0.1.tar.xz
 /webkitgtk-2.0.2.tar.xz
 /webkitgtk-2.0.4.tar.xz
+/webkitgtk-2.2.1.tar.xz
+/webkitgtk-2.2.2.tar.xz
+/webkitgtk-2.2.3.tar.xz
+/webkitgtk-2.2.4.tar.xz
+/webkitgtk-2.2.5.tar.xz
+/webkitgtk-2.2.6.tar.xz
+/webkitgtk-2.2.7.tar.xz
+/webkitgtk-2.2.8.tar.xz

sources

@@ -1 +1 @@
-413be319ba171feed9348d1bede6b0a7  webkitgtk-2.0.4.tar.xz
+047f13fabc67003c9019e75a494c3faf  webkitgtk-2.2.8.tar.xz

webkit-1.11.2-Double2Ints.patch

@@ -1,21 +0,0 @@
-diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
---- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp.double2ints	2013-02-12 17:22:38.000000000 +0100
-+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	2013-03-07 18:04:39.778807991 +0100
-@@ -117,6 +118,17 @@ static double Ints2Double(uint32_t lo, u
-     u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
-     return u.dval;
- }
-+
-+static void Double2Ints(double input, intptr_t& lo, intptr_t& hi)
-+{
-+    union {
-+        double dval;
-+        int64_t ival64;
-+    } u;
-+    u.dval = input;
-+    hi = static_cast<intptr_t>(u.ival64 >> 32);
-+    lo = static_cast<intptr_t>(u.ival64);
-+}
- #endif // USE(JSVALUE32_64)
- 
- } // namespace LLint

webkit-1.11.2-yarr.patch

@@ -1,12 +0,0 @@
-diff -up webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig webkitgtk-1.11.2/Source/WTF/wtf/Platform.h
---- webkitgtk-1.11.2/Source/WTF/wtf/Platform.h.orig	2012-12-16 21:27:29.000000000 +0100
-+++ webkitgtk-1.11.2/Source/WTF/wtf/Platform.h	2012-12-16 23:16:19.000000000 +0100
-@@ -1001,7 +1001,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)) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
-+#if !defined(ENABLE_YARR_JIT) && ENABLE(JIT) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT))
- #define ENABLE_YARR_JIT 1
- 
- /* Setting this flag compares JIT results with interpreter results. */

webkit-1.11.90-double2intsPPC32.patch

@@ -1,40 +0,0 @@
-diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
---- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.double2intsPPC32	2013-03-07 17:55:22.488831605 +0100
-+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2013-03-07 17:56:04.998829804 +0100
-@@ -1729,7 +1729,7 @@ _llint_op_next_pname:
-     loadi 20[PC], t2
-     loadi PayloadOffset[cfr, t2, 8], t2
-     loadp JSPropertyNameIterator::m_jsStrings[t2], t3
--    loadi [t3, t0, 8], t3
-+    loadi PayloadOffset[t3, t0, 8], t3
-     addi 1, t0
-     storei t0, PayloadOffset[cfr, t1, 8]
-     loadi 4[PC], t1
-diff -up webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32 webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
---- webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.double2intsPPC32	2013-03-07 17:56:24.953828958 +0100
-+++ webkitgtk-1.11.90/Source/JavaScriptCore/llint/LowLevelInterpreter.asm	2013-03-07 17:58:05.653824691 +0100
-@@ -263,13 +263,13 @@ macro assertNotConstant(index)
- end
- 
- macro functionForCallCodeBlockGetter(targetRegister)
--    loadp Callee[cfr], targetRegister
-+    loadp Callee + PayloadOffset[cfr], targetRegister
-     loadp JSFunction::m_executable[targetRegister], targetRegister
-     loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
- end
- 
- macro functionForConstructCodeBlockGetter(targetRegister)
--    loadp Callee[cfr], targetRegister
-+    loadp Callee + PayloadOffset[cfr], targetRegister
-     loadp JSFunction::m_executable[targetRegister], targetRegister
-     loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
- end
-@@ -824,7 +824,7 @@ macro interpretResolveWithBase(opcodeLen
-     getResolveOperation(4, t0)
-     btpz t0, .slowPath
- 
--    loadp ScopeChain[cfr], t3
-+    loadp ScopeChain + PayloadOffset[cfr], t3
-     # Get the base
-     loadis ResolveOperation::m_operation[t0], t2
- 

webkit-2.1.90-double2intsPPC32.patch

@@ -0,0 +1,31 @@
+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
+@@ -1679,7 +1679,7 @@ _llint_op_next_pname:
+     loadi 20[PC], t2
+     loadi PayloadOffset[cfr, t2, 8], t2
+     loadp JSPropertyNameIterator::m_jsStrings[t2], t3
+-    loadi [t3, t0, 8], t3
++    loadi PayloadOffset[t3, t0, 8], t3
+     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
+@@ -276,13 +276,13 @@ macro assertNotConstant(index)
+ end
+ 
+ macro functionForCallCodeBlockGetter(targetRegister)
+-    loadp Callee[cfr], targetRegister
++    loadp Callee + PayloadOffset[cfr], targetRegister
+     loadp JSFunction::m_executable[targetRegister], targetRegister
+     loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
+ end
+ 
+ macro functionForConstructCodeBlockGetter(targetRegister)
+-    loadp Callee[cfr], targetRegister
++    loadp Callee + PayloadOffset[cfr], targetRegister
+     loadp JSFunction::m_executable[targetRegister], targetRegister
+     loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
+ end

webkitgtk-2.0.4-libatomic.patch

@@ -1,63 +0,0 @@
-diff -up webkitgtk-2.0.4/GNUmakefile.in.ppc webkitgtk-2.0.4/GNUmakefile.in
---- webkitgtk-2.0.4/GNUmakefile.in.ppc	2013-08-04 21:12:16.184460261 +0200
-+++ webkitgtk-2.0.4/GNUmakefile.in	2013-08-04 21:13:31.235462408 +0200
-@@ -20865,6 +20865,7 @@ libWTF_la_CXXFLAGS = \
- 	$(libWTF_la_CFLAGS)
- 
- libWTF_la_CFLAGS = \
-+	-latomic \
- 	-fstrict-aliasing \
- 	-O3 \
- 	$(global_cflags) \
-@@ -22243,6 +22244,7 @@ Programs_WebKitPluginProcess_SOURCES = \
- 	$(webkit2_plugin_process_sources)
- 
- Programs_WebKitPluginProcess_LDADD = \
-+	-latomic \
- 	-lpthread \
- 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
- 	WebCoreLayerGtk2.a \
-diff -up webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am.ppc webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am
---- webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am.ppc	2013-08-04 21:13:45.056462804 +0200
-+++ webkitgtk-2.0.4/Source/WebKit2/GNUmakefile.am	2013-08-04 21:14:10.076463519 +0200
-@@ -604,6 +604,7 @@ Programs_WebKitPluginProcess_SOURCES = \
- 	$(webkit2_plugin_process_sources)
- 
- Programs_WebKitPluginProcess_LDADD = \
-+	-latomic \
- 	-lpthread \
- 	libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
- 	WebCoreLayerGtk2.a \
-diff -up webkitgtk-2.0.4/Source/WTF/GNUmakefile.am.ppc webkitgtk-2.0.4/Source/WTF/GNUmakefile.am
---- webkitgtk-2.0.4/Source/WTF/GNUmakefile.am.ppc	2013-08-04 21:14:22.140463865 +0200
-+++ webkitgtk-2.0.4/Source/WTF/GNUmakefile.am	2013-08-04 21:14:50.155464666 +0200
-@@ -25,6 +25,7 @@ libWTF_la_CXXFLAGS = \
- 	$(libWTF_la_CFLAGS)
- 
- libWTF_la_CFLAGS = \
-+	-latomic \
- 	-fstrict-aliasing \
- 	-O3 \
- 	$(global_cflags) \
-diff -up webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h.ppc webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h
---- webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h.ppc	2013-08-04 21:15:01.142464980 +0200
-+++ webkitgtk-2.0.4/Source/WTF/wtf/Atomics.h	2013-08-04 21:16:59.951468379 +0200
-@@ -107,6 +107,18 @@ inline int atomicDecrement(int volatile*
- inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; }
- inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; }
- 
-+#elif COMPILER(GCC) && (__GNUC__ > 4 || (__GNUC__ == 4 \
-+                    && (__GNUC_MINOR__ > 8 || (__GNUC_MINOR__ == 8 \
-+                    && (__GNUC_PATCHLEVEL__ > 0 || (__GNUC_PATCHLEVEL__ == 0)))))) \
-+                    && CPU(PPC)
-+#define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
-+inline int atomicIncrement(int volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); }
-+inline int atomicDecrement(int volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); }
-+
-+inline int64_t atomicIncrement(int64_t volatile* addend) { return __atomic_fetch_add(addend, 1, __ATOMIC_ACQ_REL); }
-+inline int64_t atomicDecrement(int64_t volatile* addend) { return __atomic_fetch_sub(addend, 1, __ATOMIC_ACQ_REL); }
-+
-+
- #elif COMPILER(GCC) && !CPU(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
- #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1
- 

webkitgtk-2.2.7-cloop_fix.patch

@@ -0,0 +1,114 @@
+diff -up webkitgtk-2.2.7/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.2.7/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
+--- webkitgtk-2.2.7/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix	2014-07-23 14:39:17.415362841 +0200
++++ webkitgtk-2.2.7/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp	2014-07-23 14:39:25.223470839 +0200
+@@ -1303,7 +1303,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());
+         }
+     }
+ 
+@@ -1330,7 +1330,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.2.7/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.2.7/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+--- webkitgtk-2.2.7/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix	2014-07-23 14:38:36.285793957 +0200
++++ webkitgtk-2.2.7/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2014-07-23 14:40:48.134614849 +0200
+@@ -1889,7 +1889,7 @@ macro resolveScope()
+     addi 1, t2
+ 
+ .resolveScopeAfterActivationCheck:
+-    loadp ScopeChain[cfr], t0
++    loadp ScopeChain + PayloadOffset[cfr], t0
+     btiz t2, .resolveScopeLoopEnd
+ 
+ .resolveScopeLoop:
+@@ -1948,13 +1948,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)
+@@ -1974,7 +1974,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)
+@@ -2033,7 +2033,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
+ 
+@@ -2049,7 +2049,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.2.7/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.2.7/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
+--- webkitgtk-2.2.7/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix	2014-07-23 14:38:20.610577145 +0200
++++ webkitgtk-2.2.7/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm	2014-07-23 14:39:25.224470853 +0200
+@@ -1750,7 +1750,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)
+@@ -1767,7 +1767,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)
+@@ -1824,7 +1824,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
+ 
+@@ -1839,7 +1839,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

webkitgtk-2.2.7-ppc64_align.patch

@@ -0,0 +1,45 @@
+diff -up webkitgtk-2.2.7/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align webkitgtk-2.2.7/Source/JavaScriptCore/heap/CopiedBlock.h
+--- webkitgtk-2.2.7/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align	2014-05-07 10:37:02.784916768 +0200
++++ webkitgtk-2.2.7/Source/JavaScriptCore/heap/CopiedBlock.h	2014-05-07 10:37:12.989046714 +0200
+@@ -77,7 +77,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.2.7/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align webkitgtk-2.2.7/Source/JavaScriptCore/interpreter/JSStack.cpp
+--- webkitgtk-2.2.7/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align	2014-05-07 10:41:27.450289748 +0200
++++ webkitgtk-2.2.7/Source/JavaScriptCore/interpreter/JSStack.cpp	2014-05-07 10:44:15.672468824 +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);
+     m_end = static_cast<Register*>(m_reservation.base());
+     m_commitEnd = static_cast<Register*>(m_reservation.base());
+ 
+@@ -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*>(newEnd) - reinterpret_cast<char*>(m_commitEnd), commitSize);
++    size_t commitsize = pageSize();
++    long delta = roundUpAllocationSize(reinterpret_cast<char*>(newEnd) - reinterpret_cast<char*>(m_commitEnd), 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

webkitgtk.spec

@@ -9,8 +9,8 @@
 	cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:		webkitgtk
-Version:	2.0.4
-Release:	3%{?dist}
+Version:	2.2.8
+Release:	1%{?dist}
 Summary:	GTK+ Web content engine library
 
 Group:		Development/Libraries
@@ -21,13 +21,10 @@ Source0:	http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
 # add support for nspluginwrapper.
 Patch0: 	webkit-1.3.10-nspluginwrapper.patch
-# workarounds for non-JIT arches
-# https://bugs.webkit.org/show_bug.cgi?id=104270
-Patch1:         webkit-1.11.2-yarr.patch
 # https://bugs.webkit.org/show_bug.cgi?id=103128
-Patch2:         webkit-1.11.2-Double2Ints.patch
-Patch3:         webkitgtk-2.0.4-libatomic.patch
-Patch4:         webkit-1.11.90-double2intsPPC32.patch
+Patch1:         webkit-2.1.90-double2intsPPC32.patch
+Patch2:         webkitgtk-2.2.7-cloop_fix.patch
+Patch3:         webkitgtk-2.2.7-ppc64_align.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -59,10 +56,6 @@ BuildRequires:	cairo-gobject-devel
 BuildRequires:	fontconfig-devel >= 2.5
 BuildRequires:	freetype-devel
 
-%ifarch ppc
-BuildRequires:  libatomic
-%endif
-
 %description
 WebKitGTK+ is the port of the portable web rendering engine WebKit to the
 GTK+ platform.
@@ -90,14 +83,12 @@ This package contains developer documentation for %{name}.
 %prep
 %setup -qn "webkitgtk-%{version}"
 %patch0 -p1 -b .nspluginwrapper
-%patch1 -p1 -b .yarr
-%patch2 -p1 -b .double2ints
-%ifarch ppc
-%patch3 -p1 -b .libatomic
-%endif
-# required for 32-bit big-endians
+%patch2 -p1 -b .cloop_fix
 %ifarch ppc s390
-%patch4 -p1 -b .double2intsPPC32
+%patch1 -p1 -b .double2intsPPC32
+%endif
+%ifarch ppc64 ppc
+%patch3 -p1 -b .ppc64_align
 %endif
 
 %build
@@ -105,9 +96,14 @@ This package contains developer documentation for %{name}.
 # Use linker flags to reduce memory consumption on low-mem architectures
 %global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
 %endif
-%ifarch s390 s390x
+
+%ifarch s390 %{arm}
 # Decrease debuginfo verbosity to reduce memory consumption even more
-%global optflags %(echo %{optflags} | sed 's/-g/-g1/')
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%endif
+
+%ifarch s390 s390x ppc ppc64 aarch64
+%global optflags %{optflags} -DENABLE_YARR_JIT=0
 %endif
 
 %ifarch ppc
@@ -119,7 +115,7 @@ This package contains developer documentation for %{name}.
 # https://bugs.webkit.org/show_bug.cgi?id=91154
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 
-CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure                                                   \
+%configure                                                      \
                         --with-gtk=2.0                          \
                         --disable-webkit2                       \
 %ifarch s390 s390x ppc ppc64
@@ -132,9 +128,11 @@ CFLAGS="%{optflags} -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANA
 mkdir -p DerivedSources/webkit
 mkdir -p DerivedSources/WebCore
 mkdir -p DerivedSources/ANGLE
+mkdir -p DerivedSources/WebKit2
 mkdir -p DerivedSources/webkitdom/
-mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2
 mkdir -p DerivedSources/InjectedBundle
+mkdir -p DerivedSources/Platform
+mkdir -p DerivedSources/WebKit2/webkit2gtk/webkit2
 
 make %{_smp_mflags} V=1
 
@@ -185,7 +183,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/libwebkitgtk-1.0.so.*
 %{_libdir}/libjavascriptcoregtk-1.0.so.*
 %{_libdir}/girepository-1.0/WebKit-1.0.typelib
-%{_libdir}/girepository-1.0/JSCore-1.0.typelib
+%{_libdir}/girepository-1.0/JavaScriptCore-1.0.typelib
 %{_libexecdir}/%{name}/
 %{_datadir}/webkitgtk-1.0
 
@@ -197,7 +195,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/pkgconfig/webkit-1.0.pc
 %{_libdir}/pkgconfig/javascriptcoregtk-1.0.pc
 %{_datadir}/gir-1.0/WebKit-1.0.gir
-%{_datadir}/gir-1.0/JSCore-1.0.gir
+%{_datadir}/gir-1.0/JavaScriptCore-1.0.gir
 
 %files doc
 %dir %{_datadir}/gtk-doc
@@ -206,6 +204,40 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
 
 %changelog
+* Wed Oct 01 2014 Tomas Popela <tpopela@redhat.com> - 2.2.8-1
+- Update to 2.2.8
+
+* Wed Jul 23 2014 Tomas Popela <tpopela@redhat.com> - 2.2.7-3
+- Fix CLoop on s390 and ppc
+
+* Mon May 26 2014 Tomas Popela <tpopela@redhat.com> - 2.2.7-2
+- Fix CLoop on s390x and ppc64
+- Disable yarr jit through flag and don't use patch for it
+
+* Mon May 5 2014 Tomas Popela <tpopela@redhat.com> 2.2.7-1
+- Update to 2.2.7
+
+* Wed Mar 19 2014 Tomas Popela <tpopela@redhat.com> 2.2.6-1
+- Update to 2.2.6
+
+* Wed Feb 19 2014 Tomas Popela <tpopela@redhat.com> 2.2.5-1
+- Update to 2.2.5
+
+* Tue Feb 18 2014 Tomas Popela <tpopela@redhat.com> 2.2.4-2
+- Enable full debuginfo on s390x
+
+* Tue Jan 21 2014 Tomas Popela <tpopela@redhat.com> 2.2.4-1
+- Update to 2.2.4
+
+* Wed Dec 04 2013 Tomas Popela <tpopela@redhat.com> 2.2.3-1
+- Update to 2.2.3
+
+* Mon Nov 11 2013 Tomas Popela <tpopela@redhat.com> 2.2.2-1
+- Update to 2.2.2
+
+* Mon Oct 21 2013 Tomas Popela <tpopela@redhat.com> 2.2.1-1
+- Update to 2.2.1
+
 * Sun Aug 04 2013 Karsten Hopp <karsten@redhat.com> 2.0.4-3
 - update ppc libatomic patch