gtk3: 3.24.31 → 3.24.33

https://gitlab.gnome.org/GNOME/gtk+/-/compare/3.24.31...3.24.33
This commit is contained in:
Jan Tojnar 2022-03-15 20:30:52 +00:00
parent 07bd942158
commit 71fd4d8688

View File

@ -2,7 +2,6 @@
, stdenv , stdenv
, substituteAll , substituteAll
, fetchurl , fetchurl
, fetchpatch
, pkg-config , pkg-config
, gettext , gettext
, docbook-xsl-nons , docbook-xsl-nons
@ -60,7 +59,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gtk+3"; pname = "gtk+3";
version = "3.24.31"; version = "3.24.33";
outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
outputBin = "dev"; outputBin = "dev";
@ -72,7 +71,7 @@ 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 = "sha256-Qjw+f9tMRZ7oieNf1Ncf0mI1YlQcEEGxHAflrR/xC/k="; sha256 = "sha256-WIsGUi4l0VeemJtvnYob2/L+E83gGgTpBP80aiJeeAE=";
}; };
patches = [ patches = [
@ -84,12 +83,6 @@ stdenv.mkDerivation rec {
# e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 # 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 # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536
./patches/3.0-darwin-x11.patch ./patches/3.0-darwin-x11.patch
# 3.24.31 does not declare QuartzCore dependency properly and fails to link
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/0ac61443694b477c41fc246cb387ef86aba441de.patch";
sha256 = "sha256-KaMeIdV/gfM4xzN9lIkY99E7bzAfTM6VETk5DEunB2w=";
})
]; ];
nativeBuildInputs = [ nativeBuildInputs = [