[PR PATCH] Waybar: update to 0.9.16.

[PR PATCH] Waybar: update to 0.9.16.

[icp1994]

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

There is a new pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages Waybar
https://github.com/void-linux/void-packages/pull/40762

Waybar: update to 0.9.16.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

A patch file from https://github.com/void-linux/void-packages/pull/40762.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Waybar-40762.patch --]
[-- Type: text/x-diff, Size: 7768 bytes --]

From 7f567adf8000d827c25e3f83833765a7b5378757 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 25 Nov 2022 19:14:50 +0530
Subject: [PATCH] Waybar: update to 0.9.16.

---
 srcpkgs/Waybar/patches/fmt-9.patch | 180 -----------------------------
 srcpkgs/Waybar/template            |  26 +++--
 2 files changed, 14 insertions(+), 192 deletions(-)
 delete mode 100644 srcpkgs/Waybar/patches/fmt-9.patch

diff --git a/srcpkgs/Waybar/patches/fmt-9.patch b/srcpkgs/Waybar/patches/fmt-9.patch
deleted file mode 100644
index d9a6aae3edf1..000000000000
--- a/srcpkgs/Waybar/patches/fmt-9.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 24a8332b62b5c1c8d480116655ce9c582d1f4516 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Mon, 11 Jul 2022 22:52:33 -0700
-Subject: [PATCH 1/3] fix: adapt to fmt 9.0.0 breaking changes
-
----
- include/util/json.hpp    | 8 ++++++++
- src/client.cpp           | 2 +-
- src/config.cpp           | 1 -
- src/modules/sni/host.cpp | 1 -
- src/modules/sway/bar.cpp | 1 -
- 5 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/include/util/json.hpp b/include/util/json.hpp
-index cc514e139..7cd43552b 100644
---- a/include/util/json.hpp
-+++ b/include/util/json.hpp
-@@ -1,7 +1,15 @@
- #pragma once
- 
-+#include <fmt/ostream.h>
- #include <json/json.h>
- 
-+#if (FMT_VERSION >= 90000)
-+
-+template <>
-+struct fmt::formatter<Json::Value> : ostream_formatter {};
-+
-+#endif
-+
- namespace waybar::util {
- 
- struct JsonParser {
-diff --git a/src/client.cpp b/src/client.cpp
-index be2ec9178..a815e2fe1 100644
---- a/src/client.cpp
-+++ b/src/client.cpp
-@@ -1,12 +1,12 @@
- #include "client.hpp"
- 
--#include <fmt/ostream.h>
- #include <spdlog/spdlog.h>
- 
- #include <iostream>
- 
- #include "idle-inhibit-unstable-v1-client-protocol.h"
- #include "util/clara.hpp"
-+#include "util/format.hpp"
- #include "wlr-layer-shell-unstable-v1-client-protocol.h"
- 
- waybar::Client *waybar::Client::inst() {
-diff --git a/src/config.cpp b/src/config.cpp
-index 5894cb6b1..dec3b50b2 100644
---- a/src/config.cpp
-+++ b/src/config.cpp
-@@ -1,6 +1,5 @@
- #include "config.hpp"
- 
--#include <fmt/ostream.h>
- #include <spdlog/spdlog.h>
- #include <unistd.h>
- #include <wordexp.h>
-diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp
-index 560d7368b..007862dcc 100644
---- a/src/modules/sni/host.cpp
-+++ b/src/modules/sni/host.cpp
-@@ -1,6 +1,5 @@
- #include "modules/sni/host.hpp"
- 
--#include <fmt/ostream.h>
- #include <spdlog/spdlog.h>
- 
- namespace waybar::modules::SNI {
-diff --git a/src/modules/sway/bar.cpp b/src/modules/sway/bar.cpp
-index 26234e3b5..f28b05025 100644
---- a/src/modules/sway/bar.cpp
-+++ b/src/modules/sway/bar.cpp
-@@ -1,6 +1,5 @@
- #include "modules/sway/bar.hpp"
- 
--#include <fmt/ostream.h>
- #include <spdlog/spdlog.h>
- 
- #include <sstream>
-
-From 3117aefdf3e0bcae6671ab4669241c934bc9ec50 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Tue, 12 Jul 2022 22:20:49 -0700
-Subject: [PATCH 2/3] fix: drop conditionals for ancient fmt versions
-
----
- include/modules/keyboard_state.hpp | 5 -----
- include/modules/simpleclock.hpp    | 6 +-----
- src/modules/clock.cpp              | 9 ++-------
- 3 files changed, 3 insertions(+), 17 deletions(-)
-
-diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp
-index 6af19d145..05fbec131 100644
---- a/include/modules/keyboard_state.hpp
-+++ b/include/modules/keyboard_state.hpp
-@@ -1,11 +1,6 @@
- #pragma once
- 
--#include <fmt/format.h>
--#if FMT_VERSION < 60000
--#include <fmt/time.h>
--#else
- #include <fmt/chrono.h>
--#endif
- #include <gtkmm/label.h>
- 
- #include "AModule.hpp"
-diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp
-index aa9a0a224..5cbee4c6c 100644
---- a/include/modules/simpleclock.hpp
-+++ b/include/modules/simpleclock.hpp
-@@ -1,11 +1,7 @@
- #pragma once
- 
--#include <fmt/format.h>
--#if FMT_VERSION < 60000
--#include <fmt/time.h>
--#else
- #include <fmt/chrono.h>
--#endif
-+
- #include "ALabel.hpp"
- #include "util/sleeper_thread.hpp"
- 
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 959cad903..467536e1e 100644
---- a/src/modules/clock.cpp
-+++ b/src/modules/clock.cpp
-@@ -1,15 +1,10 @@
- #include "modules/clock.hpp"
- 
--#include <spdlog/spdlog.h>
--
--#include <iomanip>
--#if FMT_VERSION < 60000
--#include <fmt/time.h>
--#else
- #include <fmt/chrono.h>
--#endif
-+#include <spdlog/spdlog.h>
- 
- #include <ctime>
-+#include <iomanip>
- #include <sstream>
- #include <type_traits>
- 
-
-From a44622aa9ff4b85c5eeb54663ecf9d7fe617bc08 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Wed, 13 Jul 2022 22:34:29 -0700
-Subject: [PATCH 3/3] fix: fmt 9.x deprecation warning for implicit enum
- conversions
-
----
- src/modules/mpd/state.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp
-index 4d1e8c91b..aa1a18f8e 100644
---- a/src/modules/mpd/state.cpp
-+++ b/src/modules/mpd/state.cpp
-@@ -10,6 +10,13 @@ namespace waybar::modules {
- }  // namespace waybar::modules
- #endif
- 
-+#if FMT_VERSION >= 90000
-+/* Satisfy fmt 9.x deprecation of implicit conversion of enums to int */
-+auto format_as(enum mpd_idle val) {
-+  return static_cast<std::underlying_type_t<enum mpd_idle>>(val);
-+}
-+#endif
-+
- namespace waybar::modules::detail {
- 
- #define IDLE_RUN_NOIDLE_AND_CMD(...)                                      \
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 38a2261341ff..44f4bcfe3935 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,9 +1,10 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.13
-revision=3
-_date_version=3.0.0
-create_wrksrc=yes
+version=0.9.16
+revision=1
+_date_version=3.0.1
+_mesonbuild_date_ver=3.0.0-1
+build_wrksrc=Waybar-${version}
 build_style=meson
 configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled
@@ -27,12 +28,12 @@ license="MIT"
 homepage="https://github.com/Alexays/Waybar"
 changelog="https://github.com/Alexays/Waybar/releases"
 # date library URLs and checksums taken from subprojects/date.wrap
-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="9e6553274ce3013d2be9912f975287efe4dfd38de4e335db43a73aff2a3b0a34
- 87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
- 6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
+distfiles="https://github.com/Alexays/Waybar/archive/ref/tags/${version}.tar.gz
+ https://github.com/HowardHinnant/date/archive/refs/tags/v${_date_version}.tar.gz
+ https://github.com/mesonbuild/hinnant-date/archive/refs/tags/${_mesonbuild_date_ver}.tar.gz"
+checksum="37ebd7b10e32e802afe9236ea9374fabb77b1abb2c203ca6173b27dc03128096
+ 7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538
+ f2aa492b59893f69367228bf802cbb0a07c4d52fac2185dfd8ebb5d16295d893"
 
 build_options="libnl pulseaudio dbusmenugtk mpd sndio"
 build_options_default="libnl pulseaudio dbusmenugtk mpd sndio"
@@ -42,8 +43,9 @@ desc_option_dbusmenugtk="Enable support for tray"
 desc_option_mpd="Enable support for MPD"
 
 post_extract() {
-	mv Waybar-${version}/* .
-	mv date-${_date_version} subprojects/
+	mv hinnant-date-${_mesonbuild_date_ver}/meson_options.txt date-${_date_version}/
+	mv hinnant-date-${_mesonbuild_date_ver}/meson.build date-${_date_version}/
+	mv date-${_date_version} Waybar-${version}/subprojects/
 }
 
 post_install() {

Re: [PR PATCH] [Updated] Waybar: update to 0.9.16.

[icp1994]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

There is an updated pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages Waybar
https://github.com/void-linux/void-packages/pull/40762

Waybar: update to 0.9.16.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

A patch file from https://github.com/void-linux/void-packages/pull/40762.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-Waybar-40762.patch --]
[-- Type: text/x-diff, Size: 7769 bytes --]

From 2e826143f7c216322113d23b0484b737354aee01 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 25 Nov 2022 19:14:50 +0530
Subject: [PATCH] Waybar: update to 0.9.16.

---
 srcpkgs/Waybar/patches/fmt-9.patch | 180 -----------------------------
 srcpkgs/Waybar/template            |  26 +++--
 2 files changed, 14 insertions(+), 192 deletions(-)
 delete mode 100644 srcpkgs/Waybar/patches/fmt-9.patch

diff --git a/srcpkgs/Waybar/patches/fmt-9.patch b/srcpkgs/Waybar/patches/fmt-9.patch
deleted file mode 100644
index d9a6aae3edf1..000000000000
--- a/srcpkgs/Waybar/patches/fmt-9.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 24a8332b62b5c1c8d480116655ce9c582d1f4516 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Mon, 11 Jul 2022 22:52:33 -0700
-Subject: [PATCH 1/3] fix: adapt to fmt 9.0.0 breaking changes
-
----
- include/util/json.hpp    | 8 ++++++++
- src/client.cpp           | 2 +-
- src/config.cpp           | 1 -
- src/modules/sni/host.cpp | 1 -
- src/modules/sway/bar.cpp | 1 -
- 5 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/include/util/json.hpp b/include/util/json.hpp
-index cc514e139..7cd43552b 100644
---- a/include/util/json.hpp
-+++ b/include/util/json.hpp
-@@ -1,7 +1,15 @@
- #pragma once
- 
-+#include <fmt/ostream.h>
- #include <json/json.h>
- 
-+#if (FMT_VERSION >= 90000)
-+
-+template <>
-+struct fmt::formatter<Json::Value> : ostream_formatter {};
-+
-+#endif
-+
- namespace waybar::util {
- 
- struct JsonParser {
-diff --git a/src/client.cpp b/src/client.cpp
-index be2ec9178..a815e2fe1 100644
---- a/src/client.cpp
-+++ b/src/client.cpp
-@@ -1,12 +1,12 @@
- #include "client.hpp"
- 
--#include <fmt/ostream.h>
- #include <spdlog/spdlog.h>
- 
- #include <iostream>
- 
- #include "idle-inhibit-unstable-v1-client-protocol.h"
- #include "util/clara.hpp"
-+#include "util/format.hpp"
- #include "wlr-layer-shell-unstable-v1-client-protocol.h"
- 
- waybar::Client *waybar::Client::inst() {
-diff --git a/src/config.cpp b/src/config.cpp
-index 5894cb6b1..dec3b50b2 100644
---- a/src/config.cpp
-+++ b/src/config.cpp
-@@ -1,6 +1,5 @@
- #include "config.hpp"
- 
--#include <fmt/ostream.h>
- #include <spdlog/spdlog.h>
- #include <unistd.h>
- #include <wordexp.h>
-diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp
-index 560d7368b..007862dcc 100644
---- a/src/modules/sni/host.cpp
-+++ b/src/modules/sni/host.cpp
-@@ -1,6 +1,5 @@
- #include "modules/sni/host.hpp"
- 
--#include <fmt/ostream.h>
- #include <spdlog/spdlog.h>
- 
- namespace waybar::modules::SNI {
-diff --git a/src/modules/sway/bar.cpp b/src/modules/sway/bar.cpp
-index 26234e3b5..f28b05025 100644
---- a/src/modules/sway/bar.cpp
-+++ b/src/modules/sway/bar.cpp
-@@ -1,6 +1,5 @@
- #include "modules/sway/bar.hpp"
- 
--#include <fmt/ostream.h>
- #include <spdlog/spdlog.h>
- 
- #include <sstream>
-
-From 3117aefdf3e0bcae6671ab4669241c934bc9ec50 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Tue, 12 Jul 2022 22:20:49 -0700
-Subject: [PATCH 2/3] fix: drop conditionals for ancient fmt versions
-
----
- include/modules/keyboard_state.hpp | 5 -----
- include/modules/simpleclock.hpp    | 6 +-----
- src/modules/clock.cpp              | 9 ++-------
- 3 files changed, 3 insertions(+), 17 deletions(-)
-
-diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp
-index 6af19d145..05fbec131 100644
---- a/include/modules/keyboard_state.hpp
-+++ b/include/modules/keyboard_state.hpp
-@@ -1,11 +1,6 @@
- #pragma once
- 
--#include <fmt/format.h>
--#if FMT_VERSION < 60000
--#include <fmt/time.h>
--#else
- #include <fmt/chrono.h>
--#endif
- #include <gtkmm/label.h>
- 
- #include "AModule.hpp"
-diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp
-index aa9a0a224..5cbee4c6c 100644
---- a/include/modules/simpleclock.hpp
-+++ b/include/modules/simpleclock.hpp
-@@ -1,11 +1,7 @@
- #pragma once
- 
--#include <fmt/format.h>
--#if FMT_VERSION < 60000
--#include <fmt/time.h>
--#else
- #include <fmt/chrono.h>
--#endif
-+
- #include "ALabel.hpp"
- #include "util/sleeper_thread.hpp"
- 
-diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
-index 959cad903..467536e1e 100644
---- a/src/modules/clock.cpp
-+++ b/src/modules/clock.cpp
-@@ -1,15 +1,10 @@
- #include "modules/clock.hpp"
- 
--#include <spdlog/spdlog.h>
--
--#include <iomanip>
--#if FMT_VERSION < 60000
--#include <fmt/time.h>
--#else
- #include <fmt/chrono.h>
--#endif
-+#include <spdlog/spdlog.h>
- 
- #include <ctime>
-+#include <iomanip>
- #include <sstream>
- #include <type_traits>
- 
-
-From a44622aa9ff4b85c5eeb54663ecf9d7fe617bc08 Mon Sep 17 00:00:00 2001
-From: Aleksei Bavshin <alebastr89@gmail.com>
-Date: Wed, 13 Jul 2022 22:34:29 -0700
-Subject: [PATCH 3/3] fix: fmt 9.x deprecation warning for implicit enum
- conversions
-
----
- src/modules/mpd/state.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp
-index 4d1e8c91b..aa1a18f8e 100644
---- a/src/modules/mpd/state.cpp
-+++ b/src/modules/mpd/state.cpp
-@@ -10,6 +10,13 @@ namespace waybar::modules {
- }  // namespace waybar::modules
- #endif
- 
-+#if FMT_VERSION >= 90000
-+/* Satisfy fmt 9.x deprecation of implicit conversion of enums to int */
-+auto format_as(enum mpd_idle val) {
-+  return static_cast<std::underlying_type_t<enum mpd_idle>>(val);
-+}
-+#endif
-+
- namespace waybar::modules::detail {
- 
- #define IDLE_RUN_NOIDLE_AND_CMD(...)                                      \
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 38a2261341ff..3d3a889229f2 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,9 +1,10 @@
 # Template file for 'Waybar'
 pkgname=Waybar
-version=0.9.13
-revision=3
-_date_version=3.0.0
-create_wrksrc=yes
+version=0.9.16
+revision=1
+_date_version=3.0.1
+_mesonbuild_date_ver=3.0.0-1
+build_wrksrc=Waybar-${version}
 build_style=meson
 configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
  -Dsystemd=disabled -Drfkill=enabled
@@ -27,12 +28,12 @@ license="MIT"
 homepage="https://github.com/Alexays/Waybar"
 changelog="https://github.com/Alexays/Waybar/releases"
 # date library URLs and checksums taken from subprojects/date.wrap
-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="9e6553274ce3013d2be9912f975287efe4dfd38de4e335db43a73aff2a3b0a34
- 87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
- 6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
+distfiles="https://github.com/Alexays/Waybar/archive/refs/tags/${version}.tar.gz
+ https://github.com/HowardHinnant/date/archive/refs/tags/v${_date_version}.tar.gz
+ https://github.com/mesonbuild/hinnant-date/archive/refs/tags/${_mesonbuild_date_ver}.tar.gz"
+checksum="37ebd7b10e32e802afe9236ea9374fabb77b1abb2c203ca6173b27dc03128096
+ 7a390f200f0ccd207e8cff6757e04817c1a0aec3e327b006b7eb451c57ee3538
+ f2aa492b59893f69367228bf802cbb0a07c4d52fac2185dfd8ebb5d16295d893"
 
 build_options="libnl pulseaudio dbusmenugtk mpd sndio"
 build_options_default="libnl pulseaudio dbusmenugtk mpd sndio"
@@ -42,8 +43,9 @@ desc_option_dbusmenugtk="Enable support for tray"
 desc_option_mpd="Enable support for MPD"
 
 post_extract() {
-	mv Waybar-${version}/* .
-	mv date-${_date_version} subprojects/
+	mv hinnant-date-${_mesonbuild_date_ver}/meson_options.txt date-${_date_version}/
+	mv hinnant-date-${_mesonbuild_date_ver}/meson.build date-${_date_version}/
+	mv date-${_date_version} Waybar-${version}/subprojects/
 }
 
 post_install() {

Re: [PR PATCH] [Merged]: Waybar: update to 0.9.16.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

There's a merged pull request on the void-packages repository

Waybar: update to 0.9.16.
https://github.com/void-linux/void-packages/pull/40762

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, x86_64