From b05e95959eb9ba214dcdd8069061b9087a79f79b Mon Sep 17 00:00:00 2001
From: Tomas Popela <tpopela@redhat.com>
Date: Jul 08 2016 11:24:34 +0000
Subject: Remove the wrong patch for THUMB2 support


---

diff --git a/webkitgtk-2.13.2-armv7_thumb2.patch b/webkitgtk-2.13.2-armv7_thumb2.patch
deleted file mode 100644
index afc2cee..0000000
--- a/webkitgtk-2.13.2-armv7_thumb2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up webkitgtk-2.13.2/Source/WTF/wtf/Platform.h.armv7_thumb2 webkitgtk-2.13.2/Source/WTF/wtf/Platform.h
---- webkitgtk-2.13.2/Source/WTF/wtf/Platform.h.armv7_thumb2	2016-06-28 15:48:35.879215828 +0200
-+++ webkitgtk-2.13.2/Source/WTF/wtf/Platform.h	2016-06-28 15:49:14.291077281 +0200
-@@ -302,6 +302,7 @@
- /* Only one of these will be defined. */
- #if !defined(WTF_CPU_ARM_TRADITIONAL) && !defined(WTF_CPU_ARM_THUMB2)
- #  if defined(thumb2) || defined(__thumb2__) \
-+    || (defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH_ISA_THUMB == 2) \
-     || ((defined(__thumb) || defined(__thumb__)) && WTF_THUMB_ARCH_VERSION == 4)
- #    define WTF_CPU_ARM_TRADITIONAL 0
- #    define WTF_CPU_ARM_THUMB2 1
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index eadc24e..03c01f5 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -7,7 +7,7 @@
 
 Name:           webkitgtk4
 Version:        2.13.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GTK+ Web content engine library
 
 License:        LGPLv2
@@ -19,10 +19,8 @@ Patch0:         webkitgtk-2.7.90-user-agent-branding.patch
 # https://fedoraproject.org/wiki/Packaging:CryptoPolicies
 # https://bugs.webkit.org/show_bug.cgi?id=158785
 Patch1:		fedora-crypto-policy.patch
-# https://bugs.webkit.org/show_bug.cgi?id=159083
-Patch2:		webkitgtk-2.13.2-armv7_thumb2.patch
 # https://bugs.webkit.org/show_bug.cgi?id=158697
-Patch3:         webkitgtk-2.13.2-disable-npapi-in-wayland.patch
+Patch2:         webkitgtk-2.13.2-disable-npapi-in-wayland.patch
 
 BuildRequires:  at-spi2-core-devel
 BuildRequires:  bison
@@ -174,6 +172,7 @@ pushd %{_target_platform}
 %ifarch s390 aarch64
   -DUSE_LD_GOLD=OFF \
 %endif
+# Disable JIT on ARM until https://bugs.webkit.org/show_bug.cgi?id=159408 is fixed
 %ifarch s390 s390x ppc %{power64} aarch64 %{mips} %{arm}
   -DENABLE_JIT=OFF \
 %endif
@@ -256,12 +255,15 @@ make %{?_smp_mflags} -C %{_target_platform}
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Fri Jul 08 2016 Tomas Popela <tpopela@redhat.com> - 2.13.2-4
+- Remove the wrong patch for THUMB2 support
+
 * Tue Jun 28 2016 Michael Catanzaro <mcatanzaro@igalia.com> - 2.13.2-3
 - Disable NPAPI in Wayland
 - Specify more bundled provides
 - Again disable JIT on ARMv7 until rhbz#1350982 is fixed
 
-* Thu Jun 23 2016 Tomas Popela <tpopela@redhat.com> - 2.13.2-2
+* Tue Jun 28 2016 Tomas Popela <tpopela@redhat.com> - 2.13.2-2
 - Enable JIT and BMalloc on ARMv7
 
 * Thu Jun 23 2016 Tomas Popela <tpopela@redhat.com> - 2.13.2-1