From nobody Sun Jan 23 09:26:30 2022 X-Original-To: dev-commits-ports-all@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 7A94519732B1; Sun, 23 Jan 2022 09:26:31 +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 4JhSRW19ssz3PPH; Sun, 23 Jan 2022 09:26:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642929991; 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=fc0x1kfro2PuWY1OIKEE4yQnIXb79cAoRVL3h0Cm6DY=; b=f3rp6c15WzgUZRolSv3df1JOp5zbdbZ0D00Do6GedLwLgNob7pzCSO7sND0aSpC6CkKcTb VxhooNVF4YW1Yif4rAYWoWMWbsaRawVOIyJ6cuBQoUcdiadaa5ZhIBLhE3hXSyxSAtcSFb XHrzk5fbKqdeYqCD9fjr/zRtHE7uZI6rXpcJxOPQ+WCrncg4fJxEUzp2PTZbab0PSuPmD6 2rsjM55LKnQXBdqyKfOv0HaDIk/Y2eDRSJhYhdQKMjoZsHD+8hTvsNTCD4POquyv96oHHC mKCa+Bu+ofVvqltoOsyCX5GkK1UmRep+GiivScWs7GOVeWuo4cvwf88nuohnUQ== 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 459D31FED2; Sun, 23 Jan 2022 09:26:30 +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 20N9QU0n008089; Sun, 23 Jan 2022 09:26:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20N9QUNh008088; Sun, 23 Jan 2022 09:26:30 GMT (envelope-from git) Date: Sun, 23 Jan 2022 09:26:30 GMT Message-Id: <202201230926.20N9QUNh008088@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: d1f2ea461830 - main - x11/tilix: unbreak build with Meson 0.61.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: d1f2ea4618304d5015d452838a57a72e7d3aeedf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642929991; 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=fc0x1kfro2PuWY1OIKEE4yQnIXb79cAoRVL3h0Cm6DY=; b=QGWiJgtUH5wnUlJwV/qe8iH2PiTRQRBxuIYPCnUalOdW49jJ1wCjKUEFDHahhLCLk1FQDC 908ktHAxZIAq0bR4m2Ilrrec0B7/uaz0fP2iJVUDeGUJlyfE/NfaklgYyIgJerS/ggxFEt vEAmjIh4xWWwmRCedL2qaudYreS36VBpshRFNRYyKsfnoNaN69cEQlTJNgCRWMkYlrmyFa WOqGzhCRv5ZBpyHMOplVDgiBkGBt2GypEMPTseGJo7W2NzgQBlTYO8D4tn+KTjMC/EJAV3 bsV1NjHEm4I1qq+Xz0l10CNquFxN6BqLz3VlDfMqcRS8g0owaR5Fk4TLAOqvDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642929991; a=rsa-sha256; cv=none; b=gkQGan6AR4+5j624lu/OD1vgN6zXQpa1UHodsska0l0CKEBAMYayHvV/IRaZdey4gNluLW Bb+2HSniCAXTg0crQhYwWnQva2bOHlsZV7Y6rSBafQxhJmXHA/rEuEh1id9gtke7Z6hHHf 3OCCVWFMnec+j9JgE7kF7/MhB1dGgxpH+fdBK2NvNEA+vJXYBkjmXj1mJbU3dJe7kDVcS/ ti1C04D+Akq5NoY6zoGtTKyhN5kCu5mcYW494/Offclf+4KDBxdPtj5JjbLxi4j9hkJsyd YtdLVzlvR5l9hkfdQLrukWSn9lAJxinoiZoDeA7Y6CxEIvDzx+QPDASi4yUSyA== 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=d1f2ea4618304d5015d452838a57a72e7d3aeedf commit d1f2ea4618304d5015d452838a57a72e7d3aeedf Author: Jan Beich AuthorDate: 2022-01-23 09:13:04 +0000 Commit: Jan Beich 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',