From bdb2f2bd1ab0b4d43ddf44efd474826481e489dc Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Mon, 19 Feb 2024 16:28:29 -0800
Subject: [PATCH 1/3] chore: update Debian CI dependencies

This should speed-up "linux (debian)" and "clang-tidy" builds and enable
lints for more modules.
---
 Dockerfiles/debian | 52 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 8 deletions(-)

diff --git a/Dockerfiles/debian b/Dockerfiles/debian
index 7536fdfd..0745935e 100644
--- a/Dockerfiles/debian
+++ b/Dockerfiles/debian
@@ -3,11 +3,47 @@
 FROM debian:sid
 
 RUN apt update && \
-    apt install -y \
-        build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev     \
-        wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev                      \
-        libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev  \
-        libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev     \
-        libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev \
-        libxkbregistry-dev libxkbregistry0 libplayerctl-dev sudo python3-venv python3-pip &&        \
-    apt clean
+    apt install --no-install-recommends --no-install-suggests -y \
+        build-essential \
+        catch2 \
+        cmake \
+        git \
+        gobject-introspection \
+        libdbusmenu-gtk3-dev \
+        libegl1-mesa-dev \
+        libfmt-dev \
+        libgbm-dev \
+        libgirepository1.0-dev \
+        libgles2-mesa-dev \
+        libgtk-layer-shell-dev \
+        libgtkmm-3.0-dev \
+        libhowardhinnant-date-dev \
+        libiniparser-dev \
+        libinput-dev     \
+        libjack-jackd2-dev \
+        libjsoncpp-dev \
+        libmpdclient-dev \
+        libnl-3-dev \
+        libnl-genl-3-dev \
+        libpixman-1-dev  \
+        libplayerctl-dev \
+        libpugixml-dev \
+        libpulse-dev \
+        libsndio-dev \
+        libspdlog-dev \
+        libudev-dev \
+        libupower-glib-dev \
+        libwayland-dev \
+        libwireplumber-0.4-dev \
+        libxkbcommon-dev \
+        libxkbregistry-dev \
+        locales \
+        meson \
+        ninja-build \
+        pkg-config \
+        python3-pip \
+        python3-venv \
+        scdoc \
+        sudo \
+        wayland-protocols \
+    && apt clean

From d59d6e876599bbfb05d13b66746b9e4f15bfa7b9 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Mon, 19 Feb 2024 16:33:01 -0800
Subject: [PATCH 2/3] chore: remove duplicate fedora/c++20 job definition

---
 .github/workflows/linux.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 821f2c45..dc6b7ede 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -18,9 +18,6 @@ jobs:
           - opensuse
           - gentoo
         cpp_std: [c++20]
-        include:
-          - distro: fedora
-            cpp_std: c++20
 
     runs-on: ubuntu-latest
     container:

From 5d6acfd1d40934a2bb3c94e593f705a12a76b5c8 Mon Sep 17 00:00:00 2001
From: Aleksei Bavshin <alebastr89@gmail.com>
Date: Mon, 19 Feb 2024 16:49:27 -0800
Subject: [PATCH 3/3] test: restore compatibility with older Catch2 releases

---
 meson.build                | 1 -
 test/css_reload_helper.cpp | 1 -
 test/date.cpp              | 2 +-
 test/main.cpp              | 5 +++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/meson.build b/meson.build
index 2678cb13..46ff9926 100644
--- a/meson.build
+++ b/meson.build
@@ -558,7 +558,6 @@ endif
 
 catch2 = dependency(
     'catch2',
-    version: '>=3.5.1',
     default_options: [ 'tests=false' ],
     fallback: ['catch2', 'catch2_dep'],
     required: get_option('tests'),
diff --git a/test/css_reload_helper.cpp b/test/css_reload_helper.cpp
index 01850bc3..f3888a83 100644
--- a/test/css_reload_helper.cpp
+++ b/test/css_reload_helper.cpp
@@ -4,7 +4,6 @@
 
 #if __has_include(<catch2/catch_test_macros.hpp>)
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_all.hpp>
 #else
 #include <catch2/catch.hpp>
 #endif
diff --git a/test/date.cpp b/test/date.cpp
index 004d6aa8..d317f98a 100644
--- a/test/date.cpp
+++ b/test/date.cpp
@@ -7,7 +7,7 @@
 
 #if __has_include(<catch2/catch_test_macros.hpp>)
 #include <catch2/catch_test_macros.hpp>
-#include <catch2/matchers/catch_matchers_all.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 #else
 #include <catch2/catch.hpp>
 #endif
diff --git a/test/main.cpp b/test/main.cpp
index daeee69e..15e17b0f 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -3,8 +3,9 @@
 #include <spdlog/sinks/stdout_sinks.h>
 #include <spdlog/spdlog.h>
 
-#if __has_include(<catch2/catch_all.hpp>)
-#include <catch2/catch_all.hpp>
+#if __has_include(<catch2/catch_session.hpp>)
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_version_macros.hpp>
 #include <catch2/reporters/catch_reporter_tap.hpp>
 #else
 #include <catch2/catch.hpp>