| 1 |
commit: ac876c4e5a239a94e238a1a924de98487a939dc5 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 20 03:04:19 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 20 03:04:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac876c4e |
| 7 |
|
| 8 |
games-board/tali: fix build with meson 0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831461 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../tali/files/tali-40.4-meson-0.61-build.patch | 29 ++++++++++++++++++++++ |
| 14 |
games-board/tali/tali-40.4.ebuild | 6 ++++- |
| 15 |
2 files changed, 34 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/games-board/tali/files/tali-40.4-meson-0.61-build.patch b/games-board/tali/files/tali-40.4-meson-0.61-build.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..e5cfa34c3560 |
| 20 |
--- /dev/null |
| 21 |
+++ b/games-board/tali/files/tali-40.4-meson-0.61-build.patch |
| 22 |
@@ -0,0 +1,29 @@ |
| 23 |
+https://gitlab.gnome.org/GNOME/tali/-/merge_requests/14.patch |
| 24 |
+https://bugs.gentoo.org/831461 |
| 25 |
+ |
| 26 |
+From 79509bf3e9456f52d6ac87538700e3ac89db4006 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: rvalue <i@××××××.moe> |
| 28 |
+Date: Tue, 16 Nov 2021 05:56:26 +0000 |
| 29 |
+Subject: [PATCH] Remove incorrect i18n.merge_file argument |
| 30 |
+ |
| 31 |
+--- a/data/meson.build |
| 32 |
++++ b/data/meson.build |
| 33 |
+@@ -22,7 +22,7 @@ install_data ([ 'gnome-dice-1.svg', |
| 34 |
+ install_data (project_id + '.gschema.xml', |
| 35 |
+ install_dir: join_paths (datadir, 'glib-2.0', 'schemas')) |
| 36 |
+ |
| 37 |
+-desktop_file = i18n.merge_file ('desktop-file', |
| 38 |
++desktop_file = i18n.merge_file ( |
| 39 |
+ input: project_id + '.desktop.in', |
| 40 |
+ output: project_id + '.desktop', |
| 41 |
+ install: true, |
| 42 |
+@@ -41,7 +41,7 @@ if desktop_file_validate.found() |
| 43 |
+ ) |
| 44 |
+ endif |
| 45 |
+ |
| 46 |
+-appdata_file = i18n.merge_file ('appdata-file', |
| 47 |
++appdata_file = i18n.merge_file ( |
| 48 |
+ input: project_id + '.appdata.xml.in', |
| 49 |
+ output: project_id + '.appdata.xml', |
| 50 |
+ install: true, |
| 51 |
+GitLab |
| 52 |
|
| 53 |
diff --git a/games-board/tali/tali-40.4.ebuild b/games-board/tali/tali-40.4.ebuild |
| 54 |
index e944d0be9fd3..08ed71f85541 100644 |
| 55 |
--- a/games-board/tali/tali-40.4.ebuild |
| 56 |
+++ b/games-board/tali/tali-40.4.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2021 Gentoo Authors |
| 59 |
+# Copyright 1999-2022 Gentoo Authors |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
EAPI=7 |
| 63 |
@@ -28,6 +28,10 @@ BDEPEND=" |
| 64 |
virtual/pkgconfig |
| 65 |
" |
| 66 |
|
| 67 |
+PATCHES=( |
| 68 |
+ "${FILESDIR}"/${P}-meson-0.61-build.patch |
| 69 |
+) |
| 70 |
+ |
| 71 |
pkg_postinst() { |
| 72 |
xdg_pkg_postinst |
| 73 |
gnome2_schemas_update |
Archives