Date: Sun, 23 Jan 2022 11:08:44 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1cb23daf73b1 - main - deskutils/gnome-characters: unbreak build with Meson 0.61.0 Message-ID: <202201231108.20NB8iTR043578@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1cb23daf73b17f71a7181777fc177436314554b0 commit 1cb23daf73b17f71a7181777fc177436314554b0 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-01-23 11:07:34 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-01-23 11:08:35 +0000 deskutils/gnome-characters: unbreak build with Meson 0.61.0 data/meson.build:49:5: ERROR: Function does not take positional arguments. PR: 260943 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/61f2866a9fa1 --- .../gnome-characters/files/patch-data_meson.build | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/deskutils/gnome-characters/files/patch-data_meson.build b/deskutils/gnome-characters/files/patch-data_meson.build new file mode 100644 index 000000000000..69d859426b08 --- /dev/null +++ b/deskutils/gnome-characters/files/patch-data_meson.build @@ -0,0 +1,22 @@ +https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3b84cc750b70 + +data/meson.build:49:5: ERROR: Function does not take positional arguments. + +--- data/meson.build.orig 2021-09-21 13:39:34 UTC ++++ data/meson.build +@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id) + desktop_conf.set('bindir', characters_bindir) + + i18n.merge_file( +- 'desktop-file', + type: 'desktop', + input: configure_file ( + input: characters_name + '.desktop.in', +@@ -61,7 +60,6 @@ i18n.merge_file( + ) + + appdata_file = i18n.merge_file( +- 'appdata-file', + input: characters_name + '.appdata.xml.in', + output: characters_application_id + '.appdata.xml', + po_dir: po_dir,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201231108.20NB8iTR043578>