From bf072fcfb18dfa81f853b4adc96e6c45694230e9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 12 Mar 2019 15:49:12 -0500
Subject: [PATCH] gtk3: 3.24.5 -> 3.24.7

http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.6.news
http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.7.news

Export symbols patch "actually" seems
to no longer be required, drop it.
---
 pkgs/development/libraries/gtk+/3.x.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 19abca1cabb6..1a01c28aeb4b 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,14 +13,14 @@ assert cupsSupport -> cups != null;
 with stdenv.lib;
 
 let
-  version = "3.24.5";
+  version = "3.24.7";
 in
 stdenv.mkDerivation rec {
   name = "gtk+3-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "0bxhvnixc1hjxbzx063lghmix0wmv282khsqmckdxhrb606zpr8b";
+    sha256 = "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj";
   };
 
   outputs = [ "out" "dev" ];
@@ -35,18 +35,6 @@ stdenv.mkDerivation rec {
       url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123";
       sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
     })
-    (fetchpatch {
-      name = "fix-fribidi-linking.patch";
-      url = https://github.com/gnome/gtk/compare/3.24.5..47e4a111c2666961ab47b6df48460d3c9075d92d.patch;
-      sha256 = "0ky4kmgcywg0qlwndn9aw083bkwnkr49bnlsz0ii93fxzvbiqglr";
-    })
-    (fetchpatch {
-      # https://gitlab.gnome.org/GNOME/gtk/merge_requests/505 already merged
-      # but isn't in 3.24.5
-      name = "export-missing-symbols.patch";
-      url = https://gitlab.gnome.org/GNOME/gtk/commit/95c0f07295fd300ab7f3416a39290ae33585ea6c.patch;
-      sha256 = "0z9w7f39xcn1cbcd8jhx731vq64nvi5q6kyc86bq8r00daysjwnl";
-    })
   ] ++ optionals stdenv.isDarwin [
     # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
     # let’s drop that dependency in similar way to how other parts of the library do it