pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

meson: use simpler variant of dependency fallback for tllist+fcft

Browse source 
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
This commit is contained in:
Daniel Eklöf 2020-04-24 20:19:16 +02:00
parent 234a787859
commit badf9b7622
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
PKGBUILD
View file

@ -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=()

4
PKGBUILD.wayland-only
View file

@ -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() {

4
meson.build
View file

@ -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'] +