- updated to 2.30.5; restores WebKitPluginProcess

- added wpe patch (fixes build with wpe 1.8.x)

diff --git a/gtk-webkit4-wpe.patch b/gtk-webkit4-wpe.patch
new file mode 100644 (file)
index 0000000..c1445ff
--- /dev/null
+++ b/gtk-webkit4-wpe.patch
@@ -0,0 +1,23 @@
+Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp: add include for WPE_*_VERSION
+Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp: add include for wpe_view_backend_initialize()
+
+--- webkitgtk-2.30.5/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp.orig   2020-10-23 10:24:22.000000000 +0200
++++ webkitgtk-2.30.5/Source/WebKit/UIProcess/API/glib/WebKitProtocolHandler.cpp        2021-03-13 16:00:53.328034094 +0100
+@@ -43,6 +43,7 @@
+ 
+ #if PLATFORM(WAYLAND) && USE(WPE_RENDERER)
+ #include <wpe/fdo.h>
++#include <wpe/wpe.h>
+ #endif
+ #endif
+ 
+--- webkitgtk-2.30.5/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp.orig       2020-09-11 10:16:51.000000000 +0200
++++ webkitgtk-2.30.5/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp    2021-03-13 16:14:40.706885131 +0100
+@@ -50,6 +50,7 @@
+ #endif
+ 
+ #if USE(WPE_RENDERER)
++#include <wpe/wpe.h>
+ #include <wpe/fdo-egl.h>
+ #if WPE_FDO_CHECK_VERSION(1, 7, 0)
+ #include <wayland-server.h>

diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index 4bc259f3cdeda76bcbe75e2650dd4812b117f194..4174a63ba80dea9ff34aa3abe8d5e0e270ef26e0 100644 (file)
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -4,7 +4,7 @@
 # - GAMEPAD? (BR: libmanette-devel >= 0.2.4)
 #
 # Conditional build:
-%bcond_without introspection   # disable introspection
+%bcond_without introspection   # GObject introspection
 %bcond_with    cairogl         # accelerated 2D canvas using cairo-gl
 %bcond_without wayland         # Wayland target (requires GTK+ wayland target)
 #
@@ -17,15 +17,16 @@ Summary:    Port of WebKit embeddable web component to GTK+ 3
 Summary(pl.UTF-8):     Port osadzalnego komponentu WWW WebKit do GTK+ 3
 Name:          gtk-webkit4
 # NOTE: 2.30.x is stable, 2.31.x devel
-Version:       2.30.0
+Version:       2.30.5
 Release:       1
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: 71428fefd33f40583465649baf05ceb5
+# Source0-md5: c8291af0c5102fff1f73e67f0bff6c87
 Patch0:                x32.patch
 Patch1:                %{name}-icu59.patch
 Patch2:                %{name}-gir.patch
+Patch3:                %{name}-wpe.patch
 URL:           https://webkitgtk.org/
 BuildRequires: /usr/bin/ld.gold
 BuildRequires: EGL-devel
@@ -80,6 +81,7 @@ BuildRequires:        pkgconfig(cairo-gl) >= 1.10.2
 BuildRequires: pkgconfig(cairo-glx) >= 1.10.2
 %endif
 BuildRequires: python >= 1:2.7.0
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.699
 BuildRequires: ruby >= 1:1.9
 BuildRequires: ruby-modules >= 1:1.9
@@ -167,6 +169,7 @@ Dokumentacja API WebKita.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
@@ -230,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/webkit2gtk-4.0
 %endif
 %attr(755,root,root) %{_libexecdir}/webkit2gtk-4.0/WebKitNetworkProcess
-#%attr(755,root,root) %{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess
+%attr(755,root,root) %{_libexecdir}/webkit2gtk-4.0/WebKitPluginProcess
 %attr(755,root,root) %{_libexecdir}/webkit2gtk-4.0/WebKitWebProcess
 %attr(755,root,root) %{_libexecdir}/webkit2gtk-4.0/jsc
 %dir %{_libdir}/webkit2gtk-4.0