From badf9b7622322446680b24158b8dad6d9a58374c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Fri, 24 Apr 2020 20:19:16 +0200
Subject: [PATCH] meson: use simpler variant of dependency fallback for
 tllist+fcft

we now require tllist>=1.0.1 and fcft>=2.0.0, which both use
meson.override_dependency(). Thus, we can use the simpler form of
fallback in our dependency() call.s

This also updates the PKGBUILD files to require tllist>=1.0.1 and
fcft>=2.0.0
---
 PKGBUILD              | 4 ++--
 PKGBUILD.wayland-only | 4 ++--
 meson.build           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 2d3686c..3f278df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgdesc="Simplistic and highly configurable status panel for X and Wayland"
 arch=('x86_64')
 url=https://codeberg.org/dnkl/yambar
 license=(mit)
-makedepends=('meson' 'ninja' 'scdoc' 'tllist>=1.0.0')
+makedepends=('meson' 'ninja' 'scdoc' 'tllist>=1.0.1')
 depends=(
   'libxcb' 'xcb-util' 'xcb-util-cursor' 'xcb-util-wm'
   'wayland' 'wlroots'
@@ -15,7 +15,7 @@ depends=(
   'libudev.so'
   'json-c'
   'libmpdclient'
-  'fcft>=1.1.0')
+  'fcft>=2.0.0')
 optdepends=('xcb-util-errors: better X error messages')
 source=()
 
diff --git a/PKGBUILD.wayland-only b/PKGBUILD.wayland-only
index 7414fda..f68f9eb 100644
--- a/PKGBUILD.wayland-only
+++ b/PKGBUILD.wayland-only
@@ -7,7 +7,7 @@ url=https://codeberg.org/dnkl/yambar
 license=(mit)
 conflicts=('yambar')
 provides=('yambar')
-makedepends=('meson' 'ninja' 'scdoc' 'tllist>=1.0.0')
+makedepends=('meson' 'ninja' 'scdoc' 'tllist>=1.0.1')
 depends=(
   'wayland' 'wlroots'
   'pixman'
@@ -16,7 +16,7 @@ depends=(
   'libudev.so'
   'json-c'
   'libmpdclient'
-  'fcft>=1.0.0')
+  'fcft>=2.0.0')
 source=()
 
 pkgver() {
diff --git a/meson.build b/meson.build
index 5fa4aec..22f363c 100644
--- a/meson.build
+++ b/meson.build
@@ -64,8 +64,8 @@ wlroots = dependency('wlroots', required: get_option('backend-wayland'))
 backend_wayland = wayland_client.found() and wayland_cursor.found() and wlroots.found()
 
 # "My" dependencies, fallback to subproject
-tllist = dependency('tllist', version: '>=1.0.0', fallback: ['tllist', 'tllist'])
-fcft = dependency('fcft', version: ['>=2.0.0', '<2.1.0'], fallback: ['fcft', 'fcft'])
+tllist = dependency('tllist', version: '>=1.0.1', fallback: 'tllist')
+fcft = dependency('fcft', version: ['>=2.0.0', '<2.1.0'], fallback: 'fcft')
 
 add_project_arguments(
   ['-D_GNU_SOURCE'] +