From fb89ed36816388e7e2b05e9c20eb1175f25e8391 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 11 Aug 2025 14:22:08 +0100
Subject: [PATCH] libsForQt5.qtwebengine: bump LLVM to 19
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nobody is going to fix the warnings because it’s unmaintained
and silencing them won’t make them go away. This will be marked
`knownVulnerabilities` soon enough, too.

We don’t need `overrideLibcxx` because LLVM 19 is currently the
default and we’ll switch to the system C++ library on Darwin when
bumping it.
---
 pkgs/development/libraries/qt-5/5.15/default.nix | 16 ++++------------
 pkgs/top-level/all-packages.nix                  |  3 +--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 47aa2b0e4172..38ecd3c90947 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -26,8 +26,7 @@
   gst-plugins-base,
   gtk3,
   dconf,
-  llvmPackages_15,
-  overrideLibcxx,
+  llvmPackages_19,
   darwin,
 
   # options
@@ -328,16 +327,9 @@ let
       qtwayland = callPackage ../modules/qtwayland.nix { };
       qtwebchannel = callPackage ../modules/qtwebchannel.nix { };
       qtwebengine = callPackage ../modules/qtwebengine.nix {
-        # The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due
-        # to the following errors:
-        # * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned
-        #   to be made into a hard error in a future version of clang. Patches are not available for
-        #   the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial.
-        # * -Wincompatible-function-pointer-types: This is also a downgradable error generated
-        #   starting with clang 16. Patches are available upstream that can be backported.
-        # Because the first error is non-trivial to fix and suppressing it risks future breakage,
-        # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary.
-        stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv;
+        # Won’t build with Clang 20, as `-Wenum-constexpr-conversion`
+        # was made a hard error.
+        stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv;
         inherit (srcs.qtwebengine) version;
         inherit (darwin) bootstrap_cmds;
         python = python3;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0079a97b32ea..88ffbcde7b7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9099,8 +9099,7 @@ with pkgs;
         perl
         gtk3
         python3
-        llvmPackages_15
-        overrideLibcxx
+        llvmPackages_19
         darwin
         ;
       inherit (__splicedPackages.gst_all_1) gstreamer gst-plugins-base;