From a199751e5bbfede9e9879d4bfb0bec7c9f4aa871 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Mon, 16 Dec 2024 19:17:19 +0100 Subject: [PATCH] package/webkitgtk: bump to 2.46.4 Stable release to the 2.46 series. Release notes: https://webkitgtk.org/2024/09/17/webkitgtk2.46.0-released.html https://webkitgtk.org/2024/09/30/webkitgtk2.46.1-released.html https://webkitgtk.org/2024/10/21/webkitgtk2.46.2-released.html https://webkitgtk.org/2024/10/30/webkitgtk2.46.3-released.html https://webkitgtk.org/2024/11/27/webkitgtk2.46.4-released.html Added BR2_PACKAGE_WEBP_MUX to fix this error: -- The following WebP libraries were not found: -- mux (required) Added USE_SYSTEM_SYSPROF_CAPTURE=OFF to fix this error: -- Checking for module 'sysprof-capture-4' -- Package 'sysprof-capture-4', required by 'virtual:world', not found -- Could NOT find SysProfCapture (missing: SysProfCapture_LIBRARY SysProfCapture_INCLUDE_DIR) For now, use USE_SKIA=OFF which is the replacement for cairo. Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 1 + package/webkitgtk/webkitgtk.hash | 6 +++--- package/webkitgtk/webkitgtk.mk | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index dca62cf0f8..3594299314 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_WEBKITGTK select BR2_PACKAGE_SQLITE select BR2_PACKAGE_WEBP select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WEBP_MUX select BR2_PACKAGE_WOFF2 select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 49f758d6a8..96100d4c7c 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,6 +1,6 @@ -# From https://www.webkitgtk.org/releases/webkitgtk-2.44.4.tar.xz.sums -sha1 3699ff9c9b84e755a0736e72dfd6e5a13151f7d6 webkitgtk-2.44.4.tar.xz -sha256 2ce4ec1b78413035037aba8326b31ed72696626b7bea7bace5e46ac0d8cbe796 webkitgtk-2.44.4.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.46.4.tar.xz.sums +sha1 10d4dbd222acec30b1d20ee3b7d02c0d9727c5a9 webkitgtk-2.46.4.tar.xz +sha256 0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176 webkitgtk-2.46.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 49a532d9aa..ec63d093b7 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.44.4 +WEBKITGTK_VERSION = 2.46.4 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -30,6 +30,8 @@ WEBKITGTK_CONF_OPTS = \ -DUSE_AVIF=OFF \ -DUSE_GTK4=OFF \ -DUSE_LIBHYPHEN=OFF \ + -DUSE_SKIA=OFF \ + -DUSE_SYSTEM_SYSPROF_CAPTURE=OFF \ -DUSE_WOFF2=ON ifeq ($(BR2_PACKAGE_WEBKITGTK_SANDBOX),y)