From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
Date: Sat, 05 Jul 2025 04:45:54 +0000 (UTC) [thread overview]
Message-ID: <1751690723.605ec04b0dffa45fe90f9a10146f5a68207f4e9a.sam@gentoo> (raw)
commit: 605ec04b0dffa45fe90f9a10146f5a68207f4e9a
Author: Jernej Jakob <jernej.jakob <AT> gmail <DOT> com>
AuthorDate: Sat Jul 5 00:59:18 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 5 04:45:23 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=605ec04b
net-libs/webkit-gtk: fix build with clang 20 for 2.46.5
upstream https://bugs.webkit.org/show_bug.cgi?id=295472
Closes: https://bugs.gentoo.org/959511
Signed-off-by: Jernej Jakob <jernej.jakob <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42875
Closes: https://github.com/gentoo/gentoo/pull/42875
Signed-off-by: Sam James <sam <AT> gentoo.org>
...h-error-no-matching-function-for-call-to-.patch | 51 ++++++++++++++++++++++
net-libs/webkit-gtk/webkit-gtk-2.46.5-r1.ebuild | 3 ++
net-libs/webkit-gtk/webkit-gtk-2.46.5-r411.ebuild | 3 ++
net-libs/webkit-gtk/webkit-gtk-2.46.5-r601.ebuild | 3 ++
4 files changed, 60 insertions(+)
diff --git a/net-libs/webkit-gtk/files/2.46.5-EnumTraits.h-error-no-matching-function-for-call-to-.patch b/net-libs/webkit-gtk/files/2.46.5-EnumTraits.h-error-no-matching-function-for-call-to-.patch
new file mode 100644
index 000000000000..a5f0e2675cc9
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.46.5-EnumTraits.h-error-no-matching-function-for-call-to-.patch
@@ -0,0 +1,51 @@
+Modified patch from upstream commit
+https://github.com/WebKit/WebKit/commit/654f0c3
+to apply on 2.46.5
+
+Original author fujii (Fujii Hironori)
+
+--- a/Source/WTF/wtf/EnumTraits.h 2025-07-04 00:55:33.552603416 +0200
++++ b/Source/WTF/wtf/EnumTraits.h 2025-07-04 01:08:04.845970071 +0200
+@@ -161,6 +161,16 @@
+ #pragma clang diagnostic ignored "-Wenum-constexpr-conversion"
+ #endif
+
++#if COMPILER(CLANG) && __clang_major__ >= 16
++template <typename E, auto V, typename = void>
++inline constexpr bool isEnumConstexprStaticCastValid = false;
++template <typename E, auto V>
++inline constexpr bool isEnumConstexprStaticCastValid<E, V, std::void_t<std::integral_constant<E, static_cast<E>(V)>>> = true;
++#else
++template <typename, auto>
++inline constexpr bool isEnumConstexprStaticCastValid = true;
++#endif
++
+ template<typename E>
+ constexpr std::span<const char> enumTypeNameImpl()
+ {
+@@ -224,6 +234,16 @@
+ return result;
+ }
+
++template<typename E, auto V>
++constexpr std::span<const char> enumName()
++{
++ if constexpr (isEnumConstexprStaticCastValid<E, V>)
++ return enumName<static_cast<E>(V)>();
++ else
++ return { };
++}
++
++
+ namespace detail {
+
+ template<size_t i, size_t end>
+@@ -243,7 +263,7 @@
+ std::array<std::span<const char>, limit> names;
+
+ detail::forConstexpr<0, limit>([&] (auto i) {
+- names[i] = enumName<static_cast<E>(static_cast<unsigned>(i))>();
++ names[i] = enumName<E, static_cast<unsigned>(i)>();
+ });
+ return names;
+ }
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r1.ebuild
index 72b1c0b6926b..e33758e3dd7f 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r1.ebuild
@@ -149,6 +149,9 @@ src_prepare() {
# https://bugs.gentoo.org/943213
eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
+ # bug #959511 upstream https://bugs.webkit.org/show_bug.cgi?id=295472
+ eapply "${FILESDIR}"/2.46.5-EnumTraits.h-error-no-matching-function-for-call-to-.patch
+
# We don't want -Werror for gobject-introspection (bug #947761)
sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r411.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r411.ebuild
index 36a862d7577a..d1cd746c56a9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r411.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r411.ebuild
@@ -149,6 +149,9 @@ src_prepare() {
# https://bugs.gentoo.org/943213
eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
+ # bug #959511 upstream https://bugs.webkit.org/show_bug.cgi?id=295472
+ eapply "${FILESDIR}"/2.46.5-EnumTraits.h-error-no-matching-function-for-call-to-.patch
+
# We don't want -Werror for gobject-introspection (bug #947761)
sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r601.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r601.ebuild
index b0a039003bd9..36b648b26489 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.46.5-r601.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.46.5-r601.ebuild
@@ -160,6 +160,9 @@ src_prepare() {
# https://bugs.gentoo.org/943213
eapply "${FILESDIR}"/2.44.4-fix-icu76.1.patch
+ # bug #959511 upstream https://bugs.webkit.org/show_bug.cgi?id=295472
+ eapply "${FILESDIR}"/2.46.5-EnumTraits.h-error-no-matching-function-for-call-to-.patch
+
# We don't want -Werror for gobject-introspection (bug #947761)
sed -i -e "s:--warn-error::" Source/cmake/FindGI.cmake || die
}
next reply other threads:[~2025-07-05 4:45 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-05 4:45 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-06 15:12 [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/ Michael Orlitzky
2024-11-11 23:33 Sam James
2024-10-27 12:47 Michael Orlitzky
2024-07-21 8:19 Pacho Ramos
2024-03-21 2:45 Sam James
2024-01-03 21:59 Mart Raudsepp
2023-12-24 15:54 Mart Raudsepp
2023-10-18 20:19 Mart Raudsepp
2023-05-30 17:16 Matt Turner
2023-05-18 14:41 Matt Turner
2023-04-05 23:21 Sam James
2023-04-02 0:57 Matt Turner
2023-03-30 16:38 Sam James
2022-12-04 19:42 Matt Turner
2022-09-13 17:56 Matt Turner
2022-04-20 2:33 Matt Turner
2022-01-10 23:48 Mart Raudsepp
2022-01-02 22:46 Mart Raudsepp
2021-08-04 22:36 Matt Turner
2021-02-20 9:44 Mart Raudsepp
2020-07-30 21:18 Mart Raudsepp
2020-05-12 15:53 Mart Raudsepp
2020-05-09 20:40 Mart Raudsepp
2020-02-17 21:54 Mart Raudsepp
2020-02-05 13:06 Mart Raudsepp
2020-01-02 16:47 Mart Raudsepp
2018-08-16 21:33 Mart Raudsepp
2017-06-01 13:30 Mart Raudsepp
2017-05-10 10:40 Mart Raudsepp
2017-04-08 22:00 Mart Raudsepp
2016-07-03 15:38 Pacho Ramos
2016-05-29 10:06 Pacho Ramos
2015-11-15 21:03 Pacho Ramos
2015-11-07 11:12 Pacho Ramos
2015-11-07 11:07 Pacho Ramos
2015-08-24 5:59 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1751690723.605ec04b0dffa45fe90f9a10146f5a68207f4e9a.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox