From 8adb0a5644db9e204277ceba8c548e516f0139c5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 28 May 2024 15:03:22 -0500 Subject: [PATCH 1/3] .github/workflows: fix meson deprecations --- .github/workflows/freebsd.yml | 2 +- .github/workflows/linux.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index 0b628d19..7effb484 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -31,6 +31,6 @@ jobs: libdbusmenu libevdev libfmt libmpdclient libudev-devd meson \ pkgconf pipewire pulseaudio scdoc sndio spdlog wayland-protocols upower \ libinotify - meson build -Dman-pages=enabled + meson setup build -Dman-pages=enabled ninja -C build meson test -C build --no-rebuild --print-errorlogs --suite waybar diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index dc6b7ede..ae0f1f7f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: configure - run: meson -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build + run: meson setup -Dman-pages=enabled -Dcpp_std=${{matrix.cpp_std}} build - name: build run: ninja -C build - name: test From 381fe830081c4ce8fa7236b7f1e4e744f12487fe Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 28 May 2024 15:14:24 -0500 Subject: [PATCH 2/3] Makefile: fix meson deprecations --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b1dbfc6e..3bb11199 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,11 @@ default: build build: - meson build + meson setup build ninja -C build build-debug: - meson build --buildtype=debug + meson setup build --buildtype=debug ninja -C build install: build From c5b5b64dfa45bd30ff2b3cc7d158728dea5619cd Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 28 May 2024 15:33:16 -0500 Subject: [PATCH 3/3] modules/temperature: remove unused import --- src/modules/temperature.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/temperature.cpp b/src/modules/temperature.cpp index 922fa639..88910982 100644 --- a/src/modules/temperature.cpp +++ b/src/modules/temperature.cpp @@ -1,7 +1,5 @@ #include "modules/temperature.hpp" -#include - #include #include