Release 2.14.1

.github/workflows/tarball.yml

@@ -20,7 +20,7 @@ jobs:
       id: get-version
       run: |
         if ${{ github.event_name == 'push' }}; then
-          version="$( echo '${{ github.ref }}' | sed 's/^v//' )"
+          version="$( echo '${{ github.ref }}' | sed 's@^refs/tags/v@@' )"
         else
           version='${{ inputs.version }}'
         fi

CMakeLists.txt

@@ -25,8 +25,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 2)
-set(MIR_VERSION_MINOR 13)
-set(MIR_VERSION_PATCH 0)
+set(MIR_VERSION_MINOR 14)
+set(MIR_VERSION_PATCH 1)
 
 add_compile_definitions(MIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_compile_definitions(MIR_VERSION_MINOR=${MIR_VERSION_MINOR})

debian/changelog

@@ -1,3 +1,62 @@
+mir (2.14.1) UNRELEASED; urgency=medium
+
+  [ Alan Griffiths ]
+  * New upstream release 2.14.1
+
+    - ABI summary:
+      . miral ABI unchanged at 5
+      . mircommon ABI unchanged at 9
+      . mircookie ABI unchanged at 2
+      . mircore ABI unchanged at 2
+      . miroil ABI unchanged at 3
+      . mirplatform ABI unchanged at 26
+      . mirserver ABI unchanged at 58
+      . mirwayland ABI unchanged at 3
+      . mirplatformgraphics ABI unchanged at 20
+      . mirinputplatform ABI unchanged at 8
+    - Bugs fixed:
+      . Fix FTBFS on Debian/sid and Ubuntu/Mantic
+      . ci: fix tarball generation on tags
+
+ -- Alan Griffiths <[email protected]>  Fri, 21 Jul 2023 10:35:44 +0100
+
+mir (2.14.0) UNRELEASED; urgency=medium
+
+  [ Alan Griffiths ]
+  * New upstream release 2.14.0
+
+    - ABI summary:
+      . miral ABI unchanged at 5
+      . mircommon ABI unchanged at 9
+      . mircookie ABI unchanged at 2
+      . mircore ABI unchanged at 2
+      . miroil ABI unchanged at 3
+      . mirplatform ABI bumped to 26
+      . mirserver ABI unchanged at 58
+      . mirwayland ABI unchanged at 3
+      . mirplatformgraphics ABI unchanged at 20
+      . mirinputplatform ABI unchanged at 8
+    - Enhancements:
+      . [Wayland] Support screen lockers (`ext-session-lock-v1`)
+      . [Wayland] Support drag and drop
+      . [platforms] Consolidate RenderingPlatform implementations
+      . [platforms] aggregate multiple `Display`s into a combined configuration
+      . [platforms] Drop the dispmanx platform
+      . [platforms] Drop unused `last_frame_on` interface
+      . [Window management] "attached" windows can be "restored" by drag gesture
+      . [Xwayland] Ensure to call connection_is_allowed on xwayland sessions
+        (partial fix for #2830)
+      . Add support for cursor drag icons
+    - Bugs fixed:
+      . [platforms] Handle libinput device rejections better
+      . [platforms] Assume evdev platform is supported (Fixes: #2837)
+      . [platforms] Fix naming of outputs on Nvidia cards (Fixes: #2968)
+      . server/ShmBacking: Fix leak in `install_sigbus_handler`
+      . [Wayland] flush display before polling (Fixes #2902)
+      . [doc] ignore namespaces that we do not want exported (Fixes #2365)
+
+ -- Alan Griffiths <[email protected]>  Tue, 17 Jul 2023 11:55:37 +0100
+
 mir (2.13.0) UNRELEASED; urgency=medium
 
   [ Alan Griffiths ]

debian/control

@@ -75,7 +75,7 @@ Description: Display server for Ubuntu - server library
  .
  Contains the shared library needed by server applications for Mir.
 
-Package: libmirplatform25
+Package: libmirplatform26
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -123,7 +123,7 @@ Section: libdevel
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirplatform25 (= ${binary:Version}),
+Depends: libmirplatform26 (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libboost-program-options-dev,
          ${misc:Depends},

debian/libmirplatform26.install

@@ -0,0 +1 @@
+usr/lib/*/libmirplatform.so.26

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
 

src/CMakeLists.txt

@@ -1,5 +1,5 @@
 # We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
-set(MIRPLATFORM_ABI 25)
+set(MIRPLATFORM_ABI 26)
 
 set(MIRAL_VERSION_MAJOR 3)
 set(MIRAL_VERSION_MINOR 9)

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;
         }
     }

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(