waybar: apply some fixes

[kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Mon Dec 22 16:14:02 2025 +0100
Changeset:	831bfc64e0621a950d14fdbf42adaf47fa0123c5

Modified Files:
	waybar/Makefile
	waybar/PLIST
	waybar/distinfo
	waybar/patches/patch-meson.build
	waybar/patches/patch-src_modules_battery.cpp

Log Message:
waybar: apply some fixes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=831bfc64e0621a950d14fdbf42adaf47fa0123c5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 waybar/Makefile                              | 22 +++++++++++-----------
 waybar/PLIST                                 |  4 ++--
 waybar/distinfo                              |  4 ++--
 waybar/patches/patch-meson.build             |  2 +-
 waybar/patches/patch-src_modules_battery.cpp |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diffs:
diff --git a/waybar/Makefile b/waybar/Makefile
index 0b312e94fa..a003ffc535 100644
--- a/waybar/Makefile
+++ b/waybar/Makefile
@@ -15,7 +15,6 @@ USE_CXX_FEATURES+=	filesystem
 USE_LANGUAGES=		c c++
 
 USE_TOOLS+=	pkg-config gdbus-codegen
-#TOOL_DEPENDS+=	scdoc-[0-9]*:../../textproc/scdoc
 
 SUBST_CLASSES+=		nogit
 SUBST_STAGE.nogit=	pre-configure
@@ -25,23 +24,24 @@ SUBST_SED.nogit+=	-e 's/git =/\#git =/g'
 SUBST_SED.nogit+=	-e 's/git.found()/false/g'
 SUBST_SED.nogit+=	-e '/project_version/s/@0@/${PKGVERSION}/g'
 
-EGDIR=		${PREFIX}/share/examples/labwc
-CONF_FILES=	${EGDIR}/config.json ${PKG_SYSCONFDIR}/config.json
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	pre-configure
+SUBST_MESSAGE.conf=	Set SYSCONFDIR
+SUBST_FILES.conf+=	src/config.cpp
+SUBST_SED.conf+=	-e 's|SYSCONFDIR "|"${PKG_SYSCONFBASE}|g'
+
+EGDIR=		${PREFIX}/share/examples/waybar
+CONF_FILES=	${EGDIR}/config.jsonc ${PKG_SYSCONFDIR}/config.jsonc
 CONF_FILES+=	${EGDIR}/style.css ${PKG_SYSCONFDIR}/style.css
 
 PKG_SYSCONFSUBDIR=	xdg/waybar
-
-#INSTALLATION_DIRS+=	${PKGMANDIR}/man1
-
-#post-install:
-#	scdoc < ${WRKSRC}/swaybg.1.scd > ${WRKSRC}/swaybg.1
-#	${INSTALL_MAN} ${WRKSRC}/swaybg.1 \
-#		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/swaybg.1
+BUILD_DEFS+=		PKG_SYSCONFBASE
 
 .include "../../wip/gtk-layer-shell/buildlink3.mk"
 
 .include "../../devel/meson/build.mk"
-.include "../../textproc/scdoc/tool.mk"
+#.include "../../textproc/scdoc/tool.mk"
+.include "../../wip/scdoc/tool.mk"
 .include "../../devel/libdbusmenu-gtk3/buildlink3.mk"
 .include "../../devel/libinotify/buildlink3.mk"
 .include "../../devel/spdlog/buildlink3.mk"
diff --git a/waybar/PLIST b/waybar/PLIST
index 1a46c04e71..bfc6f4cd41 100644
--- a/waybar/PLIST
+++ b/waybar/PLIST
@@ -1,7 +1,5 @@
 @comment $NetBSD$
 bin/waybar
-examples/waybar/config.jsonc
-examples/waybar/style.css
 man/man5/waybar-battery.5
 man/man5/waybar-cffi.5
 man/man5/waybar-clock.5
@@ -40,3 +38,5 @@ man/man5/waybar-temperature.5
 man/man5/waybar-tray.5
 man/man5/waybar-wlr-taskbar.5
 man/man5/waybar.5
+share/examples/waybar/config.jsonc
+share/examples/waybar/style.css
diff --git a/waybar/distinfo b/waybar/distinfo
index 74c22d2cbb..223221b646 100644
--- a/waybar/distinfo
+++ b/waybar/distinfo
@@ -3,8 +3,8 @@ $NetBSD$
 BLAKE2s (waybar-0.14.0.tar.gz) = 11cff6a2a8923fdc41d055203c00e115c555e9ad45ac613c56ebcfa8c9bd8ad1
 SHA512 (waybar-0.14.0.tar.gz) = dc3d18f7117be8cce5979029110770699b0d9d737337c3cf27361d6ceda6fcde33dac9781e406a70eb24c9e0e95e3801d47e81d44bfb61c311510fb30dd975a7
 Size (waybar-0.14.0.tar.gz) = 341661 bytes
-SHA1 (patch-meson.build) = 0963fed3f36e52ceb2028c4a87714bbc0add6f90
-SHA1 (patch-src_modules_battery.cpp) = a50d16904dd9f9d229cb806f28416005eadae835
+SHA1 (patch-meson.build) = f954e53a9e904e8500044e764b78fbf61ad27ed6
+SHA1 (patch-src_modules_battery.cpp) = 99668d01253a9be6dcfe544899325a906ffb6a4b
 SHA1 (patch-src_modules_custom.cpp) = 644740e4862444b7ed33523affe5d97e5fcbdd32
 SHA1 (patch-src_modules_simpleclock.cpp) = 7ffa485e5cc9033e090d46133654243cbd1b3f8d
 SHA1 (patch-src_modules_user.cpp) = 7b9d5578a64d2b1fefbecd650549c5e9f8ea19ad
diff --git a/waybar/patches/patch-meson.build b/waybar/patches/patch-meson.build
index 1fa58f7f22..5f9c7c5fca 100644
--- a/waybar/patches/patch-meson.build
+++ b/waybar/patches/patch-meson.build
@@ -43,7 +43,7 @@ $NetBSD$
      'resources/style.css',
 -    install_dir: sysconfdir / 'xdg/waybar'
 +    #install_dir: sysconfdir / 'xdg/waybar'
-+    install_dir: prefix / 'examples/waybar'
++    install_dir: prefix / 'share/examples/waybar'
  )
  
  scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: get_option('man-pages'))
diff --git a/waybar/patches/patch-src_modules_battery.cpp b/waybar/patches/patch-src_modules_battery.cpp
index 29dd3a92d2..9382246ca4 100644
--- a/waybar/patches/patch-src_modules_battery.cpp
+++ b/waybar/patches/patch-src_modules_battery.cpp
@@ -66,7 +66,7 @@ $NetBSD$
 +}
 +
 +static bool stat_is_valid(prop_dictionary_t stat) {
-+  prop_object_t oBbj;
++  prop_object_t obj;
 +
 +  if ((stat == nullptr) ||
 +      ((obj = prop_dictionary_get(stat, "state")) == nullptr) ||