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#1d4a0af2f091b6853e1bf83fad2be784ee9c0ac8

gir-multilib.patch

@@ -0,0 +1,22 @@
+--- 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

webkit2gtk3.spec

@@ -17,7 +17,7 @@
 
 Name:           webkit2gtk3
 Version:        2.31.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
@@ -27,6 +27,9 @@ 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
@@ -212,6 +215,7 @@ rm -rf Source/ThirdParty/qunit/
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_MINIBROWSER=ON \
+  -DUSE_LD_GOLD=OFF \
 %if %{with docs}
   -DENABLE_GTKDOC=ON \
 %endif
@@ -306,6 +310,9 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Thu Jan 14 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-3
+- Fix multilib conflict in gir files
+
 * Wed Jan 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-2
 - Disable gamepad support in RHEL