fcft: update to 1.1.0

This commit is contained in:
Daniel Eklöf 2020-02-01 20:20:22 +01:00
parent 8c32e3ccf0
commit 31baf334b3
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
3 changed files with 6 additions and 6 deletions

View file

@ -5,7 +5,7 @@ arch=('x86_64')
url=https://codeberg.org/dnkl/foot
license=(mit)
makedepends=('meson' 'ninja' 'scdoc' 'python' 'ncurses' 'wayland-protocols' 'tllist>=1.0.0')
depends=('libxkbcommon' 'wayland' 'pixman' 'fcft>=1.0.0')
depends=('libxkbcommon' 'wayland' 'pixman' 'fcft>=1.1.0')
source=()
pkgver() {

View file

@ -25,7 +25,7 @@ wayland_cursor = dependency('wayland-cursor')
xkb = dependency('xkbcommon')
tllist = dependency('tllist', version: '>=1.0.0', fallback: ['tllist', 'tllist'])
fcft = dependency('fcft', version: ['>=1.0.0', '<2.0.0'], fallback: ['fcft', 'fcft'])
fcft = dependency('fcft', version: ['>=1.1.0', '<1.2.0'], fallback: ['fcft', 'fcft'])
wayland_protocols_datadir = wayland_protocols.get_pkgconfig_variable('pkgdatadir')

View file

@ -516,10 +516,10 @@ initialize_fonts(struct terminal *term, const struct config *conf)
snprintf(attrs3, sizeof(attrs3), "dpi=%u:weight=bold:slant=italic", dpi);
return (
(term->fonts[0] = font_from_name(names, count, attrs0)) != NULL &&
(term->fonts[1] = font_from_name(names, count, attrs1)) != NULL &&
(term->fonts[2] = font_from_name(names, count, attrs2)) != NULL &&
(term->fonts[3] = font_from_name(names, count, attrs3)) != NULL);
(term->fonts[0] = font_from_name(count, names, attrs0)) != NULL &&
(term->fonts[1] = font_from_name(count, names, attrs1)) != NULL &&
(term->fonts[2] = font_from_name(count, names, attrs2)) != NULL &&
(term->fonts[3] = font_from_name(count, names, attrs3)) != NULL);
}
struct terminal *