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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E7481138334 for ; Tue, 3 Dec 2019 08:02:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2ED8EE0806; Tue, 3 Dec 2019 08:02:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 188D6E0806 for ; Tue, 3 Dec 2019 08:02:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAF0E34D640 for ; Tue, 3 Dec 2019 08:02:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCD7085C for ; Tue, 3 Dec 2019 08:02:26 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1575357619.b2ce7752761351c64b02e66d5dfd7ac880eb7aa0.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch X-VCS-Directories: gnome-base/dconf/files/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: b2ce7752761351c64b02e66d5dfd7ac880eb7aa0 X-VCS-Branch: master Date: Tue, 3 Dec 2019 08:02:26 +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: 6d8ed264-320a-45b9-9d02-eecc7e4cf1af X-Archives-Hash: fc3c808fcac05bbc65f24cc07181154a commit: b2ce7752761351c64b02e66d5dfd7ac880eb7aa0 Author: Mart Raudsepp gentoo org> AuthorDate: Tue Dec 3 07:18:59 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Tue Dec 3 07:20:19 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ce7752 gnome-base/dconf: adjust vapigen patch to not require meson-0.49+ Our patch used 0.49 feature for joining paths, but meson.eclass still only enforces >=meson-0.48.2. Instead of adding a depstring on >=meson-0.49, just trivially tweak the patch to use the old way of joining paths, to support easier upgrades on out of date machines. Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch index 55959a7febf..0dcb72358bd 100644 --- a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch +++ b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch @@ -34,7 +34,7 @@ index f3b7122..7dbca97 100644 + define_variable: ['datadir', dconf_datadir] ) + else -+ vapi_dir = dconf_datadir / 'vala' / 'vapi' ++ vapi_dir = join_paths(dconf_datadir, 'vala', 'vapi') + endif install_data(