Date: Sun, 23 Jan 2022 09:26:30 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: d1f2ea461830 - main - x11/tilix: unbreak build with Meson 0.61.0 Message-ID: <202201230926.20N9QUNh008088@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=d1f2ea4618304d5015d452838a57a72e7d3aeedf commit d1f2ea4618304d5015d452838a57a72e7d3aeedf Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-01-23 09:13:04 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-01-23 09:26:15 +0000 x11/tilix: unbreak build with Meson 0.61.0 data/meson.build:13:0: ERROR: Function does not take positional arguments. PR: 260943 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/61f2866a9fa1 --- x11/tilix/files/patch-data_meson.build | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/x11/tilix/files/patch-data_meson.build b/x11/tilix/files/patch-data_meson.build index 9cf8458dceaf..9ee96ba411a5 100644 --- a/x11/tilix/files/patch-data_meson.build +++ b/x11/tilix/files/patch-data_meson.build @@ -1,6 +1,17 @@ +https://github.com/gnunn1/tilix/pull/2074 +https://github.com/gnunn1/tilix/pull/2081 + --- data/meson.build.orig 2021-12-27 19:49:46 UTC +++ data/meson.build -@@ -35,25 +35,25 @@ endif +@@ -11,7 +11,6 @@ install_data( + + # Install the desktop file + desktop_file = i18n.merge_file( +- '@0@.desktop'.format(project_id), + output: '@BASENAME@', + input: 'pkg/desktop/@0@.desktop.in'.format(project_id), + po_dir: meson.source_root() / 'po', +@@ -35,25 +34,24 @@ endif # Merge release information into MetaInfo file tilix_metainfo_name = '@0@.appdata.xml'.format(project_id) @@ -17,9 +28,9 @@ -# Install the MetaInfo file -metainfo_file = i18n.merge_file( +- tilix_metainfo_name, + # Install the MetaInfo file + metainfo_file = i18n.merge_file( - tilix_metainfo_name, output: tilix_metainfo_name, input: metainfo_with_releases, po_dir: meson.source_root() / 'po',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201230926.20N9QUNh008088>