From 82fd432bad31cbb38a86967a977d8aa51ca77e29 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:35:12 +0100 Subject: [PATCH] shotwell: fix for meson 0.61 --- srcpkgs/shotwell/patches/meson-0.61.patch | 27 +++++++++++++++++++++++ srcpkgs/shotwell/template | 1 + 2 files changed, 28 insertions(+) create mode 100644 srcpkgs/shotwell/patches/meson-0.61.patch diff --git a/srcpkgs/shotwell/patches/meson-0.61.patch b/srcpkgs/shotwell/patches/meson-0.61.patch new file mode 100644 index 0000000000..f33fa2af16 --- /dev/null +++ b/srcpkgs/shotwell/patches/meson-0.61.patch @@ -0,0 +1,27 @@ +From cc328b43ebb9a54a256ec73a86fb18381b2038e6 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz +Date: Tue, 11 Jan 2022 21:57:26 -0500 +Subject: [PATCH] fix duplicate languages causing meson 0.61 to error out + +It tried to create multiple targets with the same name and generating +the same file. On older versions of meson, this was a run_target and +just ran twice, but was still wrong. +--- + help/LINGUAS | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/help/LINGUAS b/help/LINGUAS +index 68f089c4..5352eecd 100644 +--- a/help/LINGUAS ++++ b/help/LINGUAS +@@ -6,7 +6,6 @@ es + fr + hu + id +-id + lv + pt_BR + sv +-- +GitLab + diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index b0c1878e31..386644d493 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -14,6 +14,7 @@ short_desc="Open source photo manager for GNOME" maintainer="Enno Boland " license="LGPL-2.1-or-later, CC-BY-SA-3.0" homepage="https://wiki.gnome.org/Apps/Shotwell" +changelog="https://gitlab.gnome.org/GNOME/shotwell/-/raw/master/NEWS" distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz" checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2 lib32disabled=yes