From cbf4755b93780a29a86f4271c0bab1e6ee36ba5f Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Sat, 22 Feb 2025 09:33:50 -0800
Subject: [PATCH] community/waybar: upgrade to 0.12.0
---
community/waybar/APKBUILD | 13 +--
community/waybar/config-fix-clock.patch | 14 ---
community/waybar/fix-tray.patch | 119 ------------------------
3 files changed, 4 insertions(+), 142 deletions(-)
delete mode 100644 community/waybar/config-fix-clock.patch
delete mode 100644 community/waybar/fix-tray.patch
diff --git a/community/waybar/APKBUILD b/community/waybar/APKBUILD
index 8b2d1b1c0019..255e51edecef 100644
--- a/community/waybar/APKBUILD
+++ b/community/waybar/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Luca Weiss <luca@lucaweiss.eu>
# Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=waybar
-pkgver=0.11.0
-pkgrel=5
+pkgver=0.12.0
+pkgrel=0
pkgdesc="Highly customizable Wayland bar for Sway and Wlroots based compositors"
url="https://github.com/Alexays/Waybar/"
# s390x: no wireplumber (but who uses it there anyway)
@@ -30,10 +30,7 @@ makedepends="
wireplumber-dev
"
subpackages="$pkgname-doc"
-source="https://github.com/Alexays/Waybar/archive/$pkgver/Waybar-$pkgver.tar.gz
- config-fix-clock.patch
- fix-tray.patch
- "
+source="https://github.com/Alexays/Waybar/archive/$pkgver/Waybar-$pkgver.tar.gz"
options="!check" # No test suite
builddir="$srcdir/Waybar-$pkgver"
@@ -63,7 +60,5 @@ package() {
}
sha512sums="
-6bd23a469205662e524e53dd8798c4dce6ed371e5106f34644540e2f89804181753814f74b45645185b933c43dc4a0eabb99633936433fdadc25a9cce58b06b0 Waybar-0.11.0.tar.gz
-cd6fea7e9981e13ecb911da66b4f22e949542d4085d696e01d8d4eac0986e0ab15d5c1430040b76be730437a586dbe1f5c49ac8435269e6310fb2c213b6c74a2 config-fix-clock.patch
-77f528438555267c6651fbd9a30243d642ed75e67b37b21b2d6b8be0548c2d35138c09ef7af388a53da9fd5a0c88e1f842f41817f0220643e15d6c9bc7dc729e fix-tray.patch
+f9c70a0f7eef97ae5da788b07eb2d4bf792bee02786e71e7ebd6669109a1cd48275d05286c876f031638d9f6e947cf733f1efa5e47974fda89a8080ad062c5e8 Waybar-0.12.0.tar.gz
"
diff --git a/community/waybar/config-fix-clock.patch b/community/waybar/config-fix-clock.patch
deleted file mode 100644
index 45e65941925a..000000000000
--- a/community/waybar/config-fix-clock.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix https://github.com/Alexays/Waybar/issues/698
-
---- a/resources/config.jsonc
-+++ b/resources/config.jsonc
-@@ -75,7 +75,8 @@
- "clock": {
- // "timezone": "America/New_York",
- "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-- "format-alt": "{:%Y-%m-%d}"
-+ "format-alt": "{:%Y-%m-%d}",
-+ "locale": "C"
- },
- "cpu": {
- "format": "{usage}% ï‹›",
diff --git a/community/waybar/fix-tray.patch b/community/waybar/fix-tray.patch
deleted file mode 100644
index 978fb9b8bd11..000000000000
--- a/community/waybar/fix-tray.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From f60c291b82181b6e871b4807625fbcc7818d3c36 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Sat, 14 Sep 2024 07:36:23 -0700
-Subject: [PATCH 1/2] chore: update fmt wrap to 11.0.2
-
----
- subprojects/fmt.wrap | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap
-index 42b615963..fd508477f 100644
---- a/subprojects/fmt.wrap
-+++ b/subprojects/fmt.wrap
-@@ -1,13 +1,13 @@
- [wrap-file]
--directory = fmt-11.0.1
--source_url = https://github.com/fmtlib/fmt/archive/11.0.1.tar.gz
--source_filename = fmt-11.0.1.tar.gz
--source_hash = 7d009f7f89ac84c0a83f79ed602463d092fbf66763766a907c97fd02b100f5e9
--patch_filename = fmt_11.0.1-1_patch.zip
--patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.1-1/get_patch
--patch_hash = 0a8b93d1ee6d84a82d3872a9bfb4c3977d8a53f7f484d42d1f7ed63ed496d549
--source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.1-1/fmt-11.0.1.tar.gz
--wrapdb_version = 11.0.1-1
-+directory = fmt-11.0.2
-+source_url = https://github.com/fmtlib/fmt/archive/11.0.2.tar.gz
-+source_filename = fmt-11.0.2.tar.gz
-+source_hash = 6cb1e6d37bdcb756dbbe59be438790db409cdb4868c66e888d5df9f13f7c027f
-+patch_filename = fmt_11.0.2-1_patch.zip
-+patch_url = https://wrapdb.mesonbuild.com/v2/fmt_11.0.2-1/get_patch
-+patch_hash = 90c9e3b8e8f29713d40ca949f6f93ad115d78d7fb921064112bc6179e6427c5e
-+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_11.0.2-1/fmt-11.0.2.tar.gz
-+wrapdb_version = 11.0.2-1
-
- [provide]
- fmt = fmt_dep
-
-From 0006e4713ae19776528038b3242ded05db884ba5 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Sat, 14 Sep 2024 07:37:37 -0700
-Subject: [PATCH 2/2] fix(tray): revert ustring formatting changes
-
-This reverts commit a4d31ab10d1630cb9104c695d7b777ca12468904.
----
- src/modules/sni/item.cpp | 23 +++++++++--------------
- 1 file changed, 9 insertions(+), 14 deletions(-)
-
-diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp
-index 8afb39fb3..6c4ec8c06 100644
---- a/src/modules/sni/item.cpp
-+++ b/src/modules/sni/item.cpp
-@@ -104,11 +104,9 @@ void Item::proxyReady(Glib::RefPtr<Gio::AsyncResult>& result) {
- this->updateImage();
-
- } catch (const Glib::Error& err) {
-- spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path,
-- std::string(err.what()));
-+ spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what());
- } catch (const std::exception& err) {
-- spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path,
-- std::string(err.what()));
-+ spdlog::error("Failed to create DBus Proxy for {} {}: {}", bus_name, object_path, err.what());
- }
- }
-
-@@ -126,15 +124,14 @@ ToolTip get_variant<ToolTip>(const Glib::VariantBase& value) {
- result.text = get_variant<Glib::ustring>(container.get_child(2));
- auto description = get_variant<Glib::ustring>(container.get_child(3));
- if (!description.empty()) {
-- result.text = fmt::format("<b>{}</b>\n{}", std::string(result.text), std::string(description));
-+ result.text = fmt::format("<b>{}</b>\n{}", result.text, description);
- }
- return result;
- }
-
- void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) {
- try {
-- spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id,
-- std::string(name), get_variant<std::string>(value));
-+ spdlog::trace("Set tray item property: {}.{} = {}", id.empty() ? bus_name : id, name, value);
-
- if (name == "Category") {
- category = get_variant<std::string>(value);
-@@ -179,12 +176,10 @@ void Item::setProperty(const Glib::ustring& name, Glib::VariantBase& value) {
- }
- } catch (const Glib::Error& err) {
- spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}",
-- id.empty() ? bus_name : id, std::string(name), get_variant<std::string>(value),
-- std::string(err.what()));
-+ id.empty() ? bus_name : id, name, value, err.what());
- } catch (const std::exception& err) {
- spdlog::warn("Failed to set tray item property: {}.{}, value = {}, err = {}",
-- id.empty() ? bus_name : id, std::string(name), get_variant<std::string>(value),
-- std::string(err.what()));
-+ id.empty() ? bus_name : id, name, value, err.what());
- }
- }
-
-@@ -226,9 +221,9 @@ void Item::processUpdatedProperties(Glib::RefPtr<Gio::AsyncResult>& _result) {
-
- this->updateImage();
- } catch (const Glib::Error& err) {
-- spdlog::warn("Failed to update properties: {}", std::string(err.what()));
-+ spdlog::warn("Failed to update properties: {}", err.what());
- } catch (const std::exception& err) {
-- spdlog::warn("Failed to update properties: {}", std::string(err.what()));
-+ spdlog::warn("Failed to update properties: {}", err.what());
- }
- update_pending_.clear();
- }
-@@ -250,7 +245,7 @@ static const std::map<std::string_view, std::set<std::string_view>> signal2props
-
- void Item::onSignal(const Glib::ustring& sender_name, const Glib::ustring& signal_name,
- const Glib::VariantContainerBase& arguments) {
-- spdlog::trace("Tray item '{}' got signal {}", id, std::string(signal_name));
-+ spdlog::trace("Tray item '{}' got signal {}", id, signal_name);
- auto changed = signal2props.find(signal_name.raw());
- if (changed != signal2props.end()) {
- if (update_pending_.empty()) {
--
GitLab