Merge pull request #2983 from MirServer/g++-13

Fix FTBFS we see on Debian/sid and Ubuntu/Mantic
canonical · Jul 20, 2023 · 3574a94 · 3574a94
2 parents 36b0755 + 3fdad27
commit 3574a94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/debian/rules b/debian/rules
@@ -69,8 +69,8 @@ ifeq ($(USER) $(DEB_HOST_ARCH),buildd riscv64)
   endif
 endif
 
-# Disable pre-compiled headers on GCC-12
-ifneq ($(shell gcc --version | grep '12.[[:digit:]]\+.[[:digit:]]\+$$'),)
+# Disable pre-compiled headers on GCC-12 & 13
+ifneq ($(shell gcc --version | grep '1[23].[[:digit:]]\+.[[:digit:]]\+$$'),)
   COMMON_CONFIGURE_OPTIONS += -DMIR_USE_PRECOMPILED_HEADERS=OFF
 endif
 

diff --git a/src/server/frontend_xwayland/xwayland_clipboard_source.cpp b/src/server/frontend_xwayland/xwayland_clipboard_source.cpp
@@ -23,6 +23,7 @@
 #include <xcb/xfixes.h>
 #include <string.h>
 #include <unistd.h>
+#include <algorithm>
 #include <map>
 #include <set>
 
@@ -141,7 +142,8 @@ class mf::XWaylandClipboardSource::DataSender : public md::Dispatchable
         }
         else
         {
-            data.insert(data.end(), new_data.begin(), new_data.end());
+            data.reserve(data.size() + new_data.size());
+            std::copy(new_data.begin(), new_data.end(), std::back_inserter(data));
             return false;
         }
     }

diff --git a/tests/unit-tests/input/test_touchspot_controller.cpp b/tests/unit-tests/input/test_touchspot_controller.cpp
@@ -48,7 +48,7 @@ struct MockBufferAllocator : public mtd::StubBufferAllocator
     {
         using namespace testing;
         ON_CALL(*this, supported_pixel_formats())
-            .WillByDefault(Return(std::vector<MirPixelFormat>{ mir_pixel_format_argb_8888 }));
+            .WillByDefault(Return(std::initializer_list<MirPixelFormat>{ mir_pixel_format_argb_8888 }));
         ON_CALL(*this, alloc_software_buffer(_, _))
             .WillByDefault(
                 Invoke(