Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package waybar for openSUSE:Factory checked
in at 2023-08-17 19:44:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/waybar (Old)
and /work/SRC/openSUSE:Factory/.waybar.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "waybar"
Thu Aug 17 19:44:29 2023 rev:49 rq:1104309 version:0.9.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/waybar/waybar.changes 2023-08-15
16:40:05.263020391 +0200
+++ /work/SRC/openSUSE:Factory/.waybar.new.1766/waybar.changes 2023-08-17
19:44:44.258923160 +0200
@@ -1,0 +2,7 @@
+Thu Aug 17 07:14:12 UTC 2023 - Michael Vetter <mvet...@suse.com>
+
+- Update to 0.9.22:
+ * Explicitly cast ustring to string when passing to fmt #2409
+ * fix: typo in taskbar.cpp #2404
+
+-------------------------------------------------------------------
Old:
----
waybar-0.9.21.tar.gz
New:
----
waybar-0.9.22.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ waybar.spec ++++++
--- /var/tmp/diff_new_pack.Bpy3CA/_old 2023-08-17 19:44:46.258926900 +0200
+++ /var/tmp/diff_new_pack.Bpy3CA/_new 2023-08-17 19:44:46.266926915 +0200
@@ -17,7 +17,7 @@
Name: waybar
-Version: 0.9.21
+Version: 0.9.22
Release: 0
Summary: Customizable Wayland bar for Sway and Wlroots based compositors
License: MIT
++++++ waybar-0.9.21.tar.gz -> waybar-0.9.22.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Waybar-0.9.21/include/AModule.hpp
new/Waybar-0.9.22/include/AModule.hpp
--- old/Waybar-0.9.21/include/AModule.hpp 2023-08-14 15:33:52.000000000
+0200
+++ new/Waybar-0.9.22/include/AModule.hpp 2023-08-16 13:34:05.000000000
+0200
@@ -44,23 +44,18 @@
std::map<std::string, std::string> eventActionMap_;
static const inline std::map<std::pair<uint, GdkEventType>, std::string>
eventMap_{
{std::make_pair(1, GdkEventType::GDK_BUTTON_PRESS), "on-click"},
- {std::make_pair(1, GdkEventType::GDK_BUTTON_RELEASE),
"on-click-release"},
{std::make_pair(1, GdkEventType::GDK_2BUTTON_PRESS), "on-double-click"},
{std::make_pair(1, GdkEventType::GDK_3BUTTON_PRESS), "on-triple-click"},
{std::make_pair(2, GdkEventType::GDK_BUTTON_PRESS), "on-click-middle"},
- {std::make_pair(2, GdkEventType::GDK_BUTTON_RELEASE),
"on-click-middle-release"},
{std::make_pair(2, GdkEventType::GDK_2BUTTON_PRESS),
"on-double-click-middle"},
{std::make_pair(2, GdkEventType::GDK_3BUTTON_PRESS),
"on-triple-click-middle"},
{std::make_pair(3, GdkEventType::GDK_BUTTON_PRESS), "on-click-right"},
- {std::make_pair(3, GdkEventType::GDK_BUTTON_RELEASE),
"on-click-right-release"},
{std::make_pair(3, GdkEventType::GDK_2BUTTON_PRESS),
"on-double-click-right"},
{std::make_pair(3, GdkEventType::GDK_3BUTTON_PRESS),
"on-triple-click-right"},
{std::make_pair(8, GdkEventType::GDK_BUTTON_PRESS), "on-click-backward"},
- {std::make_pair(8, GdkEventType::GDK_BUTTON_RELEASE),
"on-click-backward-release"},
{std::make_pair(8, GdkEventType::GDK_2BUTTON_PRESS),
"on-double-click-backward"},
{std::make_pair(8, GdkEventType::GDK_3BUTTON_PRESS),
"on-triple-click-backward"},
{std::make_pair(9, GdkEventType::GDK_BUTTON_PRESS), "on-click-forward"},
- {std::make_pair(9, GdkEventType::GDK_BUTTON_RELEASE),
"on-click-forward-release"},
{std::make_pair(9, GdkEventType::GDK_2BUTTON_PRESS),
"on-double-click-forward"},
{std::make_pair(9, GdkEventType::GDK_3BUTTON_PRESS),
"on-triple-click-forward"}};
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Waybar-0.9.21/include/util/format.hpp
new/Waybar-0.9.22/include/util/format.hpp
--- old/Waybar-0.9.21/include/util/format.hpp 2023-08-14 15:33:52.000000000
+0200
+++ new/Waybar-0.9.22/include/util/format.hpp 2023-08-16 13:34:05.000000000
+0200
@@ -93,7 +93,7 @@
struct formatter<Glib::ustring> : formatter<std::string> {
template <typename FormatContext>
auto format(const Glib::ustring& value, FormatContext& ctx) {
- return formatter<std::string>::format(value, ctx);
+ return formatter<std::string>::format(static_cast<std::string>(value),
ctx);
}
};
} // namespace fmt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Waybar-0.9.21/meson.build
new/Waybar-0.9.22/meson.build
--- old/Waybar-0.9.21/meson.build 2023-08-14 15:33:52.000000000 +0200
+++ new/Waybar-0.9.22/meson.build 2023-08-16 13:34:05.000000000 +0200
@@ -1,6 +1,6 @@
project(
'waybar', 'cpp', 'c',
- version: '0.9.21',
+ version: '0.9.22',
license: 'MIT',
meson_version: '>= 0.50.0',
default_options : [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Waybar-0.9.21/src/AModule.cpp
new/Waybar-0.9.22/src/AModule.cpp
--- old/Waybar-0.9.21/src/AModule.cpp 2023-08-14 15:33:52.000000000 +0200
+++ new/Waybar-0.9.22/src/AModule.cpp 2023-08-16 13:34:05.000000000 +0200
@@ -27,18 +27,20 @@
}
// configure events' user commands
-
- bool hasEvent =
- std::find_if(eventMap_.cbegin(), eventMap_.cend(), [&config](const auto&
eventEntry) {
- return config[eventEntry.second].isString();
- }) != eventMap_.cend();
-
- if (enable_click || hasEvent) {
+ if (enable_click) {
event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
event_box_.signal_button_press_event().connect(sigc::mem_fun(*this,
&AModule::handleToggle));
- // register key release
- event_box_.add_events(Gdk::BUTTON_RELEASE_MASK);
- event_box_.signal_button_release_event().connect(sigc::mem_fun(*this,
&AModule::handleToggle));
+ } else {
+ std::map<std::pair<uint, GdkEventType>, std::string>::const_iterator
it{eventMap_.cbegin()};
+ while (it != eventMap_.cend()) {
+ if (config_[it->second].isString()) {
+ event_box_.add_events(Gdk::BUTTON_PRESS_MASK);
+ event_box_.signal_button_press_event().connect(
+ sigc::mem_fun(*this, &AModule::handleToggle));
+ break;
+ }
+ ++it;
+ }
}
if (config_["on-scroll-up"].isString() ||
config_["on-scroll-down"].isString() || enable_scroll) {
event_box_.add_events(Gdk::SCROLL_MASK | Gdk::SMOOTH_SCROLL_MASK);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Waybar-0.9.21/src/modules/sni/item.cpp
new/Waybar-0.9.22/src/modules/sni/item.cpp
--- old/Waybar-0.9.21/src/modules/sni/item.cpp 2023-08-14 15:33:52.000000000
+0200
+++ new/Waybar-0.9.22/src/modules/sni/item.cpp 2023-08-16 13:34:05.000000000
+0200
@@ -22,7 +22,7 @@
template <typename FormatContext>
auto format(const Glib::VariantBase& value, FormatContext& ctx) {
if (is_printable(value)) {
- return formatter<std::string>::format(value.print(), ctx);
+ return
formatter<std::string>::format(static_cast<std::string>(value.print()), ctx);
} else {
return formatter<std::string>::format(value.get_type_string(), ctx);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Waybar-0.9.21/src/modules/wlr/taskbar.cpp
new/Waybar-0.9.22/src/modules/wlr/taskbar.cpp
--- old/Waybar-0.9.21/src/modules/wlr/taskbar.cpp 2023-08-14
15:33:52.000000000 +0200
+++ new/Waybar-0.9.22/src/modules/wlr/taskbar.cpp 2023-08-16
13:34:05.000000000 +0200
@@ -517,7 +517,7 @@
bool Task::handle_clicked(GdkEventButton *bt) {
/* filter out additional events for double/triple clicks */
if (bt->type == GDK_BUTTON_PRESS) {
- /* save where the button press ocurred in case it becomes a drag */
+ /* save where the button press occurred in case it becomes a drag */
drag_start_button = bt->button;
drag_start_x = bt->x;
drag_start_y = bt->y;
