From 12d8c8215af7335ab53724599a56ca5e95ecb255 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Jun 24 2019 21:24:32 +0000
Subject: Update to 2.25.2


---

diff --git a/.gitignore b/.gitignore
index fe3e0ff..16da32a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /webkitgtk-2.24.1.tar.xz
 /webkitgtk-2.24.2.tar.xz
 /webkitgtk-2.25.1.tar.xz
+/webkitgtk-2.25.2.tar.xz
diff --git a/sources b/sources
index 6f0965e..a399bf7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (webkitgtk-2.25.1.tar.xz) = 372e5b1a818ce2585e7e9887db1034dd95adfd2151615ca3accb98d34354adb35cf582b6861a213a1fa2e06f123410e8dbd0646fda7324747aaeebf0ac1dd78c
+SHA512 (webkitgtk-2.25.2.tar.xz) = ab64884b7ac280ad746d7d22a57c4f655e765be4b0d118dd7291780f2823e33e0ce8dbb02dfc42880d5ef6410b8acbb2978b47d9c43c86e9f539b3ee6dcdacc8
diff --git a/webkit-encodedmatchresult.patch b/webkit-encodedmatchresult.patch
new file mode 100644
index 0000000..adc3a6b
--- /dev/null
+++ b/webkit-encodedmatchresult.patch
@@ -0,0 +1,33 @@
+--- a/Source/JavaScriptCore/runtime/MatchResult.h	
++++ a/Source/JavaScriptCore/runtime/MatchResult.h	
+@@ -31,10 +31,10 @@ 
+ namespace JSC {
+ 
+ struct MatchResult;
+-#if CPU(ARM64) || CPU(X86_64)
+-using EncodedMatchResult = MatchResult;
+-#else
++#if CPU(ADDRESS32)
+ using EncodedMatchResult = uint64_t;
++#else
++using EncodedMatchResult = MatchResult;
+ #endif
+ 
+ struct MatchResult {
+@@ -50,7 +50,7 @@ struct MatchResult {
+     {
+     }
+ 
+-#if !(CPU(ARM64) || CPU(X86_64))
++#if CPU(ADDRESS32)
+     ALWAYS_INLINE MatchResult(EncodedMatchResult match)
+         : start(bitwise_cast<MatchResult>(match).start)
+         , end(bitwise_cast<MatchResult>(match).end)
+@@ -79,6 +79,7 @@ struct MatchResult {
+     size_t end;
+ };
+ 
++static_assert(sizeof(EncodedMatchResult) == 2 * sizeof(size_t), "https://bugs.webkit.org/show_bug.cgi?id=198518#c11");
+ static_assert(sizeof(MatchResult) == sizeof(EncodedMatchResult), "Match result and EncodedMatchResult should be the same size");
+ 
+ } // namespace JSC
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 3018878..17ce7ff 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.25.1
+Version:        2.25.2
 Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
@@ -21,8 +21,8 @@ Patch0:     user-agent-branding.patch
 Patch1:     fedora-crypto-policy.patch
 # Don't use the shebang, but point straight to python 3
 Patch2:     no-env-shebang.patch
-# temporary in 2.25.1
-Patch3:     0001-REGRESSION-r245567-GTK-WPE-2.25.1-WebKitWebDriver-ge.patch
+# https://bugs.webkit.org/show_bug.cgi?id=198518
+Patch3:     webkit-encodedmatchresult.patch
 
 BuildRequires:  bison
 BuildRequires:  bubblewrap
@@ -281,6 +281,9 @@ export NINJA_STATUS="[%f/%t][%e] "
 %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
 
 %changelog
+* Mon Jun 24 2019 Eike Rathke <erack@redhat.com> - 2.25.2-1
+- Update to 2.25.2
+
 * Thu Jun 06 2019 Eike Rathke <erack@redhat.com> - 2.25.1-1
 - Update to 2.25.1