forked from pool/gnome-2048
Bjørn Lie
1a81470e07
- Add 21.patch: Fix build with meson 0.61 and newer. - Add desktop-file-utils and replace erronus appstream-glib-devel with appstream-glib BuildRequires, and add a check section and meson_test macro, run tests during build. - Drop update-desktop-files BuildRequires and macro, no longer needed. OBS-URL: https://build.opensuse.org/request/show/953276 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-2048?expand=0&rev=57
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
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.
|
|
---
|
|
data/meson.build | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/data/meson.build b/data/meson.build
|
|
index 33f73ca..8974a63 100644
|
|
--- 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
|
|
|