From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F03A7158087 for ; Tue, 18 Jan 2022 22:52:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5E98E0821; Tue, 18 Jan 2022 22:52:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB77AE081E for ; Tue, 18 Jan 2022 22:52:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A6FC342EA3 for ; Tue, 18 Jan 2022 22:52:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E083F29B for ; Tue, 18 Jan 2022 22:52:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1642546310.033c972e1840474b3e3aa3b734dbacda7e1e71c6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild X-VCS-Directories: gnome-base/gnome-settings-daemon/ gnome-base/gnome-settings-daemon/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 033c972e1840474b3e3aa3b734dbacda7e1e71c6 X-VCS-Branch: master Date: Tue, 18 Jan 2022 22:52:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 85cbdce2-964b-4dd8-8576-c4715033d671 X-Archives-Hash: 0ca4a265f30eaaa5e524b40f2aa2c019 commit: 033c972e1840474b3e3aa3b734dbacda7e1e71c6 Author: Sam James gentoo org> AuthorDate: Tue Jan 18 22:51:38 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 18 22:51:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033c972e gnome-base/gnome-settings-daemon: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831431 Signed-off-by: Sam James gentoo.org> ...ome-settings-daemon-41.0-meson-0.61-build.patch | 32 ++++++++++++++++++++++ .../gnome-settings-daemon-41.0.ebuild | 1 + 2 files changed, 33 insertions(+) diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch new file mode 100644 index 000000000000..59aa0f433ae8 --- /dev/null +++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-41.0-meson-0.61-build.patch @@ -0,0 +1,32 @@ +https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/281.patch +https://bugs.gentoo.org/831431 + +From d88484002b5a0c8d2adccb2a5886a7da0a247d27 Mon Sep 17 00:00:00 2001 +From: Michal Vasilek +Date: Fri, 14 Jan 2022 23:55:06 +0100 +Subject: [PATCH] build: remove positional i18n.merge_file arguments + +otherwise building with meson 0.61+ fails: + + ERROR: Function does not take positional arguments. +--- a/plugins/power/meson.build ++++ b/plugins/power/meson.build +@@ -76,7 +76,6 @@ if host_is_linux + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +--- a/plugins/wacom/meson.build ++++ b/plugins/wacom/meson.build +@@ -7,7 +7,6 @@ policy_in = configure_file( + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: policy, + po_dir: po_dir, +GitLab diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild index b0e196bea8d6..f5bbb821b4c3 100644 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild +++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild @@ -93,6 +93,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.38.1-build-Make-colord-and-wacom-optional-and-controllabl.patch "${FILESDIR}"/${PN}-3.38.1-build-Allow-NM-optional-on-Linux.patch "${FILESDIR}"/${PN}-3.38.1-Allow-udev-optional-on-Linux.patch + "${FILESDIR}"/${P}-meson-0.61-build.patch ) python_check_deps() {