aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-01 19:20:22 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-01 19:20:22 +0000
commit31baf334b30e565e76dc5057dd448802b8f38718 (patch)
treef81a0495f4b54c9ca54b7dca2d21ea2cd4dc3ee0
parentvt: ensure we never step outside our parameter and sub-parameter arrays (diff)
fcft: update to 1.1.0
-rw-r--r--PKGBUILD2
-rw-r--r--meson.build2
-rw-r--r--terminal.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/PKGBUILD b/PKGBUILD
index d46090b8..720990c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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() {
diff --git a/meson.build b/meson.build
index 28cfe237..00933df3 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/terminal.c b/terminal.c
index e7d68d1e..26c2163f 100644
--- a/terminal.c
+++ b/terminal.c
@@ -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 *