| 1 |
commit: 746282fdc63409415bfdf87c308a801cd601cc75 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 25 01:53:25 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 25 01:53:25 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746282fd |
| 7 |
|
| 8 |
gnome-extra/gnome-calendar: fix build with meson 0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831926 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/gnome-calendar-40.2-meson-0.61.patch | 20 ++++++++++++++++++++ |
| 14 |
.../gnome-calendar/gnome-calendar-40.2.ebuild | 6 +++++- |
| 15 |
.../gnome-calendar/gnome-calendar-41.2.ebuild | 6 +++++- |
| 16 |
3 files changed, 30 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..ec5dc0fc6fca |
| 21 |
--- /dev/null |
| 22 |
+++ b/gnome-extra/gnome-calendar/files/gnome-calendar-40.2-meson-0.61.patch |
| 23 |
@@ -0,0 +1,20 @@ |
| 24 |
+https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/198.patch |
| 25 |
+https://bugs.gentoo.org/831926 |
| 26 |
+ |
| 27 |
+From e35dbc1acd03dd1751b755b6c8e1932a692ad4e1 Mon Sep 17 00:00:00 2001 |
| 28 |
+From: Alexander Kanavin <alex@××××××××××.de> |
| 29 |
+Date: Fri, 21 Jan 2022 21:18:39 +0100 |
| 30 |
+Subject: [PATCH] meson.build: fix meson 0.61 builds |
| 31 |
+ |
| 32 |
+Signed-off-by: Alexander Kanavin <alex@××××××××××.de> |
| 33 |
+--- a/data/appdata/meson.build |
| 34 |
++++ b/data/appdata/meson.build |
| 35 |
+@@ -1,7 +1,6 @@ |
| 36 |
+ appdata_conf = configuration_data() |
| 37 |
+ appdata_conf.set('appid', application_id) |
| 38 |
+ appdata = i18n.merge_file( |
| 39 |
+- 'appdata', |
| 40 |
+ input: configure_file( |
| 41 |
+ input: files('org.gnome.Calendar.appdata.xml.in.in'), |
| 42 |
+ output: 'org.gnome.Calendar.appdata.xml.in', |
| 43 |
+GitLab |
| 44 |
|
| 45 |
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild |
| 46 |
index e0432410aee0..b011342f854b 100644 |
| 47 |
--- a/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild |
| 48 |
+++ b/gnome-extra/gnome-calendar/gnome-calendar-40.2.ebuild |
| 49 |
@@ -1,4 +1,4 @@ |
| 50 |
-# Copyright 1999-2021 Gentoo Authors |
| 51 |
+# Copyright 1999-2022 Gentoo Authors |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
|
| 54 |
EAPI=7 |
| 55 |
@@ -36,6 +36,10 @@ BDEPEND=" |
| 56 |
virtual/pkgconfig |
| 57 |
" |
| 58 |
|
| 59 |
+PATCHES=( |
| 60 |
+ "${FILESDIR}"/${PN}-40.2-meson-0.61.patch |
| 61 |
+) |
| 62 |
+ |
| 63 |
src_test() { |
| 64 |
virtx meson_src_test |
| 65 |
} |
| 66 |
|
| 67 |
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild |
| 68 |
index 4ccb6627d062..7045bd688f26 100644 |
| 69 |
--- a/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild |
| 70 |
+++ b/gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild |
| 71 |
@@ -1,4 +1,4 @@ |
| 72 |
-# Copyright 1999-2021 Gentoo Authors |
| 73 |
+# Copyright 1999-2022 Gentoo Authors |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
EAPI=7 |
| 77 |
@@ -36,6 +36,10 @@ BDEPEND=" |
| 78 |
virtual/pkgconfig |
| 79 |
" |
| 80 |
|
| 81 |
+PATCHES=( |
| 82 |
+ "${FILESDIR}"/${PN}-40.2-meson-0.61.patch |
| 83 |
+) |
| 84 |
+ |
| 85 |
src_test() { |
| 86 |
virtx meson_src_test |
| 87 |
} |
Archives