Accepting request 1248068 from X11:Wayland
OBS-URL: https://build.opensuse.org/request/show/1248068 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/waybar?expand=0&rev=58
This commit is contained in:
Git OBS Bridge
commit
e641cd5739
119
tray-fix.patch
119
tray-fix.patch
@ -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()) {
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6a0e9f0f7f2eff503951958cbb16dc39041c0b67e86c35154e8507677c61be9d
|
||||
size 317607
|
||||
3
waybar-0.12.0.tar.gz
Normal file
3
waybar-0.12.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:80454a0778176f575c112bdef9107f272621b578aa629bcc257ad9844a6c7165
|
||||
size 319730
|
||||
@ -1,3 +1,58 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 21 15:43:03 UTC 2025 - Michael Vetter <mvetter@suse.com>
|
||||
|
||||
- Update to 0.12.0:
|
||||
* Clarify documentation of 'rotate' option. #3580
|
||||
* Fix std::bad_casts in tray module #3604
|
||||
* fix: return app_identifier as itself in AAppIconLabel if it's an absolute path #3613
|
||||
* Fixes for Sway modes and wlr_scene support #3528
|
||||
* fix(custom): stop mixing manual and automatic arg indexing #3617
|
||||
* cava: Add format_silent option and css triggers #3523
|
||||
* Fix: 3383. Clock. Default value for cldYearShift_ = 1900/01/01 #3632
|
||||
* nix: remove patches from downstream #3640
|
||||
* cava bump #3646
|
||||
* .github/workflows: don't run on forks #3651
|
||||
* nix/default: cava bump #3650
|
||||
* .github/workflows: allow forks to manually run flake lock update #3652
|
||||
* #2275 Backlight: Add minimum brightness #3637
|
||||
* flake.lock: Update #3658
|
||||
* Fix a crash after handling SIGINT and a data race when initializing the Hyprland workspace modules #3695
|
||||
* pulseaudio: volume indicator update on default output switch #3464
|
||||
* Add warning threshold to temperature module #3674
|
||||
* Add signals section to manpage #3758
|
||||
* fix hyprland's grouped window flags #3747
|
||||
* flake.lock: Update #3736
|
||||
* Add stretching of modules and modules-center toggling #3730
|
||||
* fix null-deref due to unconstructed PrivacyNodeInfo #3768
|
||||
* flake.lock: Update #3800
|
||||
* Let network module handle ipv4 and ipv6 simultaneously #3809
|
||||
* sway/workspaces: use X11 class for XWayland windows #3801
|
||||
* Add locking for interacting with the pulseaudio thread #3806
|
||||
* Using 'auto' instead of 'self' in backlight module #3808
|
||||
* sway: fix "Mapping is not an object" warning #3831
|
||||
* fix: hyprland/window get empty ipc json data #3826
|
||||
* Escape markup characters in dwl/window #3827
|
||||
* Update LICENSE, fix copyright license year #3860
|
||||
* flake.lock: Update #3859
|
||||
* Fix compilation with libc++ #3866
|
||||
* fix: never sleep cava when sleep_timer is 0 #3875
|
||||
* Escape tray tooltip text #3877
|
||||
* Allow using wildcards in config include paths #3862
|
||||
* Hide vacant tags config option on River #3823
|
||||
* Make battery module update on plugging/unplugging again (refs #2519) #3474
|
||||
* Revert "Make battery module update on plugging/unplugging again (refs #2519)" #3902
|
||||
* fix: JSON format for Hyprland keyboard example #3913
|
||||
* Hide upower module when specified device disconnected #3919
|
||||
* flake.lock: Update #3914
|
||||
* [hyprland/window] enable tooltip for hyprland window module #3898
|
||||
* Fix workspacerules not taking into account defaultName #3947
|
||||
* fix: battery runtime estimation with negative sysfs values #3942
|
||||
* update(docs): link #3940
|
||||
* Hyprland IPC improvements #3945
|
||||
* hyprland/workspaces: fixed urgent for special workspaces #3932
|
||||
* turn off ellipsize for niri/language module #3922
|
||||
- Drop upstreamed: tray-fix.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 23 11:09:48 UTC 2024 - Soc Virnyl Estela <obs@uncomfyhalomacro.pl>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package waybar
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: waybar
|
||||
Version: 0.11.0
|
||||
Version: 0.12.0
|
||||
Release: 0
|
||||
Summary: Customizable Wayland bar for Sway and Wlroots based compositors
|
||||
License: MIT
|
||||
@ -25,7 +25,6 @@ Group: System/GUI/Other
|
||||
URL: https://github.com/Alexays/Waybar
|
||||
Source0: https://github.com/Alexays/Waybar/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source1: waybar.rpmlintrc
|
||||
Patch1: https://github.com/Alexays/Waybar/pull/3604.patch#/tray-fix.patch
|
||||
BuildRequires: cmake
|
||||
%if 0%{?sle_version} >= 150400
|
||||
BuildRequires: gcc13-c++
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user