From 52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 10 Feb 2022 01:01:21 +0000
Subject: [PATCH] webkitgtk: revert "pull upstream fix for gcc-12" (#158814)

`nixpkgs/master` contains `2.34.5` version with patches applied.
Merge of `master` into `staging-next` causes `webkitgtk` to fail
to apply patches twice.

This reverts commit a74a1f32517b61107bd28f3b54cd49a6fc8db82c to
ease `master` merging.
---
 .../libraries/webkitgtk/default.nix           | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index ad8711cb9dd3..e9026d46bc69 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,7 +1,6 @@
 { lib, stdenv
 , runCommand
 , fetchurl
-, fetchpatch
 , perl
 , python3
 , ruby
@@ -83,30 +82,6 @@ stdenv.mkDerivation rec {
       inherit (addOpenGLRunpath) driverLink;
     })
     ./libglvnd-headers.patch
-
-    # Pull upstream patches for missing includes on gcc-12:
-    #  https://trac.webkit.org/changeset/288379/webkit
-    (fetchpatch {
-      name = "exchange-gcc-12.patch";
-      url  = "https://github.com/WebKit/WebKit/commit/198b392130b8dd625f4d5d36e652954eececb16b.patch";
-      excludes = [
-        "Source/JavaScriptCore/ChangeLog"
-        "Source/WTF/ChangeLog"
-        "Source/WebCore/ChangeLog"
-        "Tools/ChangeLog"
-
-        "Tools/ImageDiff/ImageDiff.cpp"
-      ];
-      sha256 = "sha256-D+wxfM8AEMBfvpghrwa5v9cYLyK5+Sab3J0RE/xVar8=";
-    })
-    (fetchpatch {
-      name = "string-gcc-12.patch";
-      url  = "https://github.com/WebKit/WebKit/commit/4e3fade6bd89347e041a1938d4ea85fee14e5534.patch";
-      excludes = [
-        "Source/WTF/ChangeLog"
-      ];
-      sha256 = "sha256-NPqZLfMUR6InQuqfVwNoZwuM3Jtbz5KAbm9SUBaprmc=";
-    })
   ];
 
   preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''