gtk3: 3.24.18 → 3.24.20

https://gitlab.gnome.org/GNOME/gtk/blob/db39ce2b1699acaf5d0ba160cf7cc68ccf6e16d6/NEWS#L1-38

Also switch to a merged pkg-config patch and add a patch comment.

2 files changed, 14 insertions, 34 deletions

diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index a3fe432017c..1e618730cd8 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -48,7 +48,7 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "gtk+3";
-  version = "3.24.18";
+  version = "3.24.20";
 
   outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc";
   outputBin = "dev";
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "1lia2ybd1661j6mvrc00iyd50gm7sy157bdzlyf4mr028rzzzspm";
+    sha256 = "Laxp9xbo0EunqVCRWJ4rquyV3KzpMssVg5Fj20ebHfM=";
   };
 
   patches = [
@@ -71,12 +71,17 @@ stdenv.mkDerivation rec {
       sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p";
     })
 
-    # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
-    ./patches/01-build-Fix-path-handling-in-pkgconfig.patch
+    # Fix path handling in pkg-config
+    # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch";
+      sha256 = "QHseZWgPlZBDEM2dIVixUJkGZMCaYjahkLmSCqCcoWU=";
+    })
   ] ++ 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
     # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33
+    # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536
     ./patches/3.0-darwin-x11.patch
   ];
 
@@ -92,6 +97,11 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
 
   postPatch = ''
+    # TODO: Remove in 3.24.21
+    # https://gitlab.gnome.org/GNOME/gtk/issues/2669
+    echo "${stdenv.shell}" > check-version.py
+    chmod +x check-version.py
+
     files=(
       build-aux/meson/post-install.py
       demos/gtk-demo/geninclude.py
diff --git a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch
deleted file mode 100644
index ec69a12514f..00000000000
--- a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001
-From: worldofpeace <worldofpeace@protonmail.ch>
-Date: Fri, 19 Jul 2019 13:32:57 -0400
-Subject: [PATCH] build: Fix path handling in pkgconfig
-
----
- meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 36913b3f04..161b378ba5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -834,10 +834,10 @@ configure_file(input: 'config.h.meson',
- # pkg-config files - bit of a mess all of this
- pkgconf = configuration_data()
- 
--pkgconf.set('prefix', get_option('prefix'))
-+pkgconf.set('prefix', gtk_prefix)
- pkgconf.set('exec_prefix', '${prefix}')
--pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
--pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-+pkgconf.set('libdir', gtk_libdir)
-+pkgconf.set('includedir', join_paths('${prefix}', gtk_includedir))
- pkgconf.set('GTK_API_VERSION', gtk_api_version)
- pkgconf.set('VERSION', meson.project_version())
- pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version)
--- 
-2.22.0
-