Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8CBE784D82 for ; Wed, 20 Sep 2023 02:10:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id zo47a09I0dXO for ; Wed, 20 Sep 2023 02:10:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id F2DBF84D0E for ; Wed, 20 Sep 2023 02:10:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EC0F5FBDB; Wed, 20 Sep 2023 02:10:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169517585457740" MIME-Version: 1.0 Date: Wed, 20 Sep 2023 02:10:54 +0000 From: "matthew green" Subject: CVS commit: pkgsrc/x11/qt5-qtwebengine To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: mrg@netbsd.org X-Mailer: log_accum Message-Id: <20230920021054.EC0F5FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169517585457740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mrg Date: Wed Sep 20 02:10:54 UTC 2023 Modified Files: pkgsrc/x11/qt5-qtwebengine: distinfo Added Files: pkgsrc/x11/qt5-qtwebengine/patches: patch-src_3rdparty_chromium_third_party_skia_src_utils_SkParseColor.cpp Log Message: fix build with GCC 12. from upstream's upstream: https://chromium.googlesource.com/skia/+/cd397f3c4738beb6%5E%21/ To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/qt5-qtwebengine/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third_party_skia_src_utils_SkParseColor.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169517585457740 Content-Disposition: inline Content-Length: 2663 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt5-qtwebengine/distinfo diff -u pkgsrc/x11/qt5-qtwebengine/distinfo:1.15 pkgsrc/x11/qt5-qtwebengine/distinfo:1.16 --- pkgsrc/x11/qt5-qtwebengine/distinfo:1.15 Sun Aug 13 18:35:14 2023 +++ pkgsrc/x11/qt5-qtwebengine/distinfo Wed Sep 20 02:10:54 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2023/08/13 18:35:14 wiz Exp $ +$NetBSD: distinfo,v 1.16 2023/09/20 02:10:54 mrg Exp $ BLAKE2s (qtwebengine-everywhere-opensource-src-5.15.10.tar.xz) = 0801cd15847412f2316affd5a7cd4efe628abfb0e3251a9069184dde1b42ad5b SHA512 (qtwebengine-everywhere-opensource-src-5.15.10.tar.xz) = e35d0cab5f66a148420206616b3517e62b8320572beac53650096c0db58db8b4942d52a3abf4f0d6db1450de27befeb92f8b632c1277b0939464c1407a904b1b @@ -788,6 +788,7 @@ SHA1 (patch-src_3rdparty_chromium_third_ SHA1 (patch-src_3rdparty_chromium_third__party_webrtc_webrtc.gni) = 501ac49f4dd406057089ac65196a7c0eff2560c4 SHA1 (patch-src_3rdparty_chromium_third__party_zlib_BUILD.gn) = e841d76dc7417676844f5f089893275c906acbbf SHA1 (patch-src_3rdparty_chromium_third__party_zlib_cpu__features.c) = 2ae5c09b935a94fc50c052f199a945875d3d9127 +SHA1 (patch-src_3rdparty_chromium_third_party_skia_src_utils_SkParseColor.cpp) = 09e2a2144d6819e4ff4649dac3b4b198c3033f46 SHA1 (patch-src_3rdparty_chromium_tools_binary__size_BUILD.gn) = 1952774426515651e3f2797a296be102e9ef55b2 SHA1 (patch-src_3rdparty_chromium_tools_binary__size_libsupersize_caspian_BUILD.gn) = d5db9eae64c975ce7770b9e1f2b5578c7c4883b6 SHA1 (patch-src_3rdparty_chromium_tools_grit_BUILD.gn) = 85172e974e874b8e2ab9f47619faa2578f84bdc4 Added files: Index: pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third_party_skia_src_utils_SkParseColor.cpp diff -u /dev/null pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third_party_skia_src_utils_SkParseColor.cpp:1.1 --- /dev/null Wed Sep 20 02:10:54 2023 +++ pkgsrc/x11/qt5-qtwebengine/patches/patch-src_3rdparty_chromium_third_party_skia_src_utils_SkParseColor.cpp Wed Sep 20 02:10:54 2023 @@ -0,0 +1,18 @@ +$NetBSD: patch-src_3rdparty_chromium_third_party_skia_src_utils_SkParseColor.cpp,v 1.1 2023/09/20 02:10:54 mrg Exp $ + +Fix GCC 12 support, from upstream: + + https://chromium.googlesource.com/skia/+/cd397f3c4738beb6%5E%21/ + + +--- src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp.orig 2022-04-06 08:32:17.000000000 -0500 ++++ src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp 2023-09-19 17:23:45.603492707 -0500 +@@ -8,6 +8,8 @@ + + #include "include/utils/SkParse.h" + ++#include ++ + static constexpr const char* gColorNames[] = { + "aliceblue", + "antiquewhite", --_----------=_169517585457740--