From 05a8528172423b144966016800fc86476d409977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 1 Dec 2019 19:29:09 +0100 Subject: [PATCH 1/6] PKGBUILD: tllist is only a make dependency --- PKGBUILD | 4 ++-- PKGBUILD.wayland-only | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 68553a9..2d946ed 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') +makedepends=('meson' 'ninja' 'scdoc' 'tllist>=1.0.0') depends=( 'libxcb' 'xcb-util' 'xcb-util-cursor' 'xcb-util-wm' 'wayland' 'wlroots' @@ -15,7 +15,7 @@ depends=( 'libudev.so' 'json-c' 'libmpdclient' - 'tllist>=1.0.0' 'fcft>=0.1.0') + 'fcft>=0.1.0') optdepends=('xcb-util-errors: better X error messages') source=() diff --git a/PKGBUILD.wayland-only b/PKGBUILD.wayland-only index 72700f5..ccee550 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') +makedepends=('meson' 'ninja' 'scdoc' 'tllist>=1.0.0') depends=( 'wayland' 'wlroots' 'pixman' @@ -16,7 +16,7 @@ depends=( 'libudev.so' 'json-c' 'libmpdclient' - 'tllist>=1.0.0' 'fcft>=0.1.0') + 'fcft>=0.1.0') source=() pkgver() { From 6dfe479ddc41b9baeb00ebf45087352c95845116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 1 Dec 2019 19:29:19 +0100 Subject: [PATCH 2/6] fcft: bump to 0.2.0 --- subprojects/fcft | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/fcft b/subprojects/fcft index 97ded50..e4352f2 160000 --- a/subprojects/fcft +++ b/subprojects/fcft @@ -1 +1 @@ -Subproject commit 97ded50d8f14e1fd55aac1f2ff1b46bc56c6fd8b +Subproject commit e4352f2c4c6b301b42c15e13ef34f1d734598ce7 From 8a4d9137fff938753ed85a868f6567377f4be1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 1 Dec 2019 19:29:27 +0100 Subject: [PATCH 3/6] particle/string: remove useless debug log --- particles/string.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/particles/string.c b/particles/string.c index f7b9085..eb3ac4f 100644 --- a/particles/string.c +++ b/particles/string.c @@ -38,13 +38,8 @@ static int begin_expose(struct exposable *exposable) { struct eprivate *e = exposable->private; - struct font *font = exposable->particle->font; - LOG_DBG("%s: ascent=%f, descent=%f, height=%f", - font->name, font->fextents.ascent, - font->fextents.descent, font->fextents.height); - e->glyphs = NULL; e->num_glyphs = 0; From 677c43ea6040bebf49dec5df241a50e022236de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 1 Dec 2019 19:29:36 +0100 Subject: [PATCH 4/6] config: font_from_name() no longer accepts a tllist --- config.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/config.c b/config.c index 23cc39c..fb8e6b7 100644 --- a/config.c +++ b/config.c @@ -67,13 +67,7 @@ conf_to_color(const struct yml_node *node) struct font * conf_to_font(const struct yml_node *node) { - font_list_t font_list = tll_init(); - tll_push_back(font_list, yml_value_as_string(node)); - - struct font *font = font_from_name(font_list, NULL); - - tll_free(font_list); - return font; + return font_from_name(&(const char *){yml_value_as_string(node)}, 1, NULL); } struct deco * @@ -269,11 +263,7 @@ conf_to_bar(const struct yml_node *bar, enum bar_backend backend) * and particles. This allows us to specify a default font and * foreground color at top-level. */ - font_list_t font_list = tll_init(); - tll_push_back(font_list, "sans"); - struct font *font = font_from_name(font_list, NULL); - tll_free(font_list); - + struct font *font = font_from_name(&(const char *){"sans"}, 1, NULL); pixman_color_t foreground = {0xffff, 0xffff, 0xffff, 0xffff}; /* White */ const struct yml_node *font_node = yml_get_value(bar, "font"); From d6d4ee2fbd5aeacf124c8238793141cd253abe83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 1 Dec 2019 19:29:47 +0100 Subject: [PATCH 5/6] meson: require fcft 0.2.0 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e474cee..c436234 100644 --- a/meson.build +++ b/meson.build @@ -36,7 +36,7 @@ backend_wayland = wayland_client.found() and wayland_cursor.found() and wlroots. # "My" dependencies, fallback to subproject tllist = dependency('tllist', version: '>=1.0.0', fallback: ['tllist', 'tllist']) -fcft = dependency('fcft', version: ['>=0.1.0', '<0.2.0'], fallback: ['fcft', 'fcft']) +fcft = dependency('fcft', version: ['>=0.2.0', '<0.3.0'], fallback: ['fcft', 'fcft']) add_project_arguments( ['-D_GNU_SOURCE'] + From fb14c788df8228ea144f334142d7b8721f8ff2bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Sun, 1 Dec 2019 19:30:03 +0100 Subject: [PATCH 6/6] PKGBUILD: require fcft >= 0.2.0 --- PKGBUILD | 2 +- PKGBUILD.wayland-only | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2d946ed..7e5e345 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ depends=( 'libudev.so' 'json-c' 'libmpdclient' - 'fcft>=0.1.0') + 'fcft>=0.2.0') optdepends=('xcb-util-errors: better X error messages') source=() diff --git a/PKGBUILD.wayland-only b/PKGBUILD.wayland-only index ccee550..ed2867d 100644 --- a/PKGBUILD.wayland-only +++ b/PKGBUILD.wayland-only @@ -16,7 +16,7 @@ depends=( 'libudev.so' 'json-c' 'libmpdclient' - 'fcft>=0.1.0') + 'fcft>=0.2.0') source=() pkgver() {