commit:     b2ce7752761351c64b02e66d5dfd7ac880eb7aa0
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 07:18:59 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> 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 <leio <AT> 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(

Reply via email to