diff --git a/0001-Fix-include-paths.patch b/0001-Fix-include-paths.patch index dd685b0..8eb23a0 100644 --- a/0001-Fix-include-paths.patch +++ b/0001-Fix-include-paths.patch @@ -1,12 +1,14 @@ -From 5e3fcc09ed57313292ca76fd8d88196940d0c261 Mon Sep 17 00:00:00 2001 +From 9e7d2d41325fd09e89308101c67fd791a50c98c5 Mon Sep 17 00:00:00 2001 From: "Shawn W. Dunn" Date: Tue, 29 Oct 2024 17:57:08 -0700 -Subject: [PATCH] Fix include paths +Subject: [PATCH 1/2] Fix include paths --- tests/include/mir/test/doubles/mock_libinput.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/tests/include/mir/test/doubles/mock_libinput.h b/tests/include/mir/test/doubles/mock_libinput.h -index 4487f8290d..b59a4386d6 100644 +index 4487f82..b59a438 100644 --- a/tests/include/mir/test/doubles/mock_libinput.h +++ b/tests/include/mir/test/doubles/mock_libinput.h @@ -21,7 +21,7 @@ @@ -18,3 +20,6 @@ index 4487f8290d..b59a4386d6 100644 namespace mir { +-- +2.48.1 + diff --git a/0002-remove-use-of-env-to-call-bash.patch b/0002-remove-use-of-env-to-call-bash.patch new file mode 100644 index 0000000..2027dcd --- /dev/null +++ b/0002-remove-use-of-env-to-call-bash.patch @@ -0,0 +1,23 @@ +From 7e6144ce953c5fccc099f821d1e03a30c55b1534 Mon Sep 17 00:00:00 2001 +From: "Shawn W. Dunn" +Date: Mon, 20 Jan 2025 07:19:37 -0800 +Subject: [PATCH 2/2] remove use of env to call bash + +Change shebang from #!/usr/bin/env bash, to #!/usr/bin/bash +--- + examples/miral-shell/miral-app.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/miral-shell/miral-app.sh b/examples/miral-shell/miral-app.sh +index 11d4dde..6c8b6bd 100755 +--- a/examples/miral-shell/miral-app.sh ++++ b/examples/miral-shell/miral-app.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/bash + + miral_server=miral-shell + gdb="" +-- +2.48.1 + diff --git a/mir-2.19.2.tar.xz b/mir-2.19.2.tar.xz deleted file mode 100644 index 50e358f..0000000 --- a/mir-2.19.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d080ed68040a12a31480f08760c2e15678cb2f1d95006c6281644ea36a5a8324 -size 6141808 diff --git a/mir-2.19.3.tar.xz b/mir-2.19.3.tar.xz new file mode 100644 index 0000000..2f3a33f --- /dev/null +++ b/mir-2.19.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2157c337d1bf0a8c33adcb11e0cc0705da23436ed4e012ddf376133fbb5b21e4 +size 6141952 diff --git a/mir.changes b/mir.changes index 20a7c24..ca5458f 100644 --- a/mir.changes +++ b/mir.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 20 16:20:10 UTC 2025 - Shawn Dunn + +- Update to 2.19.3: + * Don't leak VirtualInputDevice keyboards (#3720) + * kms: skip simple-framebuffer devices (#3721) +- Add: + * 0002-remove-use-of-env-to-call-bash.patch + ------------------------------------------------------------------- Wed Dec 25 18:44:49 UTC 2024 - Shawn Dunn @@ -30,7 +39,7 @@ Mon Dec 2 22:13:35 UTC 2024 - Richard Rahl * Initial atomic-kms platform * [Wayland] Add support for xdg_activation_v1 * Do not default window size (especially to weird values) - * DesktopFileManager::resolve_app_id no longer returns an app id with a + * DesktopFileManager::resolve_app_id no longer returns an app id with a .desktop file suffix * [Configuration] Split options into global and per-module configuration * Ensure we always send an initial output enter @@ -38,7 +47,7 @@ Mon Dec 2 22:13:35 UTC 2024 - Richard Rahl * Fix rendering of resized XWayland applications with client side decorations * Aspect ratios shouldn't contain zero * Use PkgConfig to find development headers - * Fix the inotify event handling in + * Fix the inotify event handling in ReloadingYamlFileDisplayConfig::auto_reload() * The miral::ConfigFile "Watcher" can be destroyed before the main loop * [xwayland] Don't allow clients to place X11 windows diff --git a/mir.spec b/mir.spec index 05fdc3b..ccd1872 100644 --- a/mir.spec +++ b/mir.spec @@ -36,7 +36,7 @@ %global mirevdevsover 10 Name: mir -Version: 2.19.2 +Version: 2.19.3 Release: 0 Summary: Libraries for building Wayland shells License: (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) @@ -44,6 +44,8 @@ URL: https://mir-server.io Source: https://github.com/canonical/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM 0001-Fix-include-paths.patch Patch0: 0001-Fix-include-paths.patch +# PATCH-FIX-OPENSUSE 0002-remove-use-of-env-to-call-bash.patch +Patch1: 0002-remove-use-of-env-to-call-bash.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -157,10 +159,8 @@ Component library of the Mir compositing stack %package -n libmirserver%{mirserversover} Summary: Mir server library License: GPL-2.0-only OR GPL-3.0-only -Requires: libmirevdev%{mirevdevsover} = %{version} -Requires: libmirserverplatform%{mirserverplatformsover} = %{version} -Conflicts: libmirserver61 <= %{version} -Obsoletes: libmirserver61 <= %{version} +Requires: libmirserverplatform%{mirserverplatformsover} +Requires: libmirevdev%{mirevdevsover} %description -n libmirserver%{mirserversover} Component library of the Mir compositing stack @@ -175,8 +175,6 @@ Component library of the Mir compositing stack %package -n libmirserverplatform%{mirserverplatformsover} Summary: Mir Server Platform Library License: LGPL-2.1-only OR LGPL-3.0-only -Conflicts: libmirserver61 <= %{version} -Obsoletes: libmirserver61 <= %{version} %description -n libmirserverplatform%{mirserverplatformsover} Component library of the Mir server platform @@ -184,8 +182,6 @@ Component library of the Mir server platform %package -n libmirevdev%{mirevdevsover} Summary: Evdev support for Mir License: LGPL-2.1-only OR LGPL-3.0-only -Conflicts: libmirserver61 <= %{version} -Obsoletes: libmirserver61 <= %{version} %description -n libmirevdev%{mirevdevsover} evdev support library for the Mir server platform @@ -205,6 +201,7 @@ This package provides tools for testing Mir %package demos Summary: Demonstration applications using Mir License: GPL-2.0-only OR GPL-3.0-only +Requires: bash Requires: gnu-free-fonts Requires: hicolor-icon-theme Requires: inotify-tools