diff --git a/webkit2gtk3-fdo-soname.patch b/webkit2gtk3-fdo-soname.patch new file mode 100644 index 0000000..edff78f --- /dev/null +++ b/webkit2gtk3-fdo-soname.patch @@ -0,0 +1,13 @@ +diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp +index a380a25fa4b..d96d23bce2e 100644 +--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp ++++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp +@@ -114,7 +114,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process + #if PLATFORM(WAYLAND) + if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) { + #if USE(WPE_RENDERER) +- wpe_loader_init("libWPEBackend-fdo-1.0.so"); ++ wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); + if (wpe_fdo_initialize_for_egl_display(WebCore::PlatformDisplay::sharedDisplay().eglDisplay())) { + parameters.hostClientFileDescriptor = wpe_renderer_host_create_client(); + parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name()); diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index f196949..87055dd 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Thu Sep 26 10:03:59 UTC 2019 - Bjørn Lie + +- Enable sandbox again (pass -DENABLE_BUBBLEWRAP_SANDBOX=ON to + cmake). +- Move bubblewrap and xdg-dbus-proxy Requires from main package to + main library package libwebkit2gtk-4_0-37, they are needed at + runtime, and there is no webkit2gtk3 package that we can install. + +------------------------------------------------------------------- +Mon Sep 23 15:24:34 UTC 2019 - Bjørn Lie + +- Update to version 2.26.1: + + Fix MSE media player with GStreamer 1.14. + + Fix HTML alternate loads never finishing. + + Fix web view initialization delay on fisrt load. + + Validate user agent string set via API. + + Fix a crash when a web view is destroyed with accelerated + compositing mode enabled. + + Fix EGL initialization with newer versions of Mesa. + + Do not enable the sandbox inside docker. + + Fix several crashes and rendering issues. + +------------------------------------------------------------------- +Thu Sep 19 16:44:45 UTC 2019 - Michael Gorse + +- Add webkit2gtk3-fdo-soname.patch: don't try to open WPE backend + with an unversioned soname. + +------------------------------------------------------------------- +Tue Sep 17 14:42:14 UTC 2019 - Michael Gorse + +- Enable pkgconfig(wpe-1.0) and pkgconfig(wpebackend-fdo-1.0) + BuildRequires and stop passing DUSE_WPE_RENDERER=OFF to cmake. + +------------------------------------------------------------------- +Thu Sep 12 21:09:23 UTC 2019 - Bjørn Lie + +- Test disable sandbox, does this fix epiphany? + (pass -DENABLE_BUBBLEWRAP_SANDBOX=OFF to cmake). + ------------------------------------------------------------------- Mon Sep 9 09:59:58 UTC 2019 - Bjørn Lie diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 6ffb2e0..a2ad791 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -42,16 +42,18 @@ %bcond_with python3 %endif Name: webkit2gtk3 -Version: 2.26.0 +Version: 2.26.1 Release: 0 Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0-or-later AND BSD-3-Clause Group: Development/Libraries/C and C++ URL: https://webkitgtk.org/ -Source0: https://webkitgtk.org/releases/%{_name}-%{version}.tar.xz -Source1: https://webkitgtk.org/releases/%{_name}-%{version}.tar.xz.asc +Source0: %{url}/releases/%{_name}-%{version}.tar.xz +Source1: %{url}/releases/%{_name}-%{version}.tar.xz.asc Source98: baselibs.conf Source99: webkit2gtk3.keyring +# PATCH-FIX-OPENSUSE webkit2gtk3-fdo-soname.patch mgorse@suse.com -- don't call dlopen with an unversioned soname. +Patch0: webkit2gtk3-fdo-soname.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel @@ -105,8 +107,8 @@ BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.1.7 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(upower-glib) -#BuildRequires: pkgconfig(wpe-1.0) >= 1.3.0 -#BuildRequires: pkgconfig(wpebackend-fdo-1.0) >= 1.3.0 +BuildRequires: pkgconfig(wpe-1.0) >= 1.3.0 +BuildRequires: pkgconfig(wpebackend-fdo-1.0) >= 1.3.0 BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} == 1315 @@ -130,8 +132,6 @@ BuildRequires: python2-xml %if %{_gold_linker} BuildRequires: binutils-gold %endif -Requires: bubblewrap -Requires: xdg-dbus-proxy %description WebKit is a web content engine, derived from KHTML and KJS from KDE, @@ -146,7 +146,9 @@ more. Summary: Library for rendering web content, GTK+ Port # Require the injected bundles. The bundles are dlopen()ed Group: System/Libraries +Requires: bubblewrap Requires: webkit2gtk-4_0-injected-bundles +Requires: xdg-dbus-proxy Recommends: %{_pkgname_no_slpp}-lang Provides: %{_pkgname_no_slpp} = %{version} Obsoletes: webkit2gtk3-plugin-process-gtk2 @@ -331,7 +333,7 @@ export PYTHON=%{_bindir}/python3 -DENABLE_JIT=OFF \ %endif -DUSE_SYSTEM_MALLOC=ON \ - -DUSE_WPE_RENDERER=OFF \ + -DENABLE_BUBBLEWRAP_SANDBOX=ON \ %ninja_build -j $max_link_jobs diff --git a/webkitgtk-2.26.0.tar.xz b/webkitgtk-2.26.0.tar.xz deleted file mode 100644 index c13b19b..0000000 --- a/webkitgtk-2.26.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d210c0ecd1a89a22c9f8f1f450334f3489c5c50159b3a5e14dd93d5f349dcced -size 19321552 diff --git a/webkitgtk-2.26.0.tar.xz.asc b/webkitgtk-2.26.0.tar.xz.asc deleted file mode 100644 index 9935e7c..0000000 --- a/webkitgtk-2.26.0.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXXYZ9AAKCRDz0yLQ7EWC -wxJHAKCCUY+76lTRXZWhAXvjAiW6GXWAwgCdHmW755MTUFp6eL3+J5cWkJnevg0= -=yil+ ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.26.1.tar.xz b/webkitgtk-2.26.1.tar.xz new file mode 100644 index 0000000..5e1dfef --- /dev/null +++ b/webkitgtk-2.26.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b4b21801d2b1008422a1075dbd6fb4ae8b5127503faf657cf9671289d9cd155 +size 19327444 diff --git a/webkitgtk-2.26.1.tar.xz.asc b/webkitgtk-2.26.1.tar.xz.asc new file mode 100644 index 0000000..6313906 --- /dev/null +++ b/webkitgtk-2.26.1.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXYih3QAKCRDz0yLQ7EWC +wyCVAKDgSBmJh2Hymdcxy+wL1CB7sI9+zgCgm7/UjFgBi2mCIudtUVvr54iY0VM= +=/71E +-----END PGP SIGNATURE-----