Commit 683aee27 authored by Jan Beich's avatar Jan Beich
Browse files

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
parent 52065730
......@@ -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 \
......
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,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment