From nobody Mon Jan 24 13:21:32 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C850F1968B0A; Mon, 24 Jan 2022 13:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jj9cH1gMhz4Yfc; Mon, 24 Jan 2022 13:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643030495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4mxNpD+9u9gZ9o4cnMHcT6eaCVccK5ku9lgyzDbfyk=; b=iZyYfeugbwJOaHcuTSWs20WjuaHZu92Tzx/FWeOuKP+Zbir0j1zhIT1lpwokCj24AQWM76 noxpWZmFay/KN6MGEh5CbbG2zmjXfMqKIrV8/PTf2kDoCcnt+ETou6tWbkuv3sY7TakS2K zJ+1hNjlH9GCI5G479YUfrAOk+s7itH1B6GGFuVxTiUNAihi4+/gArknK+Lb004BD43wR7 IOUWAZ2gy2Y/KUrNhr5jZdECE9MoADBZ0HlSPHrYaQrBPeBlUiRAu9EQvJYr9YPEjvU2AD pTtEbDMRDmsV/aBMf0srZqwsYtKpI+InrU2Q/DktdVte3DTkwrDikBsOsvm1YA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EEB7316A9D; Mon, 24 Jan 2022 13:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20ODLWk2063294; Mon, 24 Jan 2022 13:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ODLWK2063293; Mon, 24 Jan 2022 13:21:32 GMT (envelope-from git) Date: Mon, 24 Jan 2022 13:21:32 GMT Message-Id: <202201241321.20ODLWK2063293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 683aee272ea8 - main - graphics/entangle: unbreak build with Meson 0.61.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 683aee272ea8309a83f48cdaa467cfcddb69a7b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643030495; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4mxNpD+9u9gZ9o4cnMHcT6eaCVccK5ku9lgyzDbfyk=; b=Yn2mWhSUznOmH+r0yrIzJQQMrso4wT6cvuPdU1SrD3W+zu13bG1EwQyzoEBKV5F5F6ZJoE +e+3/M41wZrbAMVlhBTefP1mgKRyfwoTJT0EzdBYhYVjMVpo0SeTP5lDpV+Uephms/0Bp3 gPlmefpGffT3Pu7DzduKhoCjE3vhxegrezXzyZ/JSHI5ixVKAMfyedkdjXnp3P73gjO6ur MS5EEJi8pL0egaxCEA0ffceTBO+2aH/POBFT8pww/WydzzNcdpO/zBAaQgZ+IjaqvBpWhK TOcgMbAYuSF2aQSPbGkZdgwEhnqBu7nViFXf+HLJIF+OHOjySEd54DPjlscZkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643030495; a=rsa-sha256; cv=none; b=FXmmnAWld1/J5IR7Ulrej5QZEsXEpPd77Iz4NVJ+ZcjT3MJf2j2GlZ7BoaxZTUkotPEcbE /lr0SIDKRUVhx0vyoMTikV7WcUZn/ITqWh2RadZMwjIWcNTkPIBfH6eVwx3c2RDVrIc8CQ pmk+D6cplcTZd1drjeRQhjXcuS/lhOXA0ed4TQkxTGotFmq12Kkc+QGnRed5cmm+8ykKnF DvtaBusrJ2ig89e4ZPXUtuqD4C2Sy2sDI/gbSCo6g0plkGJT7F91ZLVlVngp6zckp7J3N7 O386RZIhjojY00aLW9o8kjoJw19tSipA9/Fcv2hUwuuOL+Alhb8MbpjGySs6iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=683aee272ea8309a83f48cdaa467cfcddb69a7b6 commit 683aee272ea8309a83f48cdaa467cfcddb69a7b6 Author: Jan Beich AuthorDate: 2022-01-24 13:00:21 +0000 Commit: Jan Beich 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,