From a118e311bc7941c5f3f920e187e381c75ae91b0bc00b07482f04d1c1b6ada630 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 5 Jun 2024 06:37:17 +0000 Subject: [PATCH] Accepting request 1178662 from GNOME:Next - Stop passing -DENABLE_SAMPLING_PROFILER=OFF and -DENABLE_C_LOOP=ON on arch64, it's no longer needed to avoid build failure. - Set wayland and xkbcommon includes through CFLAGS and CXXFLAGS, it looks like the compiler can't automatically find them. - Update to version 2.44.2: * Fix CVE-2024-27834 bsc#1225071 * Decrease input notifications for gamepad inputs. * Disable the gst-libav AAC decoder. * Make gamepads visible on axis movements, and not only on button presses. * Make user scripts and style sheets visible in the Web Inspector. * Use the geolocation portal where available, with the existing Geoclue as fallback if the portal is not usable. * Use optimized assembler BoringSSL modules with USE_LIBWEBRTC enabled. * Fix mouse location in WebDriver when output device scaling is in effect. * Fix touch input event propagation. * Fix the build on 32-bit ARM with USE_LIBWEBRTC enabled. * Fix the build with ENABLE_WEBAUDIO disabled. * Fix several crashes and rendering issues. - Update to version 2.44.1: + Do not schedule layer flushes when drawing area size is empty. + Fix videos with alpha when using the DMA-BUF sink. + Fix the build with ENABLE_WEB_AUDIO=OFF. + Fix the build with ENABLE_VIDEO=OFF. + Fix the build with USE_GBM=OFF. + Fix the build in 32bit platforms + Fix several crashes and rendering issues. + For all changes between 2.42.2 and 2.44.1, please see packaged NEWS file. - Add libbacktrace-devel BuildRequires: new dependency. - Drop fix-include-dirs.patch and fix-load-backend-fdo-lib.patch: no longer needed. OBS-URL: https://build.opensuse.org/request/show/1178662 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/wpewebkit?expand=0&rev=5 --- _service | 3 -- fix-include-dirs.patch | 48 -------------------------- fix-load-backend-fdo-lib.patch | 13 ------- wpewebkit-2.42.2.tar.xz | 3 -- wpewebkit-2.44.2.tar.xz | 3 ++ wpewebkit.changes | 42 +++++++++++++++++++++++ wpewebkit.spec | 63 ++++++++++++++++------------------ 7 files changed, 75 insertions(+), 100 deletions(-) delete mode 100644 _service delete mode 100644 fix-include-dirs.patch delete mode 100644 fix-load-backend-fdo-lib.patch delete mode 100644 wpewebkit-2.42.2.tar.xz create mode 100644 wpewebkit-2.44.2.tar.xz diff --git a/_service b/_service deleted file mode 100644 index 6062efc..0000000 --- a/_service +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/fix-include-dirs.patch b/fix-include-dirs.patch deleted file mode 100644 index 7faf308..0000000 --- a/fix-include-dirs.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: wpewebkit-2.40.3/Source/cmake/FindWayland.cmake -=================================================================== ---- wpewebkit-2.40.3.orig/Source/cmake/FindWayland.cmake -+++ wpewebkit-2.40.3/Source/cmake/FindWayland.cmake -@@ -32,5 +32,6 @@ find_package(PkgConfig QUIET) - pkg_check_modules(WAYLAND wayland-client wayland-server wayland-egl) - - include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Wayland REQUIRED_VARS WAYLAND_LIBRARIES -+find_package_handle_standard_args(Wayland -+ REQUIRED_VARS WAYLAND_INCLUDE_DIRS WAYLAND_LIBRARIES - FOUND_VAR WAYLAND_FOUND) -Index: wpewebkit-2.40.3/Tools/wpe/backends/PlatformWPE.cmake -=================================================================== ---- wpewebkit-2.40.3.orig/Tools/wpe/backends/PlatformWPE.cmake -+++ wpewebkit-2.40.3/Tools/wpe/backends/PlatformWPE.cmake -@@ -29,6 +29,8 @@ list(APPEND WPEToolingBackends_SYSTEM_IN - ${ATK_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${LIBEPOXY_INCLUDE_DIRS} -+ ${LIBXKBCOMMON_INCLUDE_DIRS} -+ ${WAYLAND_INCLUDE_DIRS} - ${WPEBACKEND_FDO_INCLUDE_DIRS} - ) - -Index: wpewebkit-2.40.3/Source/cmake/FindLibxkbcommon.cmake -=================================================================== ---- wpewebkit-2.40.3.orig/Source/cmake/FindLibxkbcommon.cmake -+++ wpewebkit-2.40.3/Source/cmake/FindLibxkbcommon.cmake -@@ -32,5 +32,6 @@ find_package(PkgConfig QUIET) - pkg_check_modules(LIBXKBCOMMON xkbcommon) - - include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(Libxkbcommon REQUIRED_VARS LIBXKBCOMMON_FOUND -+find_package_handle_standard_args(Libxkbcommon -+ REQUIRED_VARS LIBXKBCOMMON_INCLUDE_DIRS LIBXKBCOMMON_FOUND - FOUND_VAR LIBXKBCOMMON_FOUND) -Index: wpewebkit-2.40.3/Tools/MiniBrowser/wpe/CMakeLists.txt -=================================================================== ---- wpewebkit-2.40.3.orig/Tools/MiniBrowser/wpe/CMakeLists.txt -+++ wpewebkit-2.40.3/Tools/MiniBrowser/wpe/CMakeLists.txt -@@ -14,6 +14,7 @@ set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORI - ${ATK_INCLUDE_DIRS} - ${GLIB_INCLUDE_DIRS} - ${LIBSOUP_INCLUDE_DIRS} -+ ${WAYLAND_INCLUDE_DIRS} - ${WPEBACKEND_FDO_INCLUDE_DIRS} - ) diff --git a/fix-load-backend-fdo-lib.patch b/fix-load-backend-fdo-lib.patch deleted file mode 100644 index 2c25dac..0000000 --- a/fix-load-backend-fdo-lib.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: wpewebkit-2.40.3/Tools/wpe/backends/PlatformWPE.cmake -=================================================================== ---- wpewebkit-2.40.3.orig/Tools/wpe/backends/PlatformWPE.cmake -+++ wpewebkit-2.40.3/Tools/wpe/backends/PlatformWPE.cmake -@@ -74,7 +74,7 @@ add_custom_command( - VERBATIM) - - list(APPEND WPEToolingBackends_DEFINITIONS WPE_BACKEND_FDO) --list(APPEND WPEToolingBackends_PRIVATE_DEFINITIONS WPE_BACKEND="libWPEBackend-fdo-1.0.so") -+list(APPEND WPEToolingBackends_PRIVATE_DEFINITIONS WPE_BACKEND="libWPEBackend-fdo-1.0.so.1") - - if (ENABLE_ACCESSIBILITY) - list(APPEND WPEToolingBackends_DEFINITIONS ENABLE_ACCESSIBILITY=1) diff --git a/wpewebkit-2.42.2.tar.xz b/wpewebkit-2.42.2.tar.xz deleted file mode 100644 index 2567265..0000000 --- a/wpewebkit-2.42.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df99bbc7007df60d77821e4c169312464f145c8aa6e34398a43da36a857285e8 -size 32415132 diff --git a/wpewebkit-2.44.2.tar.xz b/wpewebkit-2.44.2.tar.xz new file mode 100644 index 0000000..49b3ac0 --- /dev/null +++ b/wpewebkit-2.44.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a3d23cb4fb071ca0db3a09c5a85f27b8bcc6094a2026d3b7407bed4f99218f7 +size 35182184 diff --git a/wpewebkit.changes b/wpewebkit.changes index 1c6a9f7..88ef146 100644 --- a/wpewebkit.changes +++ b/wpewebkit.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Tue Jun 4 17:28:23 UTC 2024 - Joan Torres + +- Stop passing -DENABLE_SAMPLING_PROFILER=OFF and -DENABLE_C_LOOP=ON + on arch64, it's no longer needed to avoid build failure. +- Set wayland and xkbcommon includes through CFLAGS and CXXFLAGS, + it looks like the compiler can't automatically find them. + +------------------------------------------------------------------- +Thu May 23 08:23:41 UTC 2024 - Joan Torres + +- Update to version 2.44.2: + * Fix CVE-2024-27834 bsc#1225071 + * Decrease input notifications for gamepad inputs. + * Disable the gst-libav AAC decoder. + * Make gamepads visible on axis movements, and not only on button presses. + * Make user scripts and style sheets visible in the Web Inspector. + * Use the geolocation portal where available, with the existing Geoclue as fallback if the portal is not usable. + * Use optimized assembler BoringSSL modules with USE_LIBWEBRTC enabled. + * Fix mouse location in WebDriver when output device scaling is in effect. + * Fix touch input event propagation. + * Fix the build on 32-bit ARM with USE_LIBWEBRTC enabled. + * Fix the build with ENABLE_WEBAUDIO disabled. + * Fix several crashes and rendering issues. + +------------------------------------------------------------------- +Fri May 3 15:09:25 UTC 2024 - Dominique Leuenberger + +- Update to version 2.44.1: + + Do not schedule layer flushes when drawing area size is empty. + + Fix videos with alpha when using the DMA-BUF sink. + + Fix the build with ENABLE_WEB_AUDIO=OFF. + + Fix the build with ENABLE_VIDEO=OFF. + + Fix the build with USE_GBM=OFF. + + Fix the build in 32bit platforms + + Fix several crashes and rendering issues. + + For all changes between 2.42.2 and 2.44.1, please see packaged + NEWS file. +- Add libbacktrace-devel BuildRequires: new dependency. +- Drop fix-include-dirs.patch and fix-load-backend-fdo-lib.patch: + no longer needed. + ------------------------------------------------------------------- Wed Nov 22 11:12:21 UTC 2023 - Joan Torres diff --git a/wpewebkit.spec b/wpewebkit.spec index 3a9b7c1..6cc487c 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -1,7 +1,7 @@ # # spec file for package wpewebkit # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,20 +23,19 @@ Name: wpewebkit ### FIXME ### Drop the disabling of LTO on next release/versionbump %define _lto_cflags %{nil} -Version: 2.42.2 +Version: 2.44.2 Release: 0 Summary: Library for rendering web content, WPE Port License: BSD-3-Clause AND LGPL-2.1-only Group: Development/Libraries/C and C++ URL: https://wpewebkit.org/ Source: %{url}/releases/%{name}-%{version}.tar.xz -Patch0: fix-include-dirs.patch -Patch1: fix-load-backend-fdo-lib.patch BuildRequires: bubblewrap BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gperf >= 3.0.1 +BuildRequires: libbacktrace-devel BuildRequires: libicu-devel >= 61.2 BuildRequires: memory-constraints BuildRequires: ninja @@ -47,36 +46,34 @@ BuildRequires: unifdef BuildRequires: xdg-dbus-proxy BuildRequires: pkgconfig(atk) >= 2.16.0 BuildRequires: pkgconfig(atk-bridge-2.0) -BuildRequires: pkgconfig(libjxl) -BuildRequires: pkgconfig(cairo) >= 1.14.0 -BuildRequires: pkgconfig(epoxy) >= 1.4.0 -BuildRequires: pkgconfig(fontconfig) >= 2.8.0 -BuildRequires: pkgconfig(freetype2) >= 2.4.2 +BuildRequires: pkgconfig(cairo) >= 1.16.0 +BuildRequires: pkgconfig(epoxy) >= 1.5.4 +BuildRequires: pkgconfig(freetype2) >= 2.9.0 BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(glib-2.0) >= 2.70.0 -BuildRequires: pkgconfig(gstreamer-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-allocators-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-app-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-audio-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-codecparsers-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-fft-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-gl-1.0) >= 1.16.2 +BuildRequires: pkgconfig(gstreamer-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-allocators-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-app-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-audio-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-base-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-codecparsers-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-fft-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-gl-1.0) >= 1.18.4 BuildRequires: pkgconfig(gstreamer-mpegts-1.0) >= 1.4.0 -BuildRequires: pkgconfig(gstreamer-pbutils-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-rtp-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-sdp-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-tag-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-transcoder-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-video-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-webrtc-1.0) >= 1.16.2 -BuildRequires: pkgconfig(harfbuzz) >= 0.9.18 +BuildRequires: pkgconfig(gstreamer-pbutils-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-rtp-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-sdp-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-tag-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-transcoder-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-video-1.0) >= 1.18.4 +BuildRequires: pkgconfig(gstreamer-webrtc-1.0) >= 1.18.4 +BuildRequires: pkgconfig(harfbuzz) >= 1.4.2 BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libavif) >= 0.9.0 BuildRequires: pkgconfig(libdrm) -BuildRequires: pkgconfig(libgcrypt) >= 1.6.0 +BuildRequires: pkgconfig(libgcrypt) >= 1.7.0 BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libopenjp2) >= 2.2.0 +BuildRequires: pkgconfig(libjxl) >= 0.7.0 BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsoup-3.0) >= 3.0.0 @@ -88,12 +85,12 @@ BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(libxml-2.0) >= 2.8.0 BuildRequires: pkgconfig(libxslt) >= 1.1.7 BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-client) >= 1.15 +BuildRequires: pkgconfig(wayland-egl) >= 1.15 BuildRequires: pkgconfig(wayland-protocols) -BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(wayland-server) >= 1.15 BuildRequires: pkgconfig(wpe-1.0) -BuildRequires: pkgconfig(wpebackend-fdo-1.0) +BuildRequires: pkgconfig(wpebackend-fdo-1.0) >= 1.3.0 BuildRequires: pkgconfig(xkbcommon) >= 0.4.0 BuildRequires: pkgconfig(zlib) @@ -172,6 +169,8 @@ embedded mini browsers. # Use linker flags to reduce memory consumption %global optflags %(echo %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads | sed 's/-g /-g1 /') +export CFLAGS="%{optflags} $(pkg-config --cflags wayland-client xkbcommon)" +export CXXFLAGS="%{optflags} $(pkg-config --cflags wayland-client xkbcommon)" %cmake \ -GNinja \ -DCMAKE_BUILD_TYPE=Release \ @@ -183,8 +182,6 @@ embedded mini browsers. -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libWPEWebKit-%{_wksover} \ %ifarch aarch64 -DENABLE_JIT=OFF \ - -DENABLE_C_LOOP=ON \ - -DENABLE_SAMPLING_PROFILER=OFF \ -DUSE_SYSTEM_MALLOC=ON \ %endif %ninja_build