Skip to content

Commit

Permalink
games-puzzle/gnome-tetravex: fix build with meson 0.61
Browse files Browse the repository at this point in the history
Closes: https://bugs.gentoo.org/831493
Signed-off-by: Sam James <[email protected]>
  • Loading branch information
thesamesam committed Jan 25, 2022
1 parent f13a9b4 commit 7a7df12
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20.patch
https://bugs.gentoo.org/831493

From 80912d06f5e588f6aca966fa516103275e58d94e Mon Sep 17 00:00:00 2001
From: Jan Beich <[email protected]>
Date: Mon, 24 Jan 2022 11:48:22 +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:37:0: ERROR: Function does not take positional arguments.
data/meson.build:59:0: ERROR: Function does not take positional arguments.
--- a/data/meson.build
+++ b/data/meson.build
@@ -34,7 +34,7 @@ endif

# Desktop file
if get_option('build_gui')
- desktop_file = i18n.merge_file ('desktop-file',
+ desktop_file = i18n.merge_file (
input: project_id + '.desktop.in',
output: project_id + '.desktop',
install: true,
@@ -56,7 +56,7 @@ endif

# AppData file
if get_option('build_gui')
- appdata_file = i18n.merge_file ('appdata-file',
+ appdata_file = i18n.merge_file (
input: project_id + '.appdata.xml.in',
output: project_id + '.appdata.xml',
install: true,
GitLab
4 changes: 4 additions & 0 deletions games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ BDEPEND="
virtual/pkgconfig
"

PATCHES=(
"${FILESDIR}"/${PN}-3.38.2-meson-0.61.patch
)

src_prepare() {
xdg_src_prepare
vala_src_prepare
Expand Down

0 comments on commit 7a7df12

Please sign in to comment.