mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] wpewebkit: version bump 2.52.4 -> 2.54.2
@ 2026-11-12 14:11 Michael Tretter
  0 siblings, 0 replies; only message in thread
From: Michael Tretter @ 2026-11-12 14:11 UTC (permalink / raw)
  To: ptxdist; +Cc: Michael Tretter

0002-PlatformWPE-link-GLib-GioUnix-to-propagate-gio-unix-2.0-includes.patch:
Drop patch because of upstream commit 1616afe3c2c6 ("[WPE]
PlatformWPE.cmake: missing GLib::GioUnix dependency on WebKit target
breaks cross-compilation ")

0003-UIGamepadProvider-guard-stubs-with-ENABLE-WPE_PLATFORM.patch:
Drop patch as mentioned in the commit message of the patch.

Enable USE_GSTREAMER_GL if WPEWEBKIT_VIDEO is enabled, because the build
will fail otherwise.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
---
 ...x-to-propagate-gio-unix-2.0-includes.patch | 32 -----------
 ...guard-stubs-with-ENABLE-WPE_PLATFORM.patch | 55 -------------------
 patches/wpewebkit-2.52.4/series               |  2 -
 rules/wpewebkit.make                          | 14 +++--
 4 files changed, 9 insertions(+), 94 deletions(-)
 delete mode 100644 patches/wpewebkit-2.52.4/0002-PlatformWPE-link-GLib-GioUnix-to-propagate-gio-unix-2.0-includes.patch
 delete mode 100644 patches/wpewebkit-2.52.4/0003-UIGamepadProvider-guard-stubs-with-ENABLE-WPE_PLATFORM.patch
 delete mode 100644 patches/wpewebkit-2.52.4/series

diff --git a/patches/wpewebkit-2.52.4/0002-PlatformWPE-link-GLib-GioUnix-to-propagate-gio-unix-2.0-includes.patch b/patches/wpewebkit-2.52.4/0002-PlatformWPE-link-GLib-GioUnix-to-propagate-gio-unix-2.0-includes.patch
deleted file mode 100644
index 282088206069..000000000000
--- a/patches/wpewebkit-2.52.4/0002-PlatformWPE-link-GLib-GioUnix-to-propagate-gio-unix-2.0-includes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Artur Wiebe <artur@4wiebe.de>
-Subject: [PATCH] WebKit/WPE: fix cross-compilation by declaring GLib::GioUnix dependency
-
-Several GLib platform files compiled as part of the WebKit library include
-gio-unix-2.0 headers (gunixfdmessage.h, gunixconnection.h, gunixfdlist.h,
-gunixinputstream.h, gdesktopappinfo.h), but the WebKit cmake target never
-declares GLib::GioUnix as a dependency. The gio-unix-2.0 include directory
-is therefore never passed to the compiler for these files.
-
-In native builds this goes unnoticed: pkg-config calls made while detecting
-other targets leak the gio-unix-2.0 include path into global cmake state,
-making it accidentally available everywhere. In a cross build the sysroot is
-isolated and include paths are strictly scoped to declared dependencies, so
-the missing declaration causes a build failure.
-
-Fix by adding GLib::GioUnix to WebKit_LIBRARIES so cmake correctly propagates
-the include directory to all files compiled as part of the WebKit target.
-
----
- Source/WebKit/PlatformWPE.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/Source/WebKit/PlatformWPE.cmake	2026-06-24 00:00:00.000000000 +0000
-+++ b/Source/WebKit/PlatformWPE.cmake	2026-06-24 00:00:00.000000000 +0000
-@@ -467,6 +467,7 @@
- )
-
- list(APPEND WebKit_LIBRARIES
-+    GLib::GioUnix
-     GLib::Module
-     Soup3::Soup3
- )
diff --git a/patches/wpewebkit-2.52.4/0003-UIGamepadProvider-guard-stubs-with-ENABLE-WPE_PLATFORM.patch b/patches/wpewebkit-2.52.4/0003-UIGamepadProvider-guard-stubs-with-ENABLE-WPE_PLATFORM.patch
deleted file mode 100644
index cd84a1596a62..000000000000
--- a/patches/wpewebkit-2.52.4/0003-UIGamepadProvider-guard-stubs-with-ENABLE-WPE_PLATFORM.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Artur Wiebe <artur@4wiebe.de>
-Subject: [PATCH] UIGamepadProvider: guard fallback stubs with ENABLE(WPE_PLATFORM)
-
-The generic no-op implementations of platformSetDefaultGamepadProvider(),
-platformWebPageProxyForGamepadInput(), platformStopMonitoringInput() and
-platformStartMonitoringInput() in UIGamepadProvider.cpp are guarded with
-!USE(WPE_PLATFORM). That macro is never defined anywhere: the build system
-exposes ENABLE_WPE_PLATFORM (i.e. ENABLE(WPE_PLATFORM)), and every other
-gamepad source file uses ENABLE(WPE_PLATFORM) accordingly. USE(WPE_PLATFORM)
-therefore always evaluates to 0.
-
-The real implementations live in UIProcess/Gamepad/libwpe/
-UIGamepadProviderLibWPE.cpp, which is compiled unconditionally for the WPE
-port (guarded only by ENABLE(GAMEPAD)) and dispatches to either the WPE
-Platform or the legacy libwpe provider.
-
-When building the WPE port with ENABLE_WPE_PLATFORM=ON but without the legacy
-libwpe API (USE_LIBWPE=OFF) and without libmanette (USE_MANETTE=OFF), the
-guard stays true and the fallback stubs are compiled in addition to the real
-implementations, causing "redefinition of ..." errors at link/compile time of
-the unified sources.
-
-Fix the guard to use ENABLE(WPE_PLATFORM) to match the rest of the codebase,
-so the stubs are excluded whenever the WPE Platform implementation is present.
-
-This is the same fix applied upstream; drop this patch once it reaches a
-released 2.52.x tarball.
-
-Upstream-Bug: https://bugs.webkit.org/show_bug.cgi?id=317834
-Upstream-Commit: 0cab62d "[WPE] platformSetDefaultGamepadProvider is defined twice in WPEPlatform-only builds"
-
----
- Source/WebKit/UIProcess/Gamepad/UIGamepadProvider.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/Source/WebKit/UIProcess/Gamepad/UIGamepadProvider.cpp
-+++ b/Source/WebKit/UIProcess/Gamepad/UIGamepadProvider.cpp
-@@ -250,7 +250,7 @@
-     });
- }
-
--#if !PLATFORM(COCOA) && !(USE(MANETTE) && OS(LINUX)) && !USE(LIBWPE) && !USE(WPE_PLATFORM)
-+#if !PLATFORM(COCOA) && !(USE(MANETTE) && OS(LINUX)) && !USE(LIBWPE) && !ENABLE(WPE_PLATFORM)
-
- void UIGamepadProvider::platformSetDefaultGamepadProvider()
- {
-@@ -271,7 +271,7 @@
- {
- }
-
--#endif // !PLATFORM(COCOA) && !(USE(MANETTE) && OS(LINUX)) && !USE(LIBWPE) && !USE(WPE_PLATFORM)
-+#endif // !PLATFORM(COCOA) && !(USE(MANETTE) && OS(LINUX)) && !USE(LIBWPE) && !ENABLE(WPE_PLATFORM)
-
- }
-
diff --git a/patches/wpewebkit-2.52.4/series b/patches/wpewebkit-2.52.4/series
deleted file mode 100644
index 7705f23cb707..000000000000
--- a/patches/wpewebkit-2.52.4/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0002-PlatformWPE-link-GLib-GioUnix-to-propagate-gio-unix-2.0-includes.patch
-0003-UIGamepadProvider-guard-stubs-with-ENABLE-WPE_PLATFORM.patch
diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make
index 2999aed8eda2..7fb4968dd692 100644
--- a/rules/wpewebkit.make
+++ b/rules/wpewebkit.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit
 #
 # Paths and names
 #
