From a8e93f2575900c36dc54e1a2e1befb24dd796d14 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 16 Mar 2021 17:36:57 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/webkit2gtk3.git#20e8fac12a2c37fc0d92455451e5dce92fe3d32f
---
 .gitignore         |  4 ++++
 gir-multilib.patch | 22 ----------------------
 sources            |  4 ++--
 webkit2gtk3.spec   | 13 ++++++++-----
 4 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 gir-multilib.patch

diff --git a/.gitignore b/.gitignore
index cd03efb..3def14a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,7 @@
 /webkitgtk-2.30.4.tar.xz.asc
 /webkitgtk-2.31.1.tar.xz
 /webkitgtk-2.31.1.tar.xz.asc
+/webkitgtk-2.31.90.tar.xz.asc
+/webkitgtk-2.31.90.tar.xz
+/webkitgtk-2.31.91.tar.xz
+/webkitgtk-2.31.91.tar.xz.asc
diff --git a/gir-multilib.patch b/gir-multilib.patch
deleted file mode 100644
index f543683..0000000
--- a/gir-multilib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Source/JavaScriptCore/PlatformGTK.cmake	
-+++ a/Source/JavaScriptCore/PlatformGTK.cmake	
-@@ -79,6 +79,8 @@ if (ENABLE_INTROSPECTION)
-             --pkg-export=javascriptcoregtk-${WEBKITGTK_API_VERSION}
-             --output=${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
-             --c-include="jsc/jsc.h"
-+            --sources-top-dirs=${CMAKE_BINARY_DIR}
-+            --sources-top-dirs=${CMAKE_SOURCE_DIR}
-             -DJSC_COMPILATION
-             -I${CMAKE_SOURCE_DIR}/Source
-             -I${JAVASCRIPTCORE_DIR}
---- a/Source/WebKit/PlatformGTK.cmake	
-+++ a/Source/WebKit/PlatformGTK.cmake	
-@@ -678,6 +678,8 @@ if (ENABLE_INTROSPECTION)
-             --pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
-             --output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
-             --c-include="webkit2/webkit2.h"
-+            --sources-top-dirs=${CMAKE_BINARY_DIR}
-+            --sources-top-dirs=${CMAKE_SOURCE_DIR}
-             -DBUILDING_WEBKIT
-             -DWEBKIT2_COMPILATION
-             -I${CMAKE_SOURCE_DIR}/Source
diff --git a/sources b/sources
index a112d67..3871942 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.31.1.tar.xz) = 23a3d28f7cd95281b2b1dbd75b5522f9fea735e883d8d080d572e9124e6711ee7704635fd4de337a1d8a51a0a61cc47f016a082bf15360e36655de3f97b127ea
-SHA512 (webkitgtk-2.31.1.tar.xz.asc) = 3f816714f08de59da9a9935771aaa2f9b892766397a60fe987e2382a11d32a4d5e6bda2d923bad347505b7998eaafe9fca76689e1556f524a60369337f8d4c98
+SHA512 (webkitgtk-2.31.91.tar.xz) = 972761a0db13a7ffde547b65941cdc2d6fd76032d2ca7f28724b5fee15714fc486c7b3d977834d0fad51de13ad695290cae47b2642f4f57543e14fd2765d68ff
+SHA512 (webkitgtk-2.31.91.tar.xz.asc) = 746ca11f3088a1f235a12dc56d20cc9630c332026fb276f1fd4e16919f9f1082d2c03795281a56c7abc4c79234790bb0ebe3bac27e52026819358ce36b3c3f66
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 3b0f411..e5de175 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -16,8 +16,8 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.31.1
-Release:        4%{?dist}
+Version:        2.31.91
+Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
@@ -27,9 +27,6 @@ Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3
 Source2:        https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg
 
-# https://bugs.webkit.org/show_bug.cgi?id=220636
-Patch0:         gir-multilib.patch
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -309,6 +306,12 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Fri Mar 12 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.91-1
+- Update to 2.31.91
+
+* Tue Mar 02 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.90-1
+- Update to 2.31.90
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild