glade: 3.38.2 → 3.40.0

https://gitlab.gnome.org/GNOME/glade/-/compare/GLADE_3_38_2...GLADE_3_40_0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Jan Tojnar 2022-08-12 18:52:28 +00:00
parent 28f93b78b3
commit 8f66a751f2

View File

@ -2,7 +2,6 @@
, lib
, gettext
, fetchurl
, fetchpatch
, python3
, meson
, ninja
@ -25,29 +24,13 @@
stdenv.mkDerivation rec {
pname = "glade";
version = "3.38.2";
version = "3.40.0";
src = fetchurl {
url = "mirror://gnome/sources/glade/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1dxsiz9ahqkxg2a1dw9sbd8jg59y5pdz4c1gvnbmql48gmj8gz4q";
sha256 = "McmtrqhJlyq5UXtWThmsGZd8qXdYsQntwxZwCPU+PZw=";
};
patches = [
# Fix build with meson 0.61
# data/meson.build:4:5: ERROR: Function does not take positional arguments.
# Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/glade/-/commit/61304b2e8bac8ded76643cb7c3e781f73881dd2b.patch";
sha256 = "9x6RK8Wgnm8bDxeBLV3PlUkUuH2706Ba9kwE5S87DgE=";
})
# help/meson.build:6:6: ERROR: Tried to create target "help-glade-da-update-po", but a target of that name already exists.
# Taken from https://gitlab.gnome.org/GNOME/glade/-/merge_requests/117
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/glade/-/commit/04ba6f969f716fbfe3c7feb7e4bab8678cc1e9eb.patch";
sha256 = "j3XfF7P6rndL+0PWqnp+QYph7Ba6bgcp4Pkikr2wuJA=";
})
];
nativeBuildInputs = [
meson
ninja