Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/dconf/files/
Date: Tue, 03 Dec 2019 08:02:30
Message-Id: 1575357619.b2ce7752761351c64b02e66d5dfd7ac880eb7aa0.leio@gentoo
1 commit: b2ce7752761351c64b02e66d5dfd7ac880eb7aa0
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 3 07:18:59 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 3 07:20:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ce7752
7
8 gnome-base/dconf: adjust vapigen patch to not require meson-0.49+
9
10 Our patch used 0.49 feature for joining paths, but meson.eclass
11 still only enforces >=meson-0.48.2. Instead of adding a depstring
12 on >=meson-0.49, just trivially tweak the patch to use the old
13 way of joining paths, to support easier upgrades on out of date
14 machines.
15
16 Package-Manager: Portage-2.3.79, Repoman-2.3.12
17 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
18
19 gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22 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
23 index 55959a7febf..0dcb72358bd 100644
24 --- a/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
25 +++ b/gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch
26 @@ -34,7 +34,7 @@ index f3b7122..7dbca97 100644
27 + define_variable: ['datadir', dconf_datadir]
28 )
29 + else
30 -+ vapi_dir = dconf_datadir / 'vala' / 'vapi'
31 ++ vapi_dir = join_paths(dconf_datadir, 'vala', 'vapi')
32 + endif
33
34 install_data(