diff mbox series

webkitgtk: Update

Message ID 20241121141411.4476-1-schonm@gmail.com
State New
Headers show
Series webkitgtk: Update | expand

Commit Message

Jason Schonberg Nov. 21, 2024, 2:14 p.m. UTC 
Add backported patch to support ICU-76.1

Signed-off-by: Jason Schonberg <schonm@gmail.com>
---
 .../0001-Support-ICU-76.1-build.patch         | 36 +++++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.44.3.bb  |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch

Comments

Alexander Kanavin Nov. 21, 2024, 2:16 p.m. UTC | #1 
This was presumably done to appease patchtest, and is actually worse
than the first attempt. 'webkitgtk: update' is not a good commit
header at all.

What patchtest says is not a hard requirement; if a commit description
isn't actually necessary, then there's no need to try to fake one.

Alex

On Thu, 21 Nov 2024 at 15:14, J. S. via lists.openembedded.org
<schonm=gmail.com@lists.openembedded.org> wrote:
>
>  Add backported patch to support ICU-76.1
>
> Signed-off-by: Jason Schonberg <schonm@gmail.com>
> ---
>  .../0001-Support-ICU-76.1-build.patch         | 36 +++++++++++++++++++
>  meta/recipes-sato/webkit/webkitgtk_2.44.3.bb  |  1 +
>  2 files changed, 37 insertions(+)
>  create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
>
> diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
> new file mode 100644
> index 0000000000..31535e7ae2
> --- /dev/null
> +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
> @@ -0,0 +1,36 @@
> +From 57b80aa00be614218552fda67b2bf8d535b4f4cf Mon Sep 17 00:00:00 2001
> +From: Jason Schonberg <schonm@gmail.com>
> +Date: Wed, 20 Nov 2024 11:05:52 -0500
> +Subject: [PATCH]  Support ICU 76.1 build
> +
> +https://bugs.webkit.org/show_bug.cgi?id=282120
> +
> +Reviewed by Yusuke Suzuki.
> +
> +In ICU 76.1 an additional macro `U_SHOW_CPLUSPLUS_HEADER_API` was added to
> +control visibility of the C++ API within ICU. Set this value to `0` since WebKit
> +wants to only use the C API.
> +
> +* Source/WTF/wtf/Platform.h:
> +
> +Canonical link: https://commits.webkit.org/285727@main
> +
> +Upstream-Status: Backport [ from webkitgtk-2.47.1 https://github.com/WebKit/WebKit/commit/63f7badbada070ebaadd318b2801818ecf7e7ea0 ]
> +
> +Signed-off-by: Jason Schonberg <schonm@gmail.com>
> +---
> + Source/WTF/wtf/Platform.h | 1 +
> + 1 file changed, 1 insertion(+)
> +
> +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
> +index 23070df2..51a8dce9 100644
> +--- a/Source/WTF/wtf/Platform.h
> ++++ b/Source/WTF/wtf/Platform.h
> +@@ -115,6 +115,7 @@
> + /* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
> + #define U_HIDE_DEPRECATED_API 1
> + #define U_SHOW_CPLUSPLUS_API 0
> ++#define U_SHOW_CPLUSPLUS_HEADER_API 0
> + #ifdef __cplusplus
> + #define UCHAR_TYPE char16_t
> + #endif
> diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
> index 00431407fa..2bb6316d89 100644
> --- a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
> +++ b/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
> @@ -17,6 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
>             file://t6-not-declared.patch \
>             file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
>             file://0001-Fix-build-issues-with-latest-Clang.patch \
> +           file://0001-Support-ICU-76.1-build.patch \
>             "
>  SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54"
>
> --
> 2.43.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#207537): https://lists.openembedded.org/g/openembedded-core/message/207537
> Mute This Topic: https://lists.openembedded.org/mt/109703951/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
new file mode 100644
index 0000000000..31535e7ae2
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-Support-ICU-76.1-build.patch
@@ -0,0 +1,36 @@ 
+From 57b80aa00be614218552fda67b2bf8d535b4f4cf Mon Sep 17 00:00:00 2001
+From: Jason Schonberg <schonm@gmail.com>
+Date: Wed, 20 Nov 2024 11:05:52 -0500
+Subject: [PATCH]  Support ICU 76.1 build
+
+https://bugs.webkit.org/show_bug.cgi?id=282120
+
+Reviewed by Yusuke Suzuki.
+
+In ICU 76.1 an additional macro `U_SHOW_CPLUSPLUS_HEADER_API` was added to
+control visibility of the C++ API within ICU. Set this value to `0` since WebKit
+wants to only use the C API.
+
+* Source/WTF/wtf/Platform.h:
+
+Canonical link: https://commits.webkit.org/285727@main
+
+Upstream-Status: Backport [ from webkitgtk-2.47.1 https://github.com/WebKit/WebKit/commit/63f7badbada070ebaadd318b2801818ecf7e7ea0 ]
+
+Signed-off-by: Jason Schonberg <schonm@gmail.com>
+---
+ Source/WTF/wtf/Platform.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 23070df2..51a8dce9 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -115,6 +115,7 @@
+ /* ICU configuration. Some of these match ICU defaults on some platforms, but we would like them consistently set everywhere we build WebKit. */
+ #define U_HIDE_DEPRECATED_API 1
+ #define U_SHOW_CPLUSPLUS_API 0
++#define U_SHOW_CPLUSPLUS_HEADER_API 0
+ #ifdef __cplusplus
+ #define UCHAR_TYPE char16_t
+ #endif
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
index 00431407fa..2bb6316d89 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
@@ -17,6 +17,7 @@  SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
            file://t6-not-declared.patch \
            file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \
            file://0001-Fix-build-issues-with-latest-Clang.patch \
+           file://0001-Support-ICU-76.1-build.patch \
            "
 SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54"