-WPEWEBKIT_VERSION	:= 2.52.4
-WPEWEBKIT_SHA256		:= 01ca34cd7af880c038d35aa94482fee785a77db37b614c584475d7d43b3a2dc0
+WPEWEBKIT_VERSION	:= 2.54.2
+WPEWEBKIT_SHA256		:= f3284e19e47fcb5ac8c63c2e1c113dbd65b2423eb8a545f5b345707829004f56
 WPEWEBKIT		:= wpewebkit-$(WPEWEBKIT_VERSION)
 WPEWEBKIT_SUFFIX	:= tar.xz
 WPEWEBKIT_URL		:= https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX)
@@ -57,9 +57,12 @@ WPEWEBKIT_CONF_OPT	:= \
 	-DENABLE_MINIBROWSER=$(call ptx/onoff,PTXCONF_WPEWEBKIT_MINIBROWSER) \
 	-DENABLE_PDFJS=ON \
 	-DENABLE_SPEECH_SYNTHESIS=OFF \
+	-DENABLE_SPELLCHECK=OFF \
+	-DENABLE_UNSAFE_BUFFER_USAGE_WARNING=OFF \
 	-DENABLE_VIDEO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
 	-DENABLE_WEBCORE=ON \
 	-DENABLE_WEBDRIVER=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBDRIVER) \
