From 882e2df86a0446d3a90b2ea208ceebf60758e118 Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 19 Aug 2021 11:34:48 +0200 Subject: [PATCH 1/2] libxkbcommon: enable xkbregistry This is now needed by Waybar --- common/shlibs | 1 + srcpkgs/libxkbcommon/template | 17 ++++++++++++++--- srcpkgs/libxkbregistry | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/libxkbregistry diff --git a/common/shlibs b/common/shlibs index 63dea0e2ea0be0..39136a41cfe333 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1155,6 +1155,7 @@ libtomcrypt.so.1 libtomcrypt-1.18.0_1 libHX.so.28 libHX-3.14_1 libxkbcommon.so.0 libxkbcommon-0.2.0_1 libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1 +libxkbregistry.so.0 libxkbregistry-1.3.0_3 libgee-0.8.so.2 libgee08-0.8.2_1 libnettle.so.8 nettle-3.6_1 libhogweed.so.6 nettle-3.6_1 diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template index 5cdadd1db7db4d..ed016aae5ee991 100644 --- a/srcpkgs/libxkbcommon/template +++ b/srcpkgs/libxkbcommon/template @@ -1,13 +1,16 @@ # Template file for 'libxkbcommon' pkgname=libxkbcommon version=1.3.0 -revision=2 +revision=3 wrksrc="${pkgname}-${pkgname#lib}-${version}" build_style=meson +# b_ndebug=false is needed to pass the test suite, as it relies on side effects +# in the arguments of assert calls. configure_args="-Denable-x11=true -Denable-docs=false - -Denable-wayland=true -Denable-xkbregistry=false" + -Denable-wayland=true -Denable-xkbregistry=true -Db_ndebug=false" hostmakedepends="pkg-config bison wayland-protocols wayland-devel" -makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols xorgproto" +makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols + xorgproto libxml2-devel" depends="xkeyboard-config" short_desc="Library to handle keyboard descriptions" maintainer="Isaac Freund " @@ -27,8 +30,16 @@ libxkbcommon-x11_package() { } } +libxkbregistry_package() { + short_desc="XKB API to query available rules, models, layouts, variants and options" + pkg_install() { + vmove "usr/lib/libxkbregistry.so.*" + } +} + libxkbcommon-devel_package() { depends="${sourcepkg}-x11>=${version}_${revision} + libxkbregistry>=${version}_${revision} ${sourcepkg}>=${version}_${revision} libxcb-devel" short_desc+=" - development files" pkg_install() { diff --git a/srcpkgs/libxkbregistry b/srcpkgs/libxkbregistry new file mode 120000 index 00000000000000..51911d5197ae9d --- /dev/null +++ b/srcpkgs/libxkbregistry @@ -0,0 +1 @@ +libxkbcommon \ No newline at end of file From 985f4a57cc81ebc336efa212733d806c23096cac Mon Sep 17 00:00:00 2001 From: Isaac Freund Date: Thu, 19 Aug 2021 11:50:19 +0200 Subject: [PATCH 2/2] Waybar: update to 0.9.8. --- .../patches/libfmt8-compatibility.patch | 40 ------------------- srcpkgs/Waybar/template | 6 +-- 2 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 srcpkgs/Waybar/patches/libfmt8-compatibility.patch diff --git a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch b/srcpkgs/Waybar/patches/libfmt8-compatibility.patch deleted file mode 100644 index 4ae9ee619e3a7f..00000000000000 --- a/srcpkgs/Waybar/patches/libfmt8-compatibility.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 368e4813de5356332d1167e8200cb5633e772ed6 Mon Sep 17 00:00:00 2001 -From: John Helmert III -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 : fmt::formatter { - template - 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)); - } - }; diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template index 699c4baddb59cb..ac01043daa5fcc 100644 --- a/srcpkgs/Waybar/template +++ b/srcpkgs/Waybar/template @@ -1,7 +1,7 @@ # Template file for 'Waybar' pkgname=Waybar -version=0.9.7 -revision=2 +version=0.9.8 +revision=1 _date_version=3.0.0 create_wrksrc=yes 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 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" -checksum="0d23573e0f6ce6e3f3eb4d1d7313848b924429268f3becd81649a391ae7703e7 +checksum="3f067c484aaee3e7d8ded382e72c280a92913b0c4e8a20d0ac9afdf8baf19405 87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3 6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"