aports/testing/mir/0004-Missing-algorithm-header-for-gcc14.patch
2024-09-28 14:20:00 +00:00

75 lines
2.5 KiB
Diff

Patch-Source: https://github.com/canonical/mir/commit/6f5506d5f18cf6bd7a5f5a8dc640a37fb82359d3
--
From 0348e668eec700de9ae4c1694326a201e22f0912 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@fedoraproject.org>
Date: Thu, 18 Jan 2024 14:42:27 +0000
Subject: [PATCH] Add missing includes for <algorithm>
---
src/miral/external_client.cpp | 1 +
src/miral/keymap.cpp | 1 +
src/platform/graphics/linux_dmabuf.cpp | 1 +
src/server/scene/rendering_tracker.cpp | 1 +
tests/unit-tests/graphics/test_overlapping_output_grouping.cpp | 1 +
5 files changed, 5 insertions(+)
diff --git a/src/miral/external_client.cpp b/src/miral/external_client.cpp
index 0c3d1762ed8..792b96221bd 100644
--- a/src/miral/external_client.cpp
+++ b/src/miral/external_client.cpp
@@ -22,6 +22,7 @@
#include <mir/options/option.h>
#include <mir/server.h>
+#include <algorithm>
#include <stdexcept>
namespace mo = mir::options;
diff --git a/src/miral/keymap.cpp b/src/miral/keymap.cpp
index e494a10837c..010cb756d24 100644
--- a/src/miral/keymap.cpp
+++ b/src/miral/keymap.cpp
@@ -30,6 +30,7 @@
#define MIR_LOG_COMPONENT "miral::Keymap"
#include <mir/log.h>
+#include <algorithm>
#include <mutex>
#include <string>
#include <vector>
diff --git a/src/platform/graphics/linux_dmabuf.cpp b/src/platform/graphics/linux_dmabuf.cpp
index bd27f9f3f1d..f12ad91e6fb 100644
--- a/src/platform/graphics/linux_dmabuf.cpp
+++ b/src/platform/graphics/linux_dmabuf.cpp
@@ -41,6 +41,7 @@
#include <mutex>
#include <vector>
#include <optional>
+#include <algorithm>
#include <drm_fourcc.h>
#include <wayland-server.h>
diff --git a/src/server/scene/rendering_tracker.cpp b/src/server/scene/rendering_tracker.cpp
index fe4e05e2c76..24393a3e995 100644
--- a/src/server/scene/rendering_tracker.cpp
+++ b/src/server/scene/rendering_tracker.cpp
@@ -17,6 +17,7 @@
#include "rendering_tracker.h"
#include "mir/scene/surface.h"
+#include <algorithm>
#include <stdexcept>
#include <boost/throw_exception.hpp>
diff --git a/tests/unit-tests/graphics/test_overlapping_output_grouping.cpp b/tests/unit-tests/graphics/test_overlapping_output_grouping.cpp
index 44785785c10..7167ad14b4d 100644
--- a/tests/unit-tests/graphics/test_overlapping_output_grouping.cpp
+++ b/tests/unit-tests/graphics/test_overlapping_output_grouping.cpp
@@ -22,6 +22,7 @@
#include <gtest/gtest.h>
#include <vector>
+#include <algorithm>
namespace mg = mir::graphics;
namespace geom = mir::geometry;