Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0

From: Martin Jansa <martin.jansa@gmail.com>
To: Alexander Kanavin <alex.kanavin@gmail.com>
Cc: Patches and discussions about the oe-core layer
	<openembedded-core@lists.openembedded.org>,
	Alexander Kanavin <alex@linutronix.de>,
	Khem Raj <raj.khem@gmail.com>
Subject: Re: [OE-core] [PATCH 24/25] webkitgtk: update 2.32.3 -> 2.34.0
Date: Tue, 26 Oct 2021 21:38:11 +0200	[thread overview]
Message-ID: <CA+chaQc7S7fmdDaWQfqPGv+o6UYrp_hUKgdr08uoegESuDPqew@mail.gmail.com> (raw)
In-Reply-To: <20211011094059.4184654-24-alex@linutronix.de>

[-- Attachment #1: Type: text/plain, Size: 2717 bytes --]

On Mon, Oct 11, 2021 at 11:42 AM Alexander Kanavin <alex.kanavin@gmail.com>
wrote:

> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../0001-ANGLE-do-not-enable-SSE-on-x86.patch | 26 ++++++++++++++++
>  ...1-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 10 +++---
>  .../0001-MiniBrowser-Fix-reproduciblity.patch | 31 -------------------
>  .../webkit/webkitgtk/include_xutil.patch      |  8 ++---
>  .../webkitgtk/musl-lower-stack-usage.patch    | 14 ++++-----
>  ...ebkitgtk_2.32.3.bb => webkitgtk_2.34.0.bb} | 23 ++++++++------
>  6 files changed, 55 insertions(+), 57 deletions(-)
>  create mode 100644
> meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
>  delete mode 100644
> meta/recipes-sato/webkit/webkitgtk/0001-MiniBrowser-Fix-reproduciblity.patch
>  rename meta/recipes-sato/webkit/{webkitgtk_2.32.3.bb =>
> webkitgtk_2.34.0.bb} (90%)
>
> diff --git
> a/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> b/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> new file mode 100644
> index 00000000000..1c6ba970376
> --- /dev/null
> +++
> b/meta/recipes-sato/webkit/webkitgtk/0001-ANGLE-do-not-enable-SSE-on-x86.patch
> @@ -0,0 +1,26 @@
> +From c71a4e18afb4869a0fbb0efd59c4860b72f493f7 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Tue, 5 Oct 2021 13:32:28 +0200
> +Subject: [PATCH] ANGLE: do not enable SSE on x86
> +
> +The code does not actually build there.
> +
> +Upstream-Status: Pending
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + Source/ThirdParty/ANGLE/src/common/platform.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Source/ThirdParty/ANGLE/src/common/platform.h
> b/Source/ThirdParty/ANGLE/src/common/platform.h
> +index 41f3cf4f..cab85a82 100644
> +--- a/Source/ThirdParty/ANGLE/src/common/platform.h
> ++++ b/Source/ThirdParty/ANGLE/src/common/platform.h
> +@@ -89,7 +89,7 @@
> + #if defined(_MSC_VER) && !defined(_M_ARM) && !defined(_M_ARM64)
> + #    include <intrin.h>
> + #    define ANGLE_USE_SSE
> +-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
> ++#elif defined(__GNUC__) && (defined(__x86_64__))
> + #    include <x86intrin.h>
> + #    define ANGLE_USE_SSE
> + #endif
>

Can you improve the commit message of this patch to show what "does not
actually build there"?

Because it fails to build here for qemux86 with:

webkitgtk/2.34.0-r0/webkitgtk-2.34.0/Source/ThirdParty/ANGLE/src/libANGLE/Constants.h:20:7:
error: 'size_t' does not name a type
   20 | const size_t kDefaultMaxProgramCacheMemoryBytes = 0;
      |       ^~~~~~

and deleting this patch fixes the build.

[-- Attachment #2: Type: text/html, Size: 3783 bytes --]