From: Volker Schlecht <openbsd-ports@schlecht.dev>
Subject: [Update] devel/spdlog 1.17.0 and wayland/waybar 0.15.0
To: ports <ports@openbsd.org>
Date: Sun, 1 Mar 2026 10:31:14 +0100

Here's the next results of my "Build a viable niri desktop for volker@"
bikeshedding session:

This updates waybar to 0.15.0, enables niri support and removes the "calendar"
from our example config, which - since we don't have chrono-date - just causes
error logs.

devel/spdlog 1.17.0 is required by waybar 0.15.0

ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/wayland/waybar/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile	13 Jan 2026 20:53:56 -0000	1.2
+++ Makefile	1 Mar 2026 09:22:09 -0000
@@ -1,7 +1,6 @@
 COMMENT =	Customizable Wayland bar for wlroots based compositors
 
-V =		0.14.0
-REVISION =	0
+V =		0.15.0
 
 DIST_TUPLE=	github  Alexays Waybar ${V} .
 PKGNAME=	waybar-${V}
@@ -54,6 +53,7 @@ CONFIGURE_ARGS = 	-Dcava=disabled \
 			-Dlibevdev=disabled \
 			-Dlibnl=disabled \
 			-Dmpris=disabled \
+			-Dniri=true \
 			-Dpipewire=disabled \
 			-Dpulseaudio=disabled \
 			-Dsndio=enabled \
Index: distinfo
===================================================================
RCS file: /cvs/ports/wayland/waybar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	4 Jan 2026 18:15:27 -0000	1.1.1.1
+++ distinfo	1 Mar 2026 09:22:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (Alexays-Waybar-0.14.0.tar.gz) = fzhZd5uzpQKKchWyAAwuR2wDRTpSKJFkumCkvxuzdy8=
-SIZE (Alexays-Waybar-0.14.0.tar.gz) = 341661
+SHA256 (Alexays-Waybar-0.15.0.tar.gz) = IcK774jEBHPDVQA1gvkzHS+bigHv3M4JNe38X2sCOj4=
+SIZE (Alexays-Waybar-0.15.0.tar.gz) = 355671
Index: patches/patch-resources_config_jsonc
===================================================================
RCS file: /cvs/ports/wayland/waybar/patches/patch-resources_config_jsonc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-resources_config_jsonc
--- patches/patch-resources_config_jsonc	4 Jan 2026 18:15:27 -0000	1.1.1.1
+++ patches/patch-resources_config_jsonc	1 Mar 2026 09:22:09 -0000
@@ -38,16 +38,24 @@ Index: resources/config.jsonc
      ],
      // Modules configuration
      // "sway/workspaces": {
-@@ -68,6 +70,12 @@
-         "format-icons": ["", ""],
+@@ -69,6 +71,12 @@
          "tooltip": true,
          "tooltip-format": "{app}: {title}"
-+    },
+     },
 +    "sndio": {
 +       "sroll-step": "10",
 +       "format": "   {volume}% ",
 +       // "on-scroll-down": "sndioctl output.level=-0.1",
 +       // "on-scroll-up": "sndioctl output.level=+0.1"
-     },
++    },
      "mpd": {
          "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
+         "format-disconnected": "Disconnected ",
+@@ -112,7 +120,6 @@
+     },
+     "clock": {
+         // "timezone": "America/New_York",
+-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+         "format-alt": "{:%Y-%m-%d}"
+     },
+     "cpu": {
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/spdlog/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile	8 Jul 2024 08:20:44 -0000	1.5
+++ Makefile	1 Mar 2026 09:11:37 -0000
@@ -2,10 +2,10 @@ COMMENT =	fast C++ logging library
 
 GH_ACCOUNT =	gabime
 GH_PROJECT =	spdlog
-GH_TAGNAME =	v1.14.1
+GH_TAGNAME =	v1.17.0
 CATEGORIES =	devel
 
-SHARED_LIBS =	spdlog	2.0
+SHARED_LIBS =	spdlog	2.1
 
 # MIT
 PERMIT_PACKAGE =	Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/spdlog/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo	8 Jul 2024 08:20:44 -0000	1.4
+++ distinfo	1 Mar 2026 09:11:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (spdlog-1.14.1.tar.gz) = FYZQgCmn0GcN/LLZdXXc3CQtOGiiWXQrafEAgBq04Ws=
-SIZE (spdlog-1.14.1.tar.gz) = 270896
+SHA256 (spdlog-1.17.0.tar.gz) = 2IYpVcbXTlhGs/WAsWBdJCixHZekENhuL7E+hXzTp0Q=
+SIZE (spdlog-1.17.0.tar.gz) = 281801
Index: patches/patch-include_spdlog_common_h
===================================================================
RCS file: patches/patch-include_spdlog_common_h
diff -N patches/patch-include_spdlog_common_h
--- patches/patch-include_spdlog_common_h	20 Nov 2025 10:48:27 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-From 96a8f6250cbf4e8c76387c614f666710a2fa9bad Mon Sep 17 00:00:00 2001
-From: jdrouhard <john@drouhard.dev>
-Date: Thu, 9 Jan 2025 16:58:46 -0600
-Subject: [PATCH] fix: remove unused to_string_view overload in fmt >= 11.1 (#3314)
-
-Index: include/spdlog/common.h
---- include/spdlog/common.h.orig
-+++ include/spdlog/common.h
-@@ -364,12 +364,7 @@ SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string
- }
- #endif
- 
--#ifndef SPDLOG_USE_STD_FORMAT
--template <typename T, typename... Args>
--inline fmt::basic_string_view<T> to_string_view(fmt::basic_format_string<T, Args...> fmt) {
--    return fmt;
--}
--#elif __cpp_lib_format >= 202207L
-+#if defined(SPDLOG_USE_STD_FORMAT) &&  __cpp_lib_format >= 202207L
- template <typename T, typename... Args>
- SPDLOG_CONSTEXPR_FUNC std::basic_string_view<T> to_string_view(
-     std::basic_format_string<T, Args...> fmt) SPDLOG_NOEXCEPT {