+	-DENABLE_WEBGL_WEBGPU=OFF \
 	-DENABLE_WEBKIT=ON \
 	-DENABLE_WEB_AUDIO=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \
 	-DENABLE_WPE_1_1_API=OFF \
@@ -77,7 +80,6 @@ WPEWEBKIT_CONF_OPT	:= \
 	-DSHOW_BINDINGS_GENERATION_PROGRESS=OFF \
 	-DUSER_AGENT_BRANDING= \
 	-DUSE_64KB_PAGE_BLOCK=OFF \
-	-DUSE_APPLE_ICU=OFF \
 	-DUSE_ATK=OFF \
 	-DUSE_AVIF=OFF \
 	-DUSE_CXX_STDLIB_ASSERTIONS=OFF \
@@ -85,13 +87,15 @@ WPEWEBKIT_CONF_OPT	:= \
 	-DUSE_GBM=ON \
 	-DUSE_GSTREAMER=$(call ptx/onoff,PTXCONF_WPEWEBKIT_AUDIO) \
 	-DUSE_GSTREAMER_WEBRTC=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBRTC) \
+	-DUSE_HEADER_MAPS=OFF \
 	-DUSE_JPEGXL=OFF \
 	-DUSE_LCMS=OFF \
-	-DUSE_LIBHYPHEN=OFF \
 	-DUSE_LIBBACKTRACE=OFF \
 	-DUSE_LIBDRM=ON \
+	-DUSE_LIBHYPHEN=OFF \
 	-DUSE_SKIA_OPENTYPE_SVG=OFF \
 	-DUSE_THIN_ARCHIVES=ON \
+	-DUSE_VULKAN=OFF \
 	-DUSE_WOFF2=OFF
 
 # private options
@@ -105,7 +109,7 @@ WPEWEBKIT_CONF_OPT	+= \
 	-DENABLE_WEBXR=OFF \
 	-DENABLE_WEB_CODECS=OFF \
 	-DENABLE_WEB_RTC=$(call ptx/onoff,PTXCONF_WPEWEBKIT_WEBRTC) \
-	-DUSE_GSTREAMER_GL=OFF \
+	-DUSE_GSTREAMER_GL=$(call ptx/onoff,PTXCONF_WPEWEBKIT_VIDEO) \
 	-DUSE_SYSPROF_CAPTURE=OFF \
 	-DUSE_SYSTEM_MALLOC=OFF \
 	-DUSE_SYSTEM_SYSPROF_CAPTURE=OFF
-- 
2.47.3




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2026-11-12 14:11 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-12 14:11 [ptxdist] [PATCH] wpewebkit: version bump 2.52.4 -> 2.54.2 Michael Tretter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox