rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV

Initialize string in SQLiteStatement before using it

sources

@@ -1 +1 @@
-c5861552d9ecd6d7854a4d462ff25924  webkitgtk-2.4.3.tar.xz
+312fd29eb7f5970660c6a64b8bf8420e  webkitgtk-2.4.9.tar.xz

webkitgtk-2.4.1-cloop_fix.patch

@@ -1,6 +1,6 @@
-diff -up webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h
---- webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix	2014-04-14 08:40:44.000000000 +0200
-+++ webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h	2014-04-30 16:10:49.120156216 +0200
+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;
@@ -19,9 +19,9 @@ diff -up webkitgtk-2.4.1/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloo
  
      void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; }
      
-diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
---- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix	2014-04-30 16:11:18.457540050 +0200
-+++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp	2014-04-30 16:11:50.944965101 +0200
+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);
@@ -40,9 +40,9 @@ diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fi
          }
      }
  
-diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
---- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix	2014-04-14 08:40:44.000000000 +0200
-+++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	2014-04-30 16:12:35.648549985 +0200
+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
@@ -52,7 +52,68 @@ diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.as
      subi 1, temp2
      loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3
      subi 1, temp3
-@@ -2277,7 +2277,7 @@ macro loadWithStructureCheck(operand, sl
+@@ -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()
@@ -88,9 +149,9 @@ diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.as
      storei t2, TagOffset[t0, t1, 8]
      storei t3, PayloadOffset[t0, t1, 8]
  end
-diff -up webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
---- webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix	2014-04-14 08:40:44.000000000 +0200
-+++ webkitgtk-2.4.1/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm	2014-04-30 16:10:49.121156229 +0200
+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

webkitgtk-2.4.2-ppc64le.patch

@@ -1,69 +0,0 @@
-diff -up webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h.ppc64le webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h
---- webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h.ppc64le	2014-05-14 15:37:26.360159487 +0200
-+++ webkitgtk-2.4.2/Source/WTF/wtf/dtoa/utils.h	2014-05-14 15:38:46.938315499 +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) || 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(ARM64) || CPU(HPPA)
- #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
- #elif defined(_M_IX86) || defined(__i386__)
- #if defined(_WIN32)
-diff -up webkitgtk-2.4.2/Source/WTF/wtf/Platform.h.ppc64le webkitgtk-2.4.2/Source/WTF/wtf/Platform.h
---- webkitgtk-2.4.2/Source/WTF/wtf/Platform.h.ppc64le	2014-05-12 08:03:53.000000000 +0200
-+++ webkitgtk-2.4.2/Source/WTF/wtf/Platform.h	2014-05-14 15:39:08.402622454 +0200
-@@ -101,24 +101,38 @@
- #endif /* MIPS */
- 
- /* CPU(PPC) - PowerPC 32-bit */
--#if   defined(__ppc__)     \
-+#if (  defined(__ppc__)     \
-     || defined(__PPC__)     \
-     || defined(__powerpc__) \
-     || defined(__powerpc)   \
-     || defined(__POWERPC__) \
-     || defined(_M_PPC)      \
--    || defined(__PPC)
-+    || defined(__PPC)) \
-+    && defined(__BYTE_ORDER__) \
-+    && (__BYTE_ORDER__==__ORDER_BIG_ENDIAN__)
- #define WTF_CPU_PPC 1
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
- 
--/* CPU(PPC64) - PowerPC 64-bit */
--#if   defined(__ppc64__) \
--    || defined(__PPC64__)
-+/* CPU(PPC64) - PowerPC 64-bit Big Endian */
-+#if (  defined(__ppc64__) \
-+    || defined(__PPC64__)) \
-+    && defined(__BYTE_ORDER__) \
-+    && (__BYTE_ORDER__==__ORDER_BIG_ENDIAN__)
- #define WTF_CPU_PPC64 1
- #define WTF_CPU_BIG_ENDIAN 1
- #endif
- 
-+/* CPU(PPC64) - PowerPC 64-bit Little Endian */
-+#if (   defined(__ppc64__) \
-+    || defined(__PPC64__) \
-+    || defined(__ppc64le__) \
-+    || defined(__PPC64LE__)) \
-+    && defined(__BYTE_ORDER__) \
-+    && (__BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__)
-+#define WTF_CPU_PPC64LE 1
-+#endif
-+
- /* CPU(SH4) - SuperH SH-4 */
- #if defined(__SH4__)
- #define WTF_CPU_SH4 1
-@@ -641,7 +655,8 @@
-     || CPU(ALPHA) \
-     || CPU(ARM64) \
-     || CPU(S390X) \
--    || CPU(PPC64)
-+    || CPU(PPC64) \
-+    || CPU(PPC64LE)
- #define WTF_USE_JSVALUE64 1
- #else
- #define WTF_USE_JSVALUE32_64 1

webkitgtk-2.4.3-angle_symbol_table.patch

@@ -1,13 +0,0 @@
---- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
-+++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
-@@ -171,7 +171,8 @@ TFunction::~TFunction()
- TSymbolTableLevel::~TSymbolTableLevel()
- {
-     for (tLevel::iterator it = level.begin(); it != level.end(); ++it)
--        delete (*it).second;
-+        if ((*it).first == (*it).second->getMangledName())
-+            delete (*it).second;
- }
-
- //
-

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
  

webkitgtk-2.4.9-sql_initialize_string.patch

