mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 15:43:49 +02:00
Waybar: update to 0.9.8.
This commit is contained in:
parent
0bc04c3740
commit
57ff688d16
2 changed files with 3 additions and 43 deletions
|
@ -1,40 +0,0 @@
|
||||||
From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: John Helmert III <jchelmert3@posteo.net>
|
|
||||||
Date: Tue, 29 Jun 2021 21:29:12 -0500
|
|
||||||
Subject: [PATCH] libfmt >=8.0.0 compatibility
|
|
||||||
|
|
||||||
---
|
|
||||||
include/util/format.hpp | 4 ++++
|
|
||||||
src/modules/clock.cpp | 3 +++
|
|
||||||
2 files changed, 7 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/include/util/format.hpp b/include/util/format.hpp
|
|
||||||
index 288d8f0cd..543a100fb 100644
|
|
||||||
--- a/Waybar-0.9.7/include/util/format.hpp
|
|
||||||
+++ b/Waybar-0.9.7/include/util/format.hpp
|
|
||||||
@@ -35,7 +35,11 @@ namespace fmt {
|
|
||||||
// The rationale for ignoring it is that the only reason to specify
|
|
||||||
// an alignment and a with is to get a fixed width bar, and ">" is
|
|
||||||
// sufficient in this implementation.
|
|
||||||
+#if FMT_VERSION < 80000
|
|
||||||
width = parse_nonnegative_int(it, end, ctx);
|
|
||||||
+#else
|
|
||||||
+ width = detail::parse_nonnegative_int(it, end, -1);
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
return it;
|
|
||||||
}
|
|
||||||
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
|
|
||||||
index 22bedc783..82c570102 100644
|
|
||||||
--- a/Waybar-0.9.7/src/modules/clock.cpp
|
|
||||||
+++ b/Waybar-0.9.7/src/modules/clock.cpp
|
|
||||||
@@ -196,6 +196,9 @@ template <>
|
|
||||||
struct fmt::formatter<waybar_time> : fmt::formatter<std::tm> {
|
|
||||||
template <typename FormatContext>
|
|
||||||
auto format(const waybar_time& t, FormatContext& ctx) {
|
|
||||||
+#if FMT_VERSION >= 80000
|
|
||||||
+ auto& tm_format = specs;
|
|
||||||
+#endif
|
|
||||||
return format_to(ctx.out(), "{}", date::format(t.locale, fmt::to_string(tm_format), t.ztime));
|
|
||||||
}
|
|
||||||
};
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'Waybar'
|
# Template file for 'Waybar'
|
||||||
pkgname=Waybar
|
pkgname=Waybar
|
||||||
version=0.9.7
|
version=0.9.8
|
||||||
revision=2
|
revision=1
|
||||||
_date_version=3.0.0
|
_date_version=3.0.0
|
||||||
create_wrksrc=yes
|
create_wrksrc=yes
|
||||||
build_wrksrc=${pkgname}-${version}
|
build_wrksrc=${pkgname}-${version}
|
||||||
|
@ -31,7 +31,7 @@ changelog="https://github.com/Alexays/Waybar/releases"
|
||||||
distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
|
distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
|
||||||
https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
|
https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
|
||||||
https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
|
https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
|
||||||
checksum="0d23573e0f6ce6e3f3eb4d1d7313848b924429268f3becd81649a391ae7703e7
|
checksum="3f067c484aaee3e7d8ded382e72c280a92913b0c4e8a20d0ac9afdf8baf19405
|
||||||
87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
|
87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
|
||||||
6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
|
6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue