Accepting request 866258 from home:iznogood:branches:GNOME:Factory

- Add gir-multilib.patch: Fix multilib conflict in gir files.
- Disable gold linker for ppc64le

OBS-URL: https://build.opensuse.org/request/show/866258
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=288

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.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 20 10:47:33 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add gir-multilib.patch: Fix multilib conflict in gir files.
+- Disable gold linker for ppc64le
+
 -------------------------------------------------------------------
 Tue Jan 19 19:12:53 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
 

webkit2gtk3.spec

@@ -27,7 +27,7 @@
 %define _name webkitgtk
 # gold linker not available on old s390/s390x
 %define _gold_linker 1
-%ifarch ppc s390
+%ifarch ppc ppc64le s390
 %define _gold_linker 0
 %endif
 Name:           webkit2gtk3
@@ -41,15 +41,20 @@ Source0:        %{url}/releases/%{_name}-%{version}.tar.xz
 Source1:        %{url}/releases/%{_name}-%{version}.tar.xz.asc
 Source98:       baselibs.conf
 Source99:       webkit2gtk3.keyring
+
 # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 firefox.
 Patch0:         no-forced-sse.patch
 # PATCH-FIX-UPSTREAM webkit-font-scaling.patch https://bugs.webkit.org/show_bug.cgi?id=218450 badshah400@gmail.com -- Fix system font scaling not applied to 'font-size: XXXpt'
 Patch1:         webkit-font-scaling.patch
+# PATCH-FIX-UPSTREAM gir-multilib.patch -- Fix multilib conflict in gir files
+Patch2:         gir-multilib.patch
+
 # Below patches are for 15.0/15.1 only
 # PATCH-FIX-OPENSUSE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary.
 Patch100:       webkit-process.patch
 # PATCH-FIX-OPENSUSE old-wayland-scanner.patch mgorse@suse.com -- pass code to wayland-scanner, rather than private-code
 Patch101:       old-wayland-scanner.patch
+
 BuildRequires:  Mesa-libEGL-devel
 BuildRequires:  Mesa-libGL-devel
 BuildRequires:  Mesa-libGLESv1_CM-devel
@@ -278,6 +283,7 @@ A small test browswer from webkit, useful for testing features.
 %setup -q -n webkitgtk-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
 %patch100 -p1
 %patch101 -p1