diff options
| author |   Sam James <sam@gentoo.org> | 2022-01-25 01:53:25 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-01-25 01:53:25 +0000 |
| commit | 746282fdc63409415bfdf87c308a801cd601cc75 (patch) | |
| tree | beb03454a55136c4057bba73e030246cc34c3e3b /gnome-extra/gnome-calendar | |
| parent | dev-util/d-feet: fix build with meson 0.61 (diff) | |
| download | gentoo-746282fdc63409415bfdf87c308a801cd601cc75.tar.gz gentoo-746282fdc63409415bfdf87c308a801cd601cc75.tar.bz2 gentoo-746282fdc63409415bfdf87c308a801cd601cc75.zip | |
gnome-extra/gnome-calendar: fix build with meson 0.61
Closes: https://bugs.gentoo.org/831926
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'gnome-extra/gnome-calendar')
3 files changed, 30 insertions, 2 deletions
diff --git a/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch new file mode 100644 index 000000000000..ec5dc0fc6fca --- /dev/null +++ b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch @@ -0,0 +1,20 @@ +https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198.patch +https://bugs.gentoo.org/831926 + +From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex@linutronix.de> +Date: Fri, 21 Jan 2022 21:18:39 +0100 +Subject: [PATCH] meson.build: fix meson 0.61 builds + +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata_conf = configuration_data() + appdata_conf.set('appid', application_id) + appdata = i18n.merge_file( +- 'appdata', + input: configure_file( + input: files('org.gnome.Calendar.appdata.xml.in.in'), + output: 'org.gnome.Calendar.appdata.xml.in', +GitLab diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild index e0432410aee0..b011342f854b 100644 --- a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild +++ b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-40.2-meson-0.61.patch +) + src_test() { virtx meson_src_test } diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild index 4ccb6627d062..7045bd688f26 100644 --- a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild +++ b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -36,6 +36,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-40.2-meson-0.61.patch +) + src_test() { virtx meson_src_test } |