diff mbox series

package/webkitgtk: bump to version 2.38.0

Message ID 20220919142007.1967434-1-aperez@igalia.com
State Accepted
Headers show
Series package/webkitgtk: bump to version 2.38.0 | expand

Commit Message

Adrian Perez de Castro Sept. 19, 2022, 2:20 p.m. UTC
Update to a new major release which brings in improvements and a few
new features. Release notes:

  https://webkitgtk.org/2022/09/16/webkitgtk2.38.0-released.html

This release also includes security fixes for CVE-2022-32886,
CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory:

  https://webkitgtk.org/security/WSA-2022-0009.html

The CMake option to build the documentation has been renamed from
ENABLE_GTK_DOC to ENABLE_DOCUMENTATION, therefore update the build
recipe accordingly. Option USE_LIBNOTIFY is no longer available, as
WebKit now uses the notification portal D-Bus API directly without
relying on libnotify. Lastly, version 2.38.0 introduces a new WebRTC
implementation based on GstWebRTC which is left disabled for now to
keep the existing status quo (WebRTC not available), and adding an
option to enable it can be done in a follow-up patch.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 package/webkitgtk/webkitgtk.hash | 8 ++++----
 package/webkitgtk/webkitgtk.mk   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Comments

Yann E. MORIN Sept. 19, 2022, 7:41 p.m. UTC | #1
Adrian, All,

On 2022-09-19 17:20 +0300, Adrian Perez de Castro spake thusly:
> Update to a new major release which brings in improvements and a few
> new features. Release notes:
> 
>   https://webkitgtk.org/2022/09/16/webkitgtk2.38.0-released.html
> 
> This release also includes security fixes for CVE-2022-32886,
> CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory:
> 
>   https://webkitgtk.org/security/WSA-2022-0009.html
> 
> The CMake option to build the documentation has been renamed from
> ENABLE_GTK_DOC to ENABLE_DOCUMENTATION, therefore update the build
> recipe accordingly. Option USE_LIBNOTIFY is no longer available, as
> WebKit now uses the notification portal D-Bus API directly without
> relying on libnotify. Lastly, version 2.38.0 introduces a new WebRTC
> implementation based on GstWebRTC which is left disabled for now to
> keep the existing status quo (WebRTC not available), and adding an
> option to enable it can be done in a follow-up patch.
> 
> Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/webkitgtk/webkitgtk.hash | 8 ++++----
>  package/webkitgtk/webkitgtk.mk   | 6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
> index 7c6d7d65b5..c2512be9c6 100644
> --- a/package/webkitgtk/webkitgtk.hash
> +++ b/package/webkitgtk/webkitgtk.hash
> @@ -1,7 +1,7 @@
> -# From https://webkitgtk.org/releases/webkitgtk-2.36.7.tar.xz.sums
> -md5  466351cf35e4f742590919380b5dee93  webkitgtk-2.36.7.tar.xz
> -sha1  36078148b6e0ef002f0279b25b1caf173f851ac8  webkitgtk-2.36.7.tar.xz
> -sha256  0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743  webkitgtk-2.36.7.tar.xz
> +# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums
> +md5  a69cd8fc05f7299458b4faf1bc99b875  webkitgtk-2.38.0.tar.xz
> +sha1  6dcb65b8dc56c52f086bfeecfca7920e9cc78348  webkitgtk-2.38.0.tar.xz
> +sha256  f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd  webkitgtk-2.38.0.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 014d92bb41..336744954e 100644
> --- a/package/webkitgtk/webkitgtk.mk
> +++ b/package/webkitgtk/webkitgtk.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -WEBKITGTK_VERSION = 2.36.7
> +WEBKITGTK_VERSION = 2.38.0
>  WEBKITGTK_SITE = https://www.webkitgtk.org/releases
>  WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
>  WEBKITGTK_INSTALL_STAGING = YES
> @@ -18,12 +18,12 @@ WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \
>  	libtasn1 libxml2 libxslt openjpeg sqlite webp woff2
>  WEBKITGTK_CONF_OPTS = \
>  	-DENABLE_API_TESTS=OFF \
> +	-DENABLE_DOCUMENTATION=OFF \
>  	-DENABLE_GEOLOCATION=OFF \
> -	-DENABLE_GTKDOC=OFF \
>  	-DENABLE_MINIBROWSER=ON \
>  	-DENABLE_SPELLCHECK=ON \
> +	-DENABLE_WEB_RTC=OFF \
>  	-DPORT=GTK \
> -	-DUSE_LIBNOTIFY=OFF \
>  	-DUSE_LIBHYPHEN=OFF \
>  	-DUSE_OPENJPEG=ON \
>  	-DUSE_SOUP2=ON \
> -- 
> 2.37.3
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Peter Korsgaard Sept. 21, 2022, 5:44 p.m. UTC | #2
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:

 > Update to a new major release which brings in improvements and a few
 > new features. Release notes:

 >   https://webkitgtk.org/2022/09/16/webkitgtk2.38.0-released.html

 > This release also includes security fixes for CVE-2022-32886,
 > CVE-2022-32891, and CVE-2022-32912. Accompanying security advisory:

 >   https://webkitgtk.org/security/WSA-2022-0009.html

 > The CMake option to build the documentation has been renamed from
 > ENABLE_GTK_DOC to ENABLE_DOCUMENTATION, therefore update the build
 > recipe accordingly. Option USE_LIBNOTIFY is no longer available, as
 > WebKit now uses the notification portal D-Bus API directly without
 > relying on libnotify. Lastly, version 2.38.0 introduces a new WebRTC
 > implementation based on GstWebRTC which is left disabled for now to
 > keep the existing status quo (WebRTC not available), and adding an
 > option to enable it can be done in a follow-up patch.

 > Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>

