Date: Mon, 24 Jan 2022 13:21:32 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: 683aee272ea8 - main - graphics/entangle: unbreak build with Meson 0.61.0 Message-ID: <202201241321.20ODLWK2063293@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=683aee272ea8309a83f48cdaa467cfcddb69a7b6 commit 683aee272ea8309a83f48cdaa467cfcddb69a7b6 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-01-24 13:00:21 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2022-01-24 13:21:07 +0000 graphics/entangle: unbreak build with Meson 0.61.0 src/meson.build:42:5: ERROR: Function does not take positional arguments. help/meson.build:23:6: ERROR: Program 'itstool' not found or not executable PR: 260943 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/61f2866a9fa1 Regressed by: https://github.com/mesonbuild/meson/commit/26c1869a142a --- graphics/entangle/Makefile | 3 ++- graphics/entangle/files/patch-src_meson.build | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/graphics/entangle/Makefile b/graphics/entangle/Makefile index 86c6eb4a413f..d09201921a2d 100644 --- a/graphics/entangle/Makefile +++ b/graphics/entangle/Makefile @@ -10,7 +10,8 @@ COMMENT= Digital camera tethered control and capture program LICENSE= GPLv3 -BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc +BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc \ + itstool:textproc/itstool LIB_DEPENDS= libgphoto2.so:graphics/libgphoto2 \ liblcms2.so:graphics/lcms2 \ libgexiv2.so:graphics/gexiv2 \ diff --git a/graphics/entangle/files/patch-src_meson.build b/graphics/entangle/files/patch-src_meson.build new file mode 100644 index 000000000000..5d1ab9acdd24 --- /dev/null +++ b/graphics/entangle/files/patch-src_meson.build @@ -0,0 +1,24 @@ +https://gitlab.com/entangle/entangle/-/commit/54795d275a93 + +src/meson.build:42:5: ERROR: Function does not take positional arguments. + +--- src/meson.build.orig 2017-10-10 21:07:59 UTC ++++ src/meson.build +@@ -40,7 +40,7 @@ entangle = executable( + desktop = 'entangle.desktop' + + i18n.merge_file ( +- desktop, ++ data_dirs: desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -52,7 +52,7 @@ i18n.merge_file ( + appdata = 'entangle.appdata.xml' + + i18n.merge_file( +- appdata, ++ data_dirs: appdata, + input: appdata + '.in', + output: appdata, + install: true,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201241321.20ODLWK2063293>