summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/gnome2048/files/gnome2048-3.38.2-meson-0.61.patch31
-rw-r--r--games-puzzle/gnome2048/gnome2048-3.38.2.ebuild6
2 files changed, 36 insertions, 1 deletions
diff --git a/games-puzzle/gnome2048/files/gnome2048-3.38.2-meson-0.61.patch b/games-puzzle/gnome2048/files/gnome2048-3.38.2-meson-0.61.patch
new file mode 100644
index 000000000000..749b8e04d674
--- /dev/null
+++ b/games-puzzle/gnome2048/files/gnome2048-3.38.2-meson-0.61.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/gnome-2048/-/merge_requests/21.patch
+https://bugs.gentoo.org/831748
+
+From 194e22699f7166a016cd39ba26dd719aeecfc868 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sun, 23 Jan 2022 10:49:07 +0000
+Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
+
+Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
+
+data/meson.build:19:0: ERROR: Function does not take positional arguments.
+data/meson.build:39:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -17,7 +17,6 @@ install_data(
+
+ # Desktop file
+ desktop_file = i18n.merge_file(
+- 'desktop-file',
+ input: 'org.gnome.TwentyFortyEight.desktop.in',
+ output: 'org.gnome.TwentyFortyEight.desktop',
+ install: true,
+@@ -37,7 +36,6 @@ endif
+
+ # AppData file
+ appdata_file = i18n.merge_file(
+- 'appdata-file',
+ input: 'org.gnome.TwentyFortyEight.appdata.xml.in',
+ output: 'org.gnome.TwentyFortyEight.appdata.xml',
+ install: true,
+GitLab
diff --git a/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild b/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
index 7b0f85ac85ae..8e058dd8bbf0 100644
--- a/games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
+++ b/games-puzzle/gnome2048/gnome2048-3.38.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
@@ -31,6 +31,10 @@ BDEPEND="
$(vala_depend)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.38.2-meson-0.61.patch
+)
+
src_prepare() {
xdg_src_prepare
vala_src_prepare