As mentioned elsewhere, this breaks on systems with cmake 3.18.x /
3.19.x (E.G. Debian stable, ..) as this version requires cmake 3.20:

CMake Error at Source/cmake/OptionsGTK.cmake:11 (message):
  Building with Makefiles requires CMake 3.20 or newer.  Either enable Ninja
  by passing -GNinja, or upgrade CMake.

Given how long it takes to build webkit, perhaps building it with ninja
makes more sense? Ideally we would extend pkg-cmake.mk so that you can
define per-package if it should build with ninja or make rather than
having custom logic in webkitgtk.mk.

Alternatively we will need to bump the minimal cmake version to 3.20,
but given that E.G. what is is Debian is older than that, this isn't
really a great option.
diff mbox series

Patch

diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
index 7c6d7d65b5..c2512be9c6 100644
--- a/package/webkitgtk/webkitgtk.hash
+++ b/package/webkitgtk/webkitgtk.hash
@@ -1,7 +1,7 @@ 
-# From https://webkitgtk.org/releases/webkitgtk-2.36.7.tar.xz.sums
-md5  466351cf35e4f742590919380b5dee93  webkitgtk-2.36.7.tar.xz
-sha1  36078148b6e0ef002f0279b25b1caf173f851ac8  webkitgtk-2.36.7.tar.xz
-sha256  0c260cf2b32f0481d017670dfed1b61e554967cd067195606c9f9eb5fe731743  webkitgtk-2.36.7.tar.xz
+# From https://webkitgtk.org/releases/webkitgtk-2.38.0.tar.xz.sums
+md5  a69cd8fc05f7299458b4faf1bc99b875  webkitgtk-2.38.0.tar.xz
+sha1  6dcb65b8dc56c52f086bfeecfca7920e9cc78348  webkitgtk-2.38.0.tar.xz
+sha256  f9ce6375a3b6e1329b0b609f46921e2627dc7ad6224b37b967ab2ea643bc0fbd  webkitgtk-2.38.0.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 014d92bb41..336744954e 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.36.7
+WEBKITGTK_VERSION = 2.38.0
 WEBKITGTK_SITE = https://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
@@ -18,12 +18,12 @@  WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \
 	libtasn1 libxml2 libxslt openjpeg sqlite webp woff2
 WEBKITGTK_CONF_OPTS = \
 	-DENABLE_API_TESTS=OFF \
+	-DENABLE_DOCUMENTATION=OFF \
 	-DENABLE_GEOLOCATION=OFF \
-	-DENABLE_GTKDOC=OFF \
 	-DENABLE_MINIBROWSER=ON \
 	-DENABLE_SPELLCHECK=ON \
+	-DENABLE_WEB_RTC=OFF \
 	-DPORT=GTK \
-	-DUSE_LIBNOTIFY=OFF \
 	-DUSE_LIBHYPHEN=OFF \
 	-DUSE_OPENJPEG=ON \
 	-DUSE_SOUP2=ON \