Unverified Commit 1c54fb7d authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #287423 from orivej/qtwebkit 

qt5.qtwebkit: fix build with GCC13 and libxml 2.12
parents 6fa1b735 2ad2987a

pkgs/development/libraries/qt-5/5.15/default.nix

+6 −0
Original line number Diff line number Diff line
@@ -211,8 +211,14 @@ let 
        url = "https://github.com/qtwebkit/qtwebkit/commit/5c272a21e621a66862821d3ae680f27edcc64c19.patch";

        sha256 = "9hjqLyABz372QDgoq7nXXXQ/3OXBGcYN1/92ekcC3WE=";

      })

      (fetchpatch {

        name = "qtwebkit-libxml2-api-change.patch";

        url = "https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch";

        sha256 = "WZEj+UuKhgJBM7auhND3uddk1wWdTY728jtiWVe7CSI=";

      })

      ./qtwebkit.patch

      ./qtwebkit-icu68.patch

      ./qtwebkit-cstdint.patch

    ] ++ lib.optionals stdenv.isDarwin [

      ./qtwebkit-darwin-no-readline.patch

      ./qtwebkit-darwin-no-qos-classes.patch

pkgs/development/libraries/qt-5/5.15/qtwebkit-cstdint.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
diff -up qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h

--- qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h.me	2023-02-20 15:40:04.045911245 +0100

+++ qtwebkit-5.212.0-alpha4/Source/ThirdParty/ANGLE/src/common/mathutil.h	2023-02-20 15:40:39.038549787 +0100

@@ -16,6 +16,7 @@

 #include <algorithm>

 #include <string.h>

 #include <stdlib.h>

+#include <cstdint>

 

 namespace gl

 {