pool/webkit2gtk3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 853454 from GNOME:Next

Browse Source 
- Add old-wayland-scanner.patch for 15.0/15.1: support older
  wayland-scanner. Also renumber patches to group
  15.0/15.1-specific patches together.
- Have the libwebkit2gtk package require libjavascriptcoregtk of
  the same version (boo#1171531).

OBS-URL: https://build.opensuse.org/request/show/853454
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=282
This commit is contained in:
Bjørn Lie 2020-12-08 08:59:42 +00:00 committed by Git OBS Bridge
parent 7e5a3fae45
commit 36f7137089
3 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
old-wayland-scanner.patch Normal file
View File

@ -0,0 +1,29 @@
diff -urp webkitgtk-2.30.3.orig/Source/WebKit/PlatformGTK.cmake webkitgtk-2.30.3/Source/WebKit/PlatformGTK.cmake
--- webkitgtk-2.30.3.orig/Source/WebKit/PlatformGTK.cmake 2020-09-11 03:11:29.000000000 -0500
+++ webkitgtk-2.30.3/Source/WebKit/PlatformGTK.cmake 2020-12-02 14:05:01.252761221 -0600
@@ -572,14 +572,14 @@ if (ENABLE_WAYLAND_TARGET)
DEPENDS ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml
COMMAND ${WAYLAND_SCANNER} server-header ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandServerProtocol.h
COMMAND ${WAYLAND_SCANNER} client-header ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.h
- COMMAND ${WAYLAND_SCANNER} private-code ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
+ COMMAND ${WAYLAND_SCANNER} code ${WEBKIT_DIR}/Shared/gtk/WebKitWaylandProtocol.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/WebKitWaylandClientProtocol.c
VERBATIM
)
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
DEPENDS ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml
- COMMAND ${WAYLAND_SCANNER} private-code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
+ COMMAND ${WAYLAND_SCANNER} code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-protocol.c
COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/pointer-constraints-unstable-v1-client-protocol.h
VERBATIM
)
@@ -587,7 +587,7 @@ if (ENABLE_WAYLAND_TARGET)
add_custom_command(
OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
DEPENDS ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml
- COMMAND ${WAYLAND_SCANNER} private-code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
+ COMMAND ${WAYLAND_SCANNER} code ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-protocol.c
COMMAND ${WAYLAND_SCANNER} client-header ${WAYLAND_PROTOCOLS_DATADIR}/unstable/relative-pointer/relative-pointer-unstable-v1.xml ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/relative-pointer-unstable-v1-client-protocol.h
VERBATIM
)

9
webkit2gtk3.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Dec 3 22:23:20 UTC 2020 - Michael Gorse <mgorse@suse.com>
- Add old-wayland-scanner.patch for 15.0/15.1: support older
wayland-scanner. Also renumber patches to group
15.0/15.1-specific patches together.
- Have the libwebkit2gtk package require libjavascriptcoregtk of
the same version (boo#1171531).
-------------------------------------------------------------------
Wed Dec 2 13:36:15 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

19
webkit2gtk3.spec
View File

@ -41,12 +41,15 @@ Source0: %{url}/releases/%{_name}-%{version}.tar.xz
Source1: %{url}/releases/%{_name}-%{version}.tar.xz.asc
Source98: baselibs.conf
Source99: webkit2gtk3.keyring
# PATCH-FIX-OPENSUSE webkit-process.patch boo#1159329 mgorse@suse.com -- use single web process for evolution and geary.
Patch0: webkit-process.patch
# PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 firefox.
Patch1: no-forced-sse.patch
Patch0: no-forced-sse.patch
# PATCH-FIX-UPSTREAM 0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch dimstar@opensuse.org -- ICU 68.1 no longer exposes FALSE and TRUE macros by default
Patch2: http://git.yoctoproject.org/cgit/cgit.cgi/poky/plain/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.patch
Patch1: http://git.yoctoproject.org/cgit/cgit.cgi/poky/plain/meta/recipes-sato/webkit/webkitgtk/0001-ICU-68.1-no-longer-exposes-FALSE-and-TRUE-macros-by-.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
@ -139,6 +142,7 @@ Group: System/Libraries
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
Requires: bubblewrap
%endif
Requires: libjavascriptcoregtk%{_sover} = %{version}
Requires: webkit2gtk-4_0-injected-bundles
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
Requires: xdg-dbus-proxy
@ -272,11 +276,12 @@ A small test browswer from webkit, useful for testing features.
%prep
%setup -n webkitgtk-%{version}
%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
%patch0 -p1
%endif
%patch1 -p1
%patch2 -p1
%if 0%{?suse_version} <= 1500 && 0%{?sle_version} < 150200
%patch100 -p1
%patch101 -p1
%endif
%build
%define _lto_cflags %{nil}