Le mer. 18 mai 2022 à 16:19, Adrian Perez de Castro <aperez@igalia.com> a écrit :
Bugfix release, mostly with build fixes, and an important fix for
when using threaded rendering. Release notes:

  https://wpewebkit.org/release/wpewebkit-2.36.2.html

This release fails to build when X11 headers are not present, but there
is already a fix accepted upstream and slated for inclusion in the next
release in the series, so in the meantime imported it locally.


webkitgtk 2.36.1 (from BR 2022.05-rc1) has also this issue.
patch from https://bugs.webkit.org/show_bug.cgi?id=239039 solves it.

François

 
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
---
 ...GLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch | 39 +++++++++++++++++++
 package/wpewebkit/wpewebkit.hash              |  8 ++--
 package/wpewebkit/wpewebkit.mk                |  2 +-
 3 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch

diff --git a/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch b/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch
new file mode 100644
index 0000000000..0b6dd9bcb1
--- /dev/null
+++ b/package/wpewebkit/0001-GTK-WPE-Build-ANGLE-with-the-EGL_NO_PLATFORM_SPECIFI.patch
@@ -0,0 +1,39 @@
+From 32135a4af7c2ea1db2ea528df9af0a331ca88dba Mon Sep 17 00:00:00 2001
+From: "zan@falconsigh.net"
+ <zan@falconsigh.net@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Tue, 12 Apr 2022 06:34:44 +0000
+Subject: [PATCH] [GTK][WPE] Build ANGLE with the
+ EGL_NO_PLATFORM_SPECIFIC_TYPES define
+ https://bugs.webkit.org/show_bug.cgi?id=239039
+
+Reviewed by Adrian Perez de Castro.
+
+Specify the EGL_NO_PLATFORM_SPECIFIC_TYPES define when building ANGLE
+subproject for the GTK and WPE ports. This should avoid searching for
+platform-specific headers that might not be available at all during
+build, e.g. the X11 headers which are used by default on UNIX platforms.
+
+* PlatformGTK.cmake:
+* PlatformWPE.cmake:
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+Upstream status: https://bugs.webkit.org/show_bug.cgi?id=239039
+---
+ Source/ThirdParty/ANGLE/ChangeLog         | 15 +++++++++++++++
+ Source/ThirdParty/ANGLE/PlatformGTK.cmake |  2 +-
+ Source/ThirdParty/ANGLE/PlatformWPE.cmake |  2 +-
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/Source/ThirdParty/ANGLE/PlatformWPE.cmake b/Source/ThirdParty/ANGLE/PlatformWPE.cmake
+index a4d0b959c62..8f5bff7f19a 100644
+--- a/Source/ThirdParty/ANGLE/PlatformWPE.cmake
++++ b/Source/ThirdParty/ANGLE/PlatformWPE.cmake
+@@ -1,4 +1,4 @@
+-list(APPEND ANGLE_DEFINITIONS ANGLE_PLATFORM_LINUX)
++list(APPEND ANGLE_DEFINITIONS ANGLE_PLATFORM_LINUX EGL_NO_PLATFORM_SPECIFIC_TYPES)
+ include(linux.cmake)
+
+ if (USE_OPENGL)
+--
+2.36.1
+
diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash
index 3923c32111..d509ab091f 100644
--- a/package/wpewebkit/wpewebkit.hash
+++ b/package/wpewebkit/wpewebkit.hash
@@ -1,7 +1,7 @@
-# From https://wpewebkit.org/releases/wpewebkit-2.36.1.tar.xz.sums
-md5
  7ba1c7fd0f67891ad137d11cac12f7a9  wpewebkit-2.36.1.tar.xz
-sha1  0918a4daded01f42e65ec02a69f21cd6705311db  wpewebkit-2.36.1.tar.xz
-sha256  ec83d8b2f8c3479ce9950d69440f3b9876ab70200fe6f4e07686054a0cba5723  wpewebkit-2.36.1.tar.xz
+# From https://wpewebkit.org/releases/wpewebkit-2.36.2.tar.xz.sums
+md5
  bcfb465ae085835ae96c68fddc85ca44  wpewebkit-2.36.2.tar.xz
+sha1  1a5a6b7b5e94f4ea7e3462d6bdb5de7efa678f74  wpewebkit-2.36.2.tar.xz
+sha256  959519562701e2005f2767a62e85977d6c3e65858709b376c89d8e33502febb9  wpewebkit-2.36.2.tar.xz

 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk
index 9c9a9a2838..ca26cb3f65 100644
--- a/package/wpewebkit/wpewebkit.mk
+++ b/package/wpewebkit/wpewebkit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-WPEWEBKIT_VERSION = 2.36.1
+WPEWEBKIT_VERSION = 2.36.2
 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
 WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
 WPEWEBKIT_INSTALL_STAGING = YES
--
2.36.1