@@ -0,0 +1,12 @@
+diff -up webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp
+--- webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string	2015-09-14 09:25:43.004200172 +0200
++++ webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp	2015-09-14 09:25:57.852082368 +0200
+@@ -71,7 +71,7 @@ int SQLiteStatement::prepare()
+     // this lets SQLite avoid an extra string copy.
+     size_t lengthIncludingNullCharacter = query.length() + 1;
+ 
+-    const char* tail;
++    const char* tail = nullptr;
+     int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail);
+ 
+     if (error != SQLITE_OK)

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.9/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h
+--- webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64	2015-05-20 11:03:24.000000000 +0200
++++ webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h	2015-05-20 13:45:35.629023925 +0200
+@@ -49,7 +49,7 @@
+ defined(__ARMEL__) || \
+ defined(_MIPS_ARCH_MIPS32R2)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
+-#elif CPU(MIPS) || CPU(MIPS64) || 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(MIPS64) || 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.9/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/Platform.h
+--- webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64	2015-05-20 11:03:24.000000000 +0200
++++ webkitgtk-2.4.9/Source/WTF/wtf/Platform.h	2015-05-20 13:47:34.439861401 +0200
+@@ -334,6 +334,14 @@
  #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
  #endif
  
@@ -15,24 +28,12 @@
  /* ==== 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 @@
+@@ -654,7 +662,7 @@
+ #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
+     || (CPU(IA64) && !CPU(IA64_32)) \
      || CPU(ALPHA) \
-     || CPU(ARM64) \
+-    || CPU(ARM64) \
++    || CPU(AARCH64) \
      || 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)
+     || CPU(MIPS64) \
+     || CPU(PPC64) \

webkitgtk.spec

@@ -9,8 +9,8 @@
 	cp -p %1  %{buildroot}%{_pkgdocdir}/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:		webkitgtk
-Version:	2.4.3
-Release:	4%{?dist}
+Version:	2.4.9
+Release:	2%{?dist}
 Summary:	GTK+ Web content engine library
 
 Group:		Development/Libraries
@@ -21,15 +21,12 @@ Source0:	http://www.webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
 # add support for nspluginwrapper.
 Patch0: 	webkit-1.3.10-nspluginwrapper.patch
-# https://bugs.webkit.org/show_bug.cgi?id=103128
-Patch4:         webkit-2.1.90-double2intsPPC32.patch
-Patch5:         webkitgtk-aarch64.patch
-Patch6:         webkitgtk-2.4.1-cloop_fix.patch
-Patch7:         webkitgtk-2.4.1-ppc64_align.patch
-Patch8:         webkitgtk-2.4.2-ppc64le.patch
-# https://bugs.webkit.org/show_bug.cgi?id=134593
-# Remove when 2.4.4 will be out
-Patch9:         webkitgtk-2.4.3-angle_symbol_table.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
+# http://trac.webkit.org/changeset/169665
+Patch5:         webkitgtk-2.4.9-sql_initialize_string.patch
 
 BuildRequires:	bison
 BuildRequires:	chrpath
@@ -93,22 +90,15 @@ This package contains developer documentation for %{name}.
 %prep
 %setup -qn "webkitgtk-%{version}"
 %patch0 -p1 -b .nspluginwrapper
-%patch9 -p1 -b .angle_symbol_table
+%patch1 -p1 -b .aarch64
+%patch2 -p1 -b .cloop_fix
+%patch5 -p1 -b .sql_initialize_string
 # required for 32-bit big-endians
 %ifarch ppc s390
-%patch4 -p1 -b .double2intsPPC32
+%patch3 -p1 -b .cloop_fix_32
 %endif
-%ifarch aarch64
-%patch5 -p1 -b .aarch64
-%endif
-%ifarch %{power64} s390x
-%patch6 -p1 -b .cloop_fix
-%endif
-%ifarch %{power64} aarch64
-%patch7 -p1 -b .ppc64_align
-%endif
-%ifarch %{power64}
-%patch8 -p1 -b .ppc64le
+%ifarch %{power64} aarch64 ppc
+%patch4 -p1 -b .ppc64_align
 %endif
 
 %build
@@ -218,6 +208,41 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/webkitgtk
 
 %changelog
+* Fri Sep 25 2015 Tomas Popela <tpopela@redhat.com> - 2.4.9-2
+- rhbz#1189303 - [abrt] midori: WebCore::SQLiteStatement::prepare(): midori killed by SIGSEGV
+  Initialize string in SQLiteStatement before using it
+
+* Thu May 21 2015 Tomas Popela <tpopela@redhat.com> - 2.4.9-1
+- Update to 2.4.9
+
+* Wed Jan 07 2015 Tomas Popela <tpopela@redhat.com> - 2.4.8-1
+- Update to 2.4.8
+
+* Wed Oct 22 2014 Tomas Popela <tpopela@redhat.com> - 2.4.7-1
+- Update to 2.4.7
+
+* Mon Sep 29 2014 Tomas Popela <tpopela@redhat.com> - 2.4.6-1
+- Update to 2.4.6
+
+* Tue Sep 02 2014 Tomas Popela <tpopela@redhat.com> - 2.4.5-2
+- Rebase the aarch64 patch
+
+* Tue Aug 26 2014 Tomas Popela <tpopela@redhat.com> - 2.4.5-1
+- Update to 2.4.5
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Jul 23 2014 Tomas Popela <tpopela@redhat.com> - 2.4.4-3
+- Remove geoclue-devel from BR
+
+* Wed Jul 23 2014 Tomas Popela <tpopela@redhat.com> - 2.4.4-2
+- Fix CLoop on ppc32 and s390
+- Add geoclue-devel as BR as WK1 needs it
+
+* Thu Jul 10 2014 Tomas Popela <tpopela@redhat.com> 2.4.4-1
+- Update to 2.4.4
+
 * Fri Jul 04 2014 Tomas Popela <tpopela@redhat.com> 2.4.3-4
 - rhbz#1088480 - [abrt] libwebkit2gtk: TSymbolTableLevel::~TSymbolTableLevel(): WebKitWebProcess killed by SIGSEGV