diff --git a/0001-Fix-include-paths.patch b/0001-Fix-include-paths.patch index 39721e5..dd685b0 100644 --- a/0001-Fix-include-paths.patch +++ b/0001-Fix-include-paths.patch @@ -4,42 +4,7 @@ Date: Tue, 29 Oct 2024 17:57:08 -0700 Subject: [PATCH] Fix include paths --- - src/common/events/CMakeLists.txt | 1 + - src/platforms/evdev/CMakeLists.txt | 2 ++ tests/include/mir/test/doubles/mock_libinput.h | 2 +- - tests/unit-tests/CMakeLists.txt | 1 + - 4 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/common/events/CMakeLists.txt b/src/common/events/CMakeLists.txt -index 515b48795a..e80bfd08a7 100644 ---- a/src/common/events/CMakeLists.txt -+++ b/src/common/events/CMakeLists.txt -@@ -39,4 +39,5 @@ add_library( - target_link_libraries(mirevents - PUBLIC - mircore -+ PkgConfig::XKBCOMMON - ) -diff --git a/src/platforms/evdev/CMakeLists.txt b/src/platforms/evdev/CMakeLists.txt -index 5658c980c0..48d8f73995 100644 ---- a/src/platforms/evdev/CMakeLists.txt -+++ b/src/platforms/evdev/CMakeLists.txt -@@ -13,6 +13,7 @@ target_link_libraries(mirevdevutilsobjects - PUBLIC - mircommon - mircore -+ PkgConfig::LIBINPUT - ) - - add_library(mirplatforminputevdevobjects OBJECT -@@ -27,6 +28,7 @@ target_link_libraries(mirplatforminputevdevobjects - mirplatform - mircommon - mircore -+ PkgConfig::LIBINPUT - ) - - add_library(mirplatforminputevdev MODULE diff --git a/tests/include/mir/test/doubles/mock_libinput.h b/tests/include/mir/test/doubles/mock_libinput.h index 4487f8290d..b59a4386d6 100644 --- a/tests/include/mir/test/doubles/mock_libinput.h @@ -53,18 +18,3 @@ index 4487f8290d..b59a4386d6 100644 namespace mir { -diff --git a/tests/unit-tests/CMakeLists.txt b/tests/unit-tests/CMakeLists.txt -index f297e1fb50..88e161d766 100644 ---- a/tests/unit-tests/CMakeLists.txt -+++ b/tests/unit-tests/CMakeLists.txt -@@ -187,6 +187,7 @@ target_link_libraries( - mircommon - - Boost::system -+ PkgConfig::LIBINPUT - PkgConfig::WAYLAND_SERVER - ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. - ) --- -2.46.1 - diff --git a/mir-2.19.0.tar.xz b/mir-2.19.0.tar.xz new file mode 100644 index 0000000..b4a8dec --- /dev/null +++ b/mir-2.19.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7f93798e1263a811dd23b5b7b3fc4626afc64f06074550897718dc5ad8f7d03 +size 6142024 diff --git a/mir.changes b/mir.changes index 6e8dd5e..03e7654 100644 --- a/mir.changes +++ b/mir.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Dec 2 22:13:35 UTC 2024 - Richard Rahl + +- update to 2.19.0: + * mirplatform ABI bumped to 30 + * mirserver ABI bumped to 61 + * [x11-kiosk] defer fullscreening of applications until they are placed once + * [x11-kiosk] Ensure windows are placed and repainted on X11 "CONFIGURE" + * [x11-kiosk] change enable-x11 default to true + * 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 + .desktop file suffix + * [Configuration] Split options into global and per-module configuration + * Ensure we always send an initial output enter + * Fix stuck-frame-after-mode-switch bug + * 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 + ReloadingYamlFileDisplayConfig::auto_reload() + * The miral::ConfigFile "Watcher" can be destroyed before the main loop + * [xwayland] Don't allow clients to place X11 windows + * Surfaces track scale changes on outputs they appear on + * New attached windows need to be placed +- switch to new upstream url +- use only the default Pillow package as BR, not all versions +- adapt 0001-Fix-include-paths.patch + ------------------------------------------------------------------- Thu Oct 31 17:03:03 UTC 2024 - Shawn Dunn diff --git a/mir.spec b/mir.spec index 6e8f72d..f6543f4 100644 --- a/mir.spec +++ b/mir.spec @@ -1,6 +1,7 @@ # # spec file for package mir # +# Copyright (c) 2024 SUSE LLC # Copyright (c) Shawn W Dunn # # All modifications and additions to the file contributed by third parties @@ -15,6 +16,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + # Disable lto %global _lto_cflags %{nil} @@ -25,19 +27,19 @@ # Set globals for easier future maintenance %global commonlibsover 11 %global mircoresover 2 -%global mirplatformsover 29 +%global mirplatformsover 30 %global lomirisover 5 -%global miralsover 7 +%global miralsover 7 %global mirserversover 61 %global mirwaylandsover 5 Name: mir -Version: 2.18.2 +Version: 2.19.0 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) +License: (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) URL: https://mir-server.io -Source: https://github.com/MirServer/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +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 BuildRequires: boost-devel @@ -57,22 +59,22 @@ BuildRequires: libboost_program_options-devel BuildRequires: libboost_system-devel BuildRequires: libxslt-tools BuildRequires: python3 -BuildRequires: %{python_module Pillow} +BuildRequires: python3-Pillow BuildRequires: systemtap-sdt-devel BuildRequires: valgrind +BuildRequires: cmake(GTest) >= 1.8.0 BuildRequires: cmake(glm) BuildRequires: cmake(glog) -BuildRequires: cmake(GTest) >= 1.8.0 BuildRequires: cmake(yaml-cpp) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gbm) >= 9.0.0 +BuildRequires: pkgconfig(gflags) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gflags) BuildRequires: pkgconfig(gtest) >= 1.8.0 BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libevdev) @@ -86,21 +88,21 @@ BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-eglstream) BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(wlcs) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon-x11) -BuildRequires: pkgconfig(wlcs) %description A set of libraries for building Wayland based shells. %package devel Summary: Development files for Mir -Requires: libmircommon%{commonlibsover} = %{version} -Requires: libmirserver%{mirserversover} = %{version} -Requires: libmiroil%{lomirisover} = %{version} Requires: %{name}-test-libs-static = %{version} +Requires: libmircommon%{commonlibsover} = %{version} +Requires: libmiroil%{lomirisover} = %{version} +Requires: libmirserver%{mirserversover} = %{version} %description devel This package provides the development files to create compositors built on Mir @@ -115,56 +117,56 @@ Mir that need acces to private internal interfaces %package -n libmircommon%{commonlibsover} Summary: Mir server library -License: LGPL-2.1-only or LGPL-3.0-only +License: LGPL-2.1-only OR LGPL-3.0-only %description -n libmircommon%{commonlibsover} Component library of the Mir compositing stack %package -n libmircore%{mircoresover} Summary: Mir core library -License: LGPL-2.1-only or LGPL-3.0-only +License: LGPL-2.1-only OR LGPL-3.0-only %description -n libmircore%{mircoresover} Component library of the Mir compositing stack %package -n libmirplatform%{mirplatformsover} Summary: Mir platform library -License: LGPL-2.1-only or LGPL-3.0-only +License: LGPL-2.1-only OR LGPL-3.0-only %description -n libmirplatform%{mirplatformsover} Component library of the Mir compositing stack %package -n libmiroil%{lomirisover} Summary: Lomiri compatibility libraries for Mir -License: LGPL-2.1-only or LGPL-3.0-only +License: LGPL-2.1-only OR LGPL-3.0-only %description -n libmiroil%{lomirisover} This package provides the libraries for Lomiri to use Mir as a Wayland compositor %package -n libmiral%{miralsover} Summary: Mir Abstraction Layer library -License: LGPL-2.1-only or LGPL-3.0-only +License: LGPL-2.1-only OR LGPL-3.0-only %description -n libmiral%{miralsover} 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 +License: GPL-2.0-only OR GPL-3.0-only %description -n libmirserver%{mirserversover} Component library of the Mir compositing stack %package -n libmirwayland%{mirwaylandsover} Summary: Mir Wayland library -License: LGPL-2.1-only or LGPL-3.0-only +License: LGPL-2.1-only OR LGPL-3.0-only %description -n libmirwayland%{mirwaylandsover} Component library of the Mir compsiting stack %package test-tools Summary: Testing tools for Mir -License: GPL-2.0-only or GPL-3.0-only +License: GPL-2.0-only OR GPL-3.0-only Requires: libmirserver%{mirserversover} = %{version} Requires: wlcs Recommends: %{name}-demos @@ -176,11 +178,11 @@ 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: libmirserver%{mirserversover} = %{version} +License: GPL-2.0-only OR GPL-3.0-only Requires: gnu-free-fonts Requires: hicolor-icon-theme Requires: inotify-tools +Requires: libmirserver%{mirserversover} = %{version} Requires: xkeyboard-config Requires: xwayland @@ -190,7 +192,7 @@ Mir display server %package test-libs-static Summary: Testing framework library for Mir -License: GPL-2.0-only or GPL-3.0-only +License: GPL-2.0-only OR GPL-3.0-only Requires: %{name}-devel = %{version} %description test-libs-static