summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2019-12-03 09:18:59 +0200
committerMart Raudsepp <leio@gentoo.org>2019-12-03 09:20:19 +0200
commitb2ce7752761351c64b02e66d5dfd7ac880eb7aa0 (patch)
tree9d45edb5f7b768bc1361b1a00977a08eeb4b107d /gnome-base/dconf
parentnet-firewall/nftables: Bump to version 0.9.3 (diff)
downloadgentoo-b2ce7752761351c64b02e66d5dfd7ac880eb7aa0.tar.gz
gentoo-b2ce7752761351c64b02e66d5dfd7ac880eb7aa0.tar.bz2
gentoo-b2ce7752761351c64b02e66d5dfd7ac880eb7aa0.zip
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 <leio@gentoo.org>
Diffstat (limited to 'gnome-base/dconf')
-rw-r--r--gnome-base/dconf/files/0.32.0-drop-vapigen-dep.patch2
1 files changed, 1 insertions, 1 deletions
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 55959a7febf0..0dcb72358bde 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(