From nobody Sun Jan 23 11:08:44 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 9C952196D602; Sun, 23 Jan 2022 11:08:44 +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 4JhVjS42msz4sqj; Sun, 23 Jan 2022 11:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642936124; 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=sdN5K88BepcGMUXWMk160OaT7NeBj8s+On4lG8O8lKo=; b=g7Jd/GoBPkAN9dLcCxbKCKavgn/zo9HxJ9BYGN/BID9srC2W2Fdr9dZOJF39b2h6Sta8h0 3yIour91MtNoRI5Agw19ADz5HvD7up8wiwrddquBHTn+0F0RlZdvOk1Cjfx8MKjHjxuxG9 +B5JfWF5p1eCmJlnNIaRnMRgxPMmcbhK7gvkWDuFAAC1wkrl7IZqwQPLAWreCRHwvRxtMg 6g55gOumAXy8OvTE32JH874UI27GHcFwjmwASrY3iA7DSIQDwdbZQY2eW/7UXKUpqQeVZT iH6ju+MsNmh4GYP09O4555RCFvGyxmQ+JMnfiOIBA/yrE/EoZtTeEUFLoOIIyA== 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 6AB0E21588; Sun, 23 Jan 2022 11:08:44 +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 20NB8iOM043579; Sun, 23 Jan 2022 11:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20NB8iTR043578; Sun, 23 Jan 2022 11:08:44 GMT (envelope-from git) Date: Sun, 23 Jan 2022 11:08:44 GMT Message-Id: <202201231108.20NB8iTR043578@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: 1cb23daf73b1 - main - deskutils/gnome-characters: 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: 1cb23daf73b17f71a7181777fc177436314554b0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642936124; 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=sdN5K88BepcGMUXWMk160OaT7NeBj8s+On4lG8O8lKo=; b=iyBGlcl2yoX3Y0j6LwhQ5bVLWMZgzY6L05PQCjwThA33G1bIExh4RL3hUOc9HkzP+KndQC 9F9P8TICP/MlevXRydskTxtQde2BZzu1UQKAXF6zOazXhIgnjo7p2VOkaIRghNaZf3mUvL ySQwFoQF6MhmR97VPUv7zERCpzcJibyJnrh1cfGJlSbufDb6KKxNV3u5qqBOlxBh5q9IpI U55CGtK/eOOQscxEsAhHHaE151vVdVtdmPr5ngUcrLkjiXO7t9VsCl3bzElbDAwLG2FAX1 bmVF3edLQjDVd8srY+x2jjSzd9y5olqURF+JLpD6TOCIY1vbcXsjd2NcQ0GpVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642936124; a=rsa-sha256; cv=none; b=dEVzcrM5N5IJxFqCCJtLqMHfdQb5CfnAYATRDIJkuiVtaPQyz8u59JThj68QnSOR9Plopu S0sAg4emxdz7MILBfsNTTF8OrFxyM/irsnlaL6AfY4Yfi0bYiwGYdP01ZZLj2q5NKenagZ XYzYAxVWXjLS4FhQt5rBVcopBHP7XCPZmZKBozHiWMUh0CpYWp2gDhqNA+PSXYb63qBlcd HUvAPEUoEIu5/Itt/doSGnJHdYIbjX9kcpETEBc560UpkMWZpMoBua1rlZuMozwgoZD1i4 ioDzdSwWyvDr+y/nVAorBSCxCuBm2hiRHWu9j8rLoqgDAYtNREbLCF8fyg0eLg== 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=1cb23daf73b17f71a7181777fc177436314554b0 commit 1cb23daf73b17f71a7181777fc177436314554b0 Author: Jan Beich AuthorDate: 2022-01-23 11:07:34 +0000 Commit: Jan Beich CommitDate: 2022-01-23 11:08:35 +0000 deskutils/gnome-characters: unbreak build with Meson 0.61.0 data/meson.build:49:5: ERROR: Function does not take positional arguments. PR: 260943 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/61f2866a9fa1 --- .../gnome-characters/files/patch-data_meson.build | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/deskutils/gnome-characters/files/patch-data_meson.build b/deskutils/gnome-characters/files/patch-data_meson.build new file mode 100644 index 000000000000..69d859426b08 --- /dev/null +++ b/deskutils/gnome-characters/files/patch-data_meson.build @@ -0,0 +1,22 @@ +https://gitlab.gnome.org/GNOME/gnome-characters/-/commit/3b84cc750b70 + +data/meson.build:49:5: ERROR: Function does not take positional arguments. + +--- data/meson.build.orig 2021-09-21 13:39:34 UTC ++++ data/meson.build +@@ -47,7 +47,6 @@ desktop_conf.set('appid', characters_application_id) + desktop_conf.set('bindir', characters_bindir) + + i18n.merge_file( +- 'desktop-file', + type: 'desktop', + input: configure_file ( + input: characters_name + '.desktop.in', +@@ -61,7 +60,6 @@ i18n.merge_file( + ) + + appdata_file = i18n.merge_file( +- 'appdata-file', + input: characters_name + '.appdata.xml.in', + output: characters_application_id + '.appdata.xml', + po_dir: po_dir,