From 2bd1cc4cd0990d90123b38e0d456296539da5d30 Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Sep 23 2018 16:02:58 +0000
Subject: Update to 2.22.2


---

diff --git a/.gitignore b/.gitignore
index 035e196..fc0254a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /webkitgtk-2.21.92.tar.xz
 /webkitgtk-2.22.0.tar.xz
 /webkitgtk-2.22.1.tar.xz
+/webkitgtk-2.22.2.tar.xz
diff --git a/armv7-build-fix.patch b/armv7-build-fix.patch
deleted file mode 100644
index 3275e8c..0000000
--- a/armv7-build-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
-index 266a818f570..fa4df51734a 100644
---- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
-+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.h
-@@ -981,6 +981,13 @@ public:
-         return PatchableJump(m_assembler.jmp(ARMAssembler::AL, 1));
-     }
- 
-+    PatchableJump patchableBranch8(RelationalCondition cond, Address address, TrustedImm32 imm)
-+    {
-+        TrustedImm32 imm8 = MacroAssemblerHelpers::mask8OnCondition(*this, cond, imm);
-+        MacroAssemblerHelpers::load8OnCondition(*this, cond, address, dataTempRegister);
-+        return patchableBranch32(cond, dataTempRegister, imm8);
-+    }
-+
-     PatchableJump patchableBranch32(RelationalCondition cond, RegisterID reg, TrustedImm32 imm)
-     {
-         internalCompare32(reg, imm);
diff --git a/sources b/sources
index b18086e..347f0de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (webkitgtk-2.22.1.tar.xz) = 67feeebbac5122ff81fb470b41cc9362c11732e0e76b997853d7d47f6ee49ccc76a858bfe7dcf8a41c910bdd5dec744e73e07137729487f5937fc8b75c0e2e46
+SHA512 (webkitgtk-2.22.2.tar.xz) = 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index dea214d..b08384d 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -6,7 +6,7 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkit2gtk3
-Version:        2.22.1
+Version:        2.22.2
 Release:        1%{?dist}
 Summary:        GTK+ Web content engine library
 
@@ -23,8 +23,6 @@ Patch1:     fedora-crypto-policy.patch
 Patch2:     cloop-big-endians.patch
 # Explicitly specify python2 over python
 Patch3:     python2.patch
-# https://webkit.org/b/189831
-Patch4:     armv7-build-fix.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -276,6 +274,9 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Sun Sep 23 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-1
+- Update to 2.22.2
+
 * Thu Sep 20 2018 Tomas Popela <tpopela@redhat.com> - 2.22.1-1
 - Update to 2.22.1