Package: guix-patches;
Reported by: ashish.is <at> lostca.se
Date: Thu, 27 Feb 2025 18:05:01 UTC
Severity: normal
Tags: patch
Done: Andreas Enge <andreas <at> enge.fr>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: ashish.is <at> lostca.se To: 76614 <at> debbugs.gnu.org Cc: Ashish SHUKLA <ashish.is <at> lostca.se> Subject: [bug#76614] [PATCH] gnu: waybar: Update to 0.12.0. Date: Thu, 27 Feb 2025 19:03:32 +0100
From: Ashish SHUKLA <ashish.is <at> lostca.se>
* gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Unregister it.
* gnu/packages/wm.scm (waybar): Update to 0.12.0. [source]: Remove patch.
Change-Id: I43b9aa9a69128399e10d8cdc8dd3f1317a94e64d
---
gnu/local.mk | 1 -
.../waybar-0.11.0-fix-tray-icons.patch | 86 -------------------
gnu/packages/wm.scm | 5 +-
3 files changed, 2 insertions(+), 90 deletions(-)
delete mode 100644 gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index c8a29bf98b..9040bb4ad4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2394,7 +2394,6 @@ dist_patch_DATA = \
%D%/packages/patches/wacomtablet-add-missing-includes.patch \
%D%/packages/patches/wacomtablet-qt5.15.patch \
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
- %D%/packages/patches/waybar-0.11.0-fix-tray-icons.patch \
%D%/packages/patches/wcstools-extend-makefiles.patch \
%D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
diff --git a/gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch b/gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch
deleted file mode 100644
index 5c8c98a661..0000000000
--- a/gnu/packages/patches/waybar-0.11.0-fix-tray-icons.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Taken from upstream's merged PR #3604 [1].
-
-[1] https://github.com/Alexays/Waybar/pull/3604
-
-From 0006e4713ae19776528038b3242ded05db884ba5 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89 <at> 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()) {
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 0e6153d7bd..3a0154f161 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2453,7 +2453,7 @@ (define-public swaynotificationcenter
(define-public waybar
(package
(name "waybar")
- (version "0.11.0")
+ (version "0.12.0")
(source
(origin
(method git-fetch)
@@ -2462,8 +2462,7 @@ (define-public waybar
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "1bw6d3bf8rm4mgrbcprxxljfxbyabbj2lwabk2z19r8lhfz38myy"))
- (patches (search-patches "waybar-0.11.0-fix-tray-icons.patch"))))
+ (base32 "0i9an3yxbsbgpkl4zvwmk2g6vaap8shxix5gid6vx8x6z9wgg52n"))))
(build-system meson-build-system)
(arguments
(list #:configure-flags #~(list "--wrap-mode=nodownload")))
base-commit: f1810c84f72090b02544ac41d0582c4785728ec4
--
2.48.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.