[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     4c3c5e81aa24f12b4d164c2f0634115c8b465a85
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Oct 22 23:12:45 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 15:57:40 2024 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4c3c5e81

dev-qt/qtwebengine: 5.15.14_p20240510 Fix template-id in ctor

Bug: https://bugs.gentoo.org/938685
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...5.15.14_p20240510-gcc15-template-id-cdtor.patch | 93 ++++++++++++++++++++++
 dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild |  1 +
 2 files changed, 94 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-template-id-cdtor.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-template-id-cdtor.patch
new file mode 100644
index 00000000..b1e14c5d
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-gcc15-template-id-cdtor.patch
@@ -0,0 +1,93 @@
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Wed, 23 Oct 2024 01:04:16 +0200
+Subject: template-id-cdtor
+
+warning: template-id not allowed for constructor in C++20 [-Wtemplate-id-cdtor]
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_concatenate.h
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_concatenate.h
+@@ -45,7 +45,7 @@ class StringTypeAdapter<char> {
+   DISALLOW_NEW();
+ 
+  public:
+-  explicit StringTypeAdapter<char>(char buffer) : buffer_(buffer) {}
++  explicit StringTypeAdapter(char buffer) : buffer_(buffer) {}
+ 
+   unsigned length() const { return 1; }
+   bool Is8Bit() const { return true; }
+@@ -62,7 +62,7 @@ class StringTypeAdapter<LChar> {
+   DISALLOW_NEW();
+ 
+  public:
+-  explicit StringTypeAdapter<LChar>(LChar buffer) : buffer_(buffer) {}
++  explicit StringTypeAdapter(LChar buffer) : buffer_(buffer) {}
+ 
+   unsigned length() const { return 1; }
+   bool Is8Bit() const { return true; }
+@@ -79,7 +79,7 @@ class StringTypeAdapter<UChar> {
+   DISALLOW_NEW();
+ 
+  public:
+-  explicit StringTypeAdapter<UChar>(UChar buffer) : buffer_(buffer) {}
++  explicit StringTypeAdapter(UChar buffer) : buffer_(buffer) {}
+ 
+   unsigned length() const { return 1; }
+   bool Is8Bit() const { return buffer_ <= 0xff; }
+@@ -100,7 +100,7 @@ class WTF_EXPORT StringTypeAdapter<char*> {
+   DISALLOW_NEW();
+ 
+  public:
+-  explicit StringTypeAdapter<char*>(char* buffer)
++  explicit StringTypeAdapter(char* buffer)
+       : StringTypeAdapter(buffer, strlen(buffer)) {}
+ 
+   unsigned length() const { return length_; }
+@@ -110,7 +110,7 @@ class WTF_EXPORT StringTypeAdapter<char*> {
+   void WriteTo(UChar* destination) const;
+ 
+  private:
+-  StringTypeAdapter<char*>(char* buffer, size_t length);
++  StringTypeAdapter(char* buffer, size_t length);
+ 
+   const char* buffer_;
+   unsigned length_;
+@@ -121,7 +121,7 @@ class WTF_EXPORT StringTypeAdapter<LChar*> {
+   DISALLOW_NEW();
+ 
+  public:
+-  explicit StringTypeAdapter<LChar*>(LChar* buffer);
++  explicit StringTypeAdapter(LChar* buffer);
+ 
+   unsigned length() const { return length_; }
+   bool Is8Bit() const { return true; }
+@@ -157,7 +157,7 @@ class WTF_EXPORT StringTypeAdapter<const char*> {
+   DISALLOW_NEW();
+ 
+  public:
+-  explicit StringTypeAdapter<const char*>(const char* buffer);
++  explicit StringTypeAdapter(const char* buffer);
+ 
+   unsigned length() const { return length_; }
+   bool Is8Bit() const { return true; }
+@@ -175,7 +175,7 @@ class WTF_EXPORT StringTypeAdapter<const LChar*> {
+   DISALLOW_NEW();
+ 
+  public:
+-  explicit StringTypeAdapter<const LChar*>(const LChar* buffer);
++  explicit StringTypeAdapter(const LChar* buffer);
+ 
+   unsigned length() const { return length_; }
+   bool Is8Bit() const { return true; }
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_operators.h
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/string_operators.h
+@@ -115,7 +115,7 @@ class StringTypeAdapter<StringAppend<StringType1, StringType2>> {
+   STACK_ALLOCATED();
+ 
+  public:
+-  StringTypeAdapter<StringAppend<StringType1, StringType2>>(
++  StringTypeAdapter(
+       const StringAppend<StringType1, StringType2>& buffer)
+       : buffer_(buffer) {}
+ 

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
index 22797c7a..3833e554 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14.9999.ebuild
@@ -103,6 +103,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.15.13_p20240510-gcc15.patch"
 	"${FILESDIR}/${PN}-5.15.14_p20240510-re2.patch" # bug 913923
 	"${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-cstdint.patch"
+	"${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-template-id-cdtor.patch"
 )
 
 python_check_deps() {