gtk4: 4.10.4 → 4.12.0

bobby285271 · bobby285271 · commit 822896ad311a · 2023-09-05T22:36:41.000+08:00
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.10.4...4.12.0 New build-aux/meson/gen-visibility-macros.py: GNOME/gtk@4d1f7a4 docs build options renamed: GNOME/gtk@6af55a3
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
@@ -2,6 +2,7 @@
 , stdenv
 , substituteAll
 , fetchurl
+, fetchpatch
 , pkg-config
 , gettext
 , graphene
@@ -64,7 +65,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gtk4";
-  version = "4.10.4";
+  version = "4.12.0";
 
   outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
   outputBin = "dev";
@@ -76,12 +77,19 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
-    sha256 = "dyVABILgaF4oJl4ibGKEf05zz8qem0FqxYOCB/U3eiQ=";
+    sha256 = "ptEIKfQFsa/Atl4qlkLAQSah0bY40Rxtl0JtpPhPH28=";
   };
 
   patches = [
     # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486
     ./patches/4.0-fix-darwin-build.patch
+
+    # Fixes "undefined symbol: gtk_printer_option_set"
+    # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6250
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/4d7277f72c8f4915f237e36982ffd7dfba524b15.patch";
+      sha256 = "nLNvrfrgF/Ssr2XUQDV8Qbszw5OUA4CnkZ6okrSlzOc=";
+    })
   ];
 
   depsBuildBuild = [
@@ -163,7 +171,7 @@ stdenv.mkDerivation rec {
 
   mesonFlags = [
     # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found
-    "-Dgtk_doc=${lib.boolToString x11Support}"
+    "-Ddocumentation=${lib.boolToString x11Support}"
     "-Dbuild-tests=false"
     "-Dtracker=${if trackerSupport then "enabled" else "disabled"}"
     "-Dbroadway-backend=${lib.boolToString broadwaySupport}"
@@ -192,6 +200,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     files=(
       build-aux/meson/gen-demo-header.py
+      build-aux/meson/gen-visibility-macros.py
       demos/gtk-demo/geninclude.py
       gdk/broadway/gen-c-array.py
       gdk/gen-gdk-gresources-xml.py
