1
0
Bjørn Lie 2023-04-26 09:51:58 +00:00 committed by Git OBS Bridge
parent d45ddbf27a
commit b262476f69
2 changed files with 11 additions and 5 deletions

View File

@ -1,4 +1,4 @@
From 7604f8c8311f1088293596e639fefafdbeb73235 Mon Sep 17 00:00:00 2001
From a2037b0747163601a5d5b57856d037eecf3a4db7 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 24 Jan 2022 11:22:48 +0000
Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
@ -12,18 +12,18 @@ data/meson.build:45:0: ERROR: Function does not take positional arguments.
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 8325c1b..063e839 100644
index 8740503..edb8583 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -22,7 +22,6 @@ install_data ('smooth.png', install_dir: join_paths (pkgdatadir, 'themes'))
install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
@@ -21,7 +21,6 @@ install_data ('edu_kang_xi.png', install_dir: join_paths (pkgdatadir, 'themes'))
install_data ('maya.png', install_dir: join_paths (pkgdatadir, 'themes'))
desktop_file = i18n.merge_file (
- 'desktop-file',
input: 'org.gnome.Mahjongg.desktop.in',
output: 'org.gnome.Mahjongg.desktop',
install: true,
@@ -42,7 +41,7 @@ if desktop_file_validate.found()
@@ -41,7 +40,7 @@ if desktop_file_validate.found()
)
endif

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Apr 26 09:50:24 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Redownload 26.patch from upstream, changed since it is now
checked-in upstream, and we added pre check-in.
-------------------------------------------------------------------
Wed Apr 26 09:03:28 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>