diff options
| author | Maxine Aubrey <max@ine.dev> | 2024-02-04 15:52:47 +0100 |
|---|---|---|
| committer | Maxine Aubrey <max@ine.dev> | 2024-02-04 16:45:04 +0100 |
| commit | ac193f068461eab2bac2e4c52f5fe73e08cf406e (patch) | |
| tree | 37cd029ca69834049a8fb276b0a1ef7f4edf4032 /pkgs/development/libraries/gtk | |
| parent | 57d0edd3cc6969780b980594504f84a864eeee34 (diff) | |
gtk4: 4.12.4 → 4.12.5
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.12.4...4.12.5 https://gitlab.gnome.org/GNOME/gtk/-/blob/4.12.5/NEWS
Diffstat (limited to 'pkgs/development/libraries/gtk')
| -rw-r--r-- | pkgs/development/libraries/gtk/4.x.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patch | 31 |
2 files changed, 2 insertions, 38 deletions
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 2d14823accf40..bd3b1165ef0bf 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { pname = "gtk4"; - version = "4.12.4"; + version = "4.12.5"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -80,14 +80,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "umfGSY5Vmfko7a+54IoyCt+qUKsvDab8arIlL8LVdSA="; + sha256 = "KLNW1ZDuaO9ibi75ggst0hRBSEqaBCpaPwxA6d/E9Pg="; }; - patches = [ - # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 - ./patches/4.0-fix-darwin-build.patch - ]; - depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patch b/pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patch deleted file mode 100644 index 01f4377aa0a7c..0000000000000 --- a/pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/gdk/macos/gdkmacospasteboard-private.h b/gdk/macos/gdkmacospasteboard-private.h -index fdeb936..c4b8666 100644 ---- a/gdk/macos/gdkmacospasteboard-private.h -+++ b/gdk/macos/gdkmacospasteboard-private.h -@@ -27,6 +27,10 @@ - - G_BEGIN_DECLS - -+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER -+typedef NSString *NSPasteboardType; -+#endif -+ - @interface GdkMacosPasteboardItemDataProvider : NSObject <NSPasteboardItemDataProvider> - { - GdkContentProvider *_contentProvider; -diff --git a/gdk/macos/gdkmacospasteboard.c b/gdk/macos/gdkmacospasteboard.c -index 66b3c9f..b9e0d8a 100644 ---- a/gdk/macos/gdkmacospasteboard.c -+++ b/gdk/macos/gdkmacospasteboard.c -@@ -400,7 +400,11 @@ _gdk_macos_pasteboard_register_drag_types (NSWindow *window) - gdk_content_formats_get_gtypes (formats, &n_gtypes); - - if (n_gtypes) -+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER - [ret addObject:NSPasteboardTypeURL]; -+#else -+ [ret addObject:[[NSString alloc] initWithUTF8String:"public.url"]]; -+#endif - - gdk_content_formats_unref (formats); - } |