Merge pull request #2939 from alebastr/ci-update-debian-dependencies

.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:

Dockerfiles/debian

@@ -3,11 +3,47 @@
 FROM debian:sid
 
 RUN apt update && \
-    apt install -y \
+    apt install --no-install-recommends --no-install-suggests -y \
-        build-essential meson ninja-build git pkg-config libinput10 libpugixml-dev libinput-dev     \
+        build-essential \
-        wayland-protocols libwayland-client0 libwayland-cursor0 libwayland-dev                      \
+        catch2 \
-        libegl1-mesa-dev libgles2-mesa-dev libgbm-dev libxkbcommon-dev libudev-dev libpixman-1-dev  \
+        cmake \
-        libgtkmm-3.0-dev libjsoncpp-dev scdoc libdbusmenu-gtk3-dev libnl-3-dev libnl-genl-3-dev     \
+        git \
-        libpulse-dev libmpdclient-dev gobject-introspection libgirepository1.0-dev libxkbcommon-dev \
+        gobject-introspection \
-        libxkbregistry-dev libxkbregistry0 libplayerctl-dev sudo python3-venv python3-pip &&        \
+        libdbusmenu-gtk3-dev \
-    apt clean
+        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

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'),

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

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

test/main.cpp

@@ -3,8 +3,9 @@
 #include <spdlog/sinks/stdout_sinks.h>
 #include <spdlog/spdlog.h>
 
-#if __has_include(<catch2/catch_all.hpp>)
+#if __has_include(<catch2/catch_session.hpp>)
-#include <catch2/catch_all.hpp>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_version_macros.hpp>
 #include <catch2/reporters/catch_reporter_tap.hpp>
 #else
 #include <catch2/catch.hpp>