gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtk4: 4.12.4 → 4.12.5

Browse Source 
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.12.4...4.12.5
https://gitlab.gnome.org/GNOME/gtk/-/blob/4.12.5/NEWS
This commit is contained in:
Maxine Aubrey
2024-02-04 16:45:04 +01:00
parent 57d0edd3cc
commit ac193f0684
2 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/gtk/4.x.nix
+2 -7
View File
@@ -68,7 +68,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtk4"; pname = "gtk4";
version = "4.12.4"; version = "4.12.5";
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
outputBin = "dev"; outputBin = "dev";
@@ -80,14 +80,9 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; 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 = [ depsBuildBuild = [
pkg-config pkg-config
]; ];
pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patch
-31
View File
@@ -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);
}