Release 2.18.2

CMakeLists.txt

@@ -26,7 +26,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 set(MIR_VERSION_MAJOR 2)
 set(MIR_VERSION_MINOR 18)
-set(MIR_VERSION_PATCH 0)
+set(MIR_VERSION_PATCH 2)
 
 add_compile_definitions(MIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
 add_compile_definitions(MIR_VERSION_MINOR=${MIR_VERSION_MINOR})

debian/changelog

@@ -1,3 +1,22 @@
+mir (2.18.2) UNRELEASED; urgency=medium
+
+  * Bugfix release 2.18.2
+
+    Enhancements:
+    . Allow to specify an app id for when running on the wayland platform #3614
+    . Use generic logos for example applications #3617
+
+    Bugs fixed:
+    . SIGSEGV on input device disconnection #3601
+    . Frame fails to enforce fullscreen on wpe-webkit-mir-kiosk #3600
+    . Chromium unmaximises when focus is lost #3592
+    . Apps constantly resizing #3573
+    . Our fork/exec spawning is unsafe #3494
+    . Revert "Fix random leak" #3609
+    . Smoke tests are failing #3610
+
+ -- Michał Sawicz <[email protected]>  Thu, 19 Sep 2024 16:17:13 +0200
+
 mir (2.18.0) UNRELEASED; urgency=medium
 
   * New upstream release 2.18.0

debian/mir-demos.install

@@ -4,4 +4,4 @@ usr/bin/miral-app
 usr/bin/miral-terminal
 usr/bin/miral-system-compositor
 usr/share/applications/miral-shell.desktop
-usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
+usr/share/icons/hicolor/scalable/apps/spiral-logo.svg

examples/miral-shell/desktop/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(ICON_NAME ubuntu-logo)
+set(ICON_NAME spiral-logo)
 
 configure_file(miral-shell.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop @ONLY)
 

src/miral/input_configuration.cpp

@@ -38,7 +38,7 @@ class miral::InputConfiguration::Touchpad::Self : public TouchpadInputConfigurat
 class miral::InputConfiguration::Self
 {
 public:
-    std::shared_ptr<mir::input::InputDeviceHub> input_device_hub{};
+    std::weak_ptr<mir::input::InputDeviceHub> input_device_hub{};
     std::shared_ptr<InputDeviceConfig> input_device_config;
 
     auto mouse() -> Mouse;
@@ -48,9 +48,9 @@ class miral::InputConfiguration::Self
 
     void apply(Mouse const& m)
     {
-        if (input_device_hub)
+        if (auto const idh = input_device_hub.lock())
         {
-            input_device_hub->for_each_mutable_input_device([&m](auto& input_device)
+            idh->for_each_mutable_input_device([&m](auto& input_device)
             {
                 m.self->apply_to(input_device);
             });
@@ -61,9 +61,9 @@ class miral::InputConfiguration::Self
 
     void apply(Touchpad const& t)
     {
-        if (input_device_hub)
+        if (auto const idh = input_device_hub.lock())
         {
-            input_device_hub->for_each_mutable_input_device([&t](auto& input_device)
+            idh->for_each_mutable_input_device([&t](auto& input_device)
             {
                 t.self->apply_to(input_device);
             });