commit 846fa469640814e23e3991c0ae9f4dd02b9bd51f
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Mon Mar 29 06:34:52 2021 +0200
- updated to 2.32.0
- removed obsolete wpe patch
- added npapi-remnants patch (remove some NPAPI support remnants, no longer
supported by common code)
gtk-webkit4-npapi-remnants.patch | 42 ++++++++++++++++++++++++++++++++++++++++
gtk-webkit4-wpe.patch | 23 ----------------------
gtk-webkit4.spec | 20 +++++++++----------
x32.patch | 24 +++++++++++------------
4 files changed, 63 insertions(+), 46 deletions(-)
---
diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index 717fb11..8819365 100644
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -2,6 +2,7 @@
# - FTL_JIT on !x86_64?
# - WEB_RTC+MEDIA_STREAM (BR: openwebrtc)
# - GAMEPAD? (BR: libmanette-devel >= 0.2.4)
+# - gtk4/libsoup3 variant as gtk-webkit5? (-DUSE_GTK4=ON/-DUSE_SOUP2=OFF)
#
# Conditional build:
%bcond_without introspection # GObject introspection
@@ -16,17 +17,17 @@
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.5
-Release: 2
+# NOTE: 2.32.x is stable, 2.33.x devel
+Version: 2.32.0
+Release: 1
License: BSD-like
Group: X11/Libraries
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: c8291af0c5102fff1f73e67f0bff6c87
+# Source0-md5: a24a9441ad01617be9ac95097cd31e08
Patch0: x32.patch
Patch1: %{name}-icu59.patch
Patch2: %{name}-gir.patch
-Patch3: %{name}-wpe.patch
+Patch3: %{name}-npapi-remnants.patch
URL: https://webkitgtk.org/
BuildRequires: /usr/bin/ld.gold
BuildRequires: EGL-devel
@@ -43,7 +44,7 @@ BuildRequires: fontconfig-devel >= 2.13.0
BuildRequires: freetype-devel >= 1:2.9.0
BuildRequires: gcc-c++ >= 6:7.3.0
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.44
+BuildRequires: glib2-devel >= 1:2.67.1
BuildRequires: glibc-misc
%{?with_introspection:BuildRequires: gobject-introspection-devel >= 1.32.0}
BuildRequires: gperf >= 3.0.1
@@ -86,6 +87,7 @@ BuildRequires: rpmbuild(macros) >= 1.699
BuildRequires: ruby >= 1:1.9
BuildRequires: ruby-modules >= 1:1.9
BuildRequires: sqlite3-devel >= 3
+BuildRequires: systemd-devel
BuildRequires: tar >= 1:1.22
%if %{with wayland}
BuildRequires: wayland-devel
@@ -108,7 +110,7 @@ Requires: atk >= 1:2.16.0
Requires: cairo >= 1.16.0
Requires: fontconfig-libs >= 2.13.0
Requires: freetype >= 1:2.9.0
-Requires: glib2 >= 1:2.44
+Requires: glib2 >= 1:2.67.1
Requires: gstreamer >= 1.2.3
Requires: gstreamer-plugins-base >= 1.2.3
Requires: gtk+3 >= 3.22.0
@@ -140,7 +142,7 @@ Summary: Development files for WebKit for GTK+ 3
Summary(pl.UTF-8): Pliki programistyczne komponentu WebKit dla GTK+ 3
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel >= 1:2.44
+Requires: glib2-devel >= 1:2.67.1
Requires: gtk+3-devel >= 3.22.0
Requires: libsoup-devel >= 2.54
Requires: libstdc++-devel >= 6:7.3.0
@@ -179,7 +181,6 @@ cd build
-DENABLE_GEOLOCATION=ON \
-DENABLE_GTKDOC=ON \
%{!?with_introspection:-DENABLE_INTROSPECTION=OFF} \
- -DENABLE_NETSCAPE_PLUGIN_API=ON \
-DENABLE_VIDEO=ON \
%{!?with_wayland:-DENABLE_WAYLAND_TARGET=OFF} \
-DENABLE_WEB_AUDIO=ON \
@@ -233,7 +234,6 @@ 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/WebKitWebProcess
%attr(755,root,root) %{_libexecdir}/webkit2gtk-4.0/jsc
%dir %{_libdir}/webkit2gtk-4.0
diff --git a/gtk-webkit4-npapi-remnants.patch b/gtk-webkit4-npapi-remnants.patch
new file mode 100644
index 0000000..469d9b8
--- /dev/null
+++ b/gtk-webkit4-npapi-remnants.patch
@@ -0,0 +1,42 @@
+--- webkitgtk-2.32.0/Source/WebKit/PluginProcess/PluginControllerProxy.h.orig
2021-02-26 10:57:15.000000000 +0100
++++ webkitgtk-2.32.0/Source/WebKit/PluginProcess/PluginControllerProxy.h
2021-03-28 11:40:29.813445533 +0200
+@@ -110,11 +110,6 @@ private:
+ bool getAuthenticationInfo(const WebCore::ProtectionSpace&, String&
username, String& password) override;
+ void protectPluginFromDestruction() override;
+ void unprotectPluginFromDestruction() override;
+-#if PLATFORM(X11)
+- uint64_t createPluginContainer() override;
+- void windowedPluginGeometryDidChange(const WebCore::IntRect& frameRect,
const WebCore::IntRect& clipRect, uint64_t windowID) override;
+- void windowedPluginVisibilityDidChange(bool isVisible, uint64_t windowID)
override;
+-#endif
+
+ // Message handlers.
+ void frameDidFinishLoading(uint64_t requestID);
+---
webkitgtk-2.32.0/Source/WebKit/PluginProcess/PluginControllerProxy.cpp.orig
2021-02-26 10:57:15.000000000 +0100
++++ webkitgtk-2.32.0/Source/WebKit/PluginProcess/PluginControllerProxy.cpp
2021-03-28 11:41:02.849933225 +0200
+@@ -651,25 +651,6 @@ void PluginControllerProxy::getFormValue
+ completionHandler(returnValue, WTFMove(formValue));
+ }
+
+-#if PLATFORM(X11)
+-uint64_t PluginControllerProxy::createPluginContainer()
+-{
+- uint64_t windowID = 0;
+-
m_connection->connection()->sendSync(Messages::PluginProxy::CreatePluginContainer(),
Messages::PluginProxy::CreatePluginContainer::Reply(windowID),
m_pluginInstanceID);
+- return windowID;
+-}
+-
+-void PluginControllerProxy::windowedPluginGeometryDidChange(const IntRect&
frameRect, const IntRect& clipRect, uint64_t windowID)
+-{
+-
m_connection->connection()->send(Messages::PluginProxy::WindowedPluginGeometryDidChange(frameRect,
clipRect, windowID), m_pluginInstanceID);
+-}
+-
+-void PluginControllerProxy::windowedPluginVisibilityDidChange(bool isVisible,
uint64_t windowID)
+-{
+-
m_connection->connection()->send(Messages::PluginProxy::WindowedPluginVisibilityDidChange(isVisible,
windowID), m_pluginInstanceID);
+-}
+-#endif
+-
+ } // namespace WebKit
+
+ #endif // ENABLE(NETSCAPE_PLUGIN_API)
diff --git a/gtk-webkit4-wpe.patch b/gtk-webkit4-wpe.patch
deleted file mode 100644
index c1445ff..0000000
--- a/gtk-webkit4-wpe.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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/x32.patch b/x32.patch
index d5a922f..62cffb6 100644
--- a/x32.patch
+++ b/x32.patch
@@ -20,16 +20,14 @@ Index: webkitgtk/Source/WTF/wtf/Platform.h
#define WTF_CPU_X86_64 1
#define WTF_CPU_X86_SSE2 1
#define WTF_CPU_KNOWN 1
-Index: webkitgtk/CMakeLists.txt
-===================================================================
---- webkitgtk.orig/CMakeLists.txt
-+++ webkitgtk/CMakeLists.txt
-@@ -93,6 +93,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
- set(WTF_CPU_MIPS64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
- set(WTF_CPU_MIPS 1)
-+elseif (CMAKE_CXX_COMPILER_ABI STREQUAL "ELF X32")
-+ set(WTF_CPU_UNKNOWN 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
- # FORCE_32BIT is set in the build script when --32-bit is passed
- # on a Linux/intel 64bit host. This allows us to produce 32bit
+--- webkitgtk-2.32.0/Source/cmake/WebKitCommon.cmake.orig 2021-02-26
10:57:17.000000000 +0100
++++ webkitgtk-2.32.0/Source/cmake/WebKitCommon.cmake 2021-03-28
07:30:53.574578782 +0200
+@@ -90,6 +90,8 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+ set(WTF_CPU_MIPS64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+ set(WTF_CPU_MIPS 1)
++ elseif (CMAKE_CXX_COMPILER_ABI STREQUAL "ELF X32")
++ set(WTF_CPU_UNKNOWN 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
+ # FORCE_32BIT is set in the build script when --32-bit is passed
+ # on a Linux/intel 64bit host. This allows us to produce 32bit
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit4.git/commitdiff/846fa469640814e23e3991c0ae9f4dd02b9bd51f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
