Overview

File xkb.patch of Package mir

diff -ruN mir-2.15.0.orig/cmake/FindXKBCOMMON.cmake mir-2.15.0/cmake/FindXKBCOMMON.cmake
--- mir-2.15.0.orig/cmake/FindXKBCOMMON.cmake	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/cmake/FindXKBCOMMON.cmake	2023-10-28 21:13:17.375690764 +0700
@@ -1,6 +1,6 @@
 pkg_check_modules( PC_XKBCOMMON QUIET xkbcommon )
 
-find_path(XKBCOMMON_INCLUDE_DIR xkbcommon/xkbcommon.h
+find_path(XKBCOMMON_INCLUDE_DIR libxkbcommon/xkbcommon/xkbcommon.h
           HINTS ${PC_XKBCOMMON_INCLUDEDIR} ${PC_XKBCOMMON_INCLUDE_DIRS})
 
 find_library(XKBCOMMON_LIBRARY xkbcommon
diff -ruN mir-2.15.0.orig/examples/miral-shell/shell_main.cpp mir-2.15.0/examples/miral-shell/shell_main.cpp
--- mir-2.15.0.orig/examples/miral-shell/shell_main.cpp	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/examples/miral-shell/shell_main.cpp	2023-10-28 21:13:17.789020684 +0700
@@ -32,7 +32,7 @@
 #include <miral/x11_support.h>
 #include <miral/wayland_extensions.h>
 
-#include <xkbcommon/xkbcommon-keysyms.h>
+#include <libxkbcommon/xkbcommon/xkbcommon-keysyms.h>
 
 int main(int argc, char const* argv[])
 {
diff -ruN mir-2.15.0.orig/include/common/mir/input/buffer_keymap.h mir-2.15.0/include/common/mir/input/buffer_keymap.h
--- mir-2.15.0.orig/include/common/mir/input/buffer_keymap.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/include/common/mir/input/buffer_keymap.h	2023-10-28 21:13:17.915686305 +0700
@@ -22,7 +22,7 @@
 #include <vector>
 #include <string>
 #include <memory>
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 
 namespace mir
 {
diff -ruN mir-2.15.0.orig/include/common/mir_toolkit/events/input/keyboard_event.h mir-2.15.0/include/common/mir_toolkit/events/input/keyboard_event.h
--- mir-2.15.0.orig/include/common/mir_toolkit/events/input/keyboard_event.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/include/common/mir_toolkit/events/input/keyboard_event.h	2023-10-28 21:13:18.005685562 +0700
@@ -17,7 +17,7 @@
 #ifndef MIR_TOOLKIT_KEYBOARD_EVENT_H_
 #define MIR_TOOLKIT_KEYBOARD_EVENT_H_
 
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,7 +44,7 @@
 
 /**
  * Retrieve the xkb mapped keysym associated with the key acted on.. May
- * be interpreted as per <xkbcommon/xkb-keysyms.h>
+ * be interpreted as per <libxkbcommon/xkbcommon/xkb-keysyms.h>
  *
  *   \param [in] event The key event
  *   \return           The xkb_keysym
diff -ruN mir-2.15.0.orig/include/miral/miral/toolkit_event.h mir-2.15.0/include/miral/miral/toolkit_event.h
--- mir-2.15.0.orig/include/miral/miral/toolkit_event.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/include/miral/miral/toolkit_event.h	2023-10-28 21:13:18.182350769 +0700
@@ -19,7 +19,7 @@
 
 #include <mir_toolkit/events/enums.h>
 
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 
 struct MirEvent;
 struct MirKeyboardEvent;
@@ -145,7 +145,7 @@
 
 /**
  * Retrieve the xkb mapped keysym associated with the key acted on.. May
- * be interpreted as per <xkbcommon/xkbcommon-keysyms.h>
+ * be interpreted as per <libxkbcommon/xkbcommon/xkbcommon-keysyms.h>
  *
  *   \param [in] event The key event
  *   \return           The xkb_keysym
diff -ruN mir-2.15.0.orig/include/test/mir/test/event_matchers.h mir-2.15.0/include/test/mir/test/event_matchers.h
--- mir-2.15.0.orig/include/test/mir/test/event_matchers.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/include/test/mir/test/event_matchers.h	2023-10-28 21:13:18.509014739 +0700
@@ -23,8 +23,8 @@
 
 #include <boost/type_index.hpp>
 
-#include <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-keysyms.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon-keysyms.h>
 
 #include <memory>
 
diff -ruN mir-2.15.0.orig/src/common/input/parameter_keymap.cpp mir-2.15.0/src/common/input/parameter_keymap.cpp
--- mir-2.15.0.orig/src/common/input/parameter_keymap.cpp	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/common/input/parameter_keymap.cpp	2023-10-28 21:13:18.735679534 +0700
@@ -18,7 +18,7 @@
 
 #include <stdexcept>
 #include <boost/throw_exception.hpp>
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 
 namespace mi = mir::input;
 
diff -ruN mir-2.15.0.orig/src/include/common/mir/input/xkb_mapper.h mir-2.15.0/src/include/common/mir/input/xkb_mapper.h
--- mir-2.15.0.orig/src/include/common/mir/input/xkb_mapper.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/include/common/mir/input/xkb_mapper.h	2023-10-28 21:13:18.962344329 +0700
@@ -22,8 +22,8 @@
 #include "mir/optional_value.h"
 #include "mir/events/xkb_modifiers.h"
 
-#include <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-compose.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon-compose.h>
 #include <mutex>
 #include <unordered_map>
 #include <unordered_set>
diff -ruN mir-2.15.0.orig/src/platforms/wayland/displayclient.cpp mir-2.15.0/src/platforms/wayland/displayclient.cpp
--- mir-2.15.0.orig/src/platforms/wayland/displayclient.cpp	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/platforms/wayland/displayclient.cpp	2023-10-28 21:13:21.218992361 +0700
@@ -24,7 +24,7 @@
 
 #include <fcntl.h>
 #include <sys/mman.h>
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 
 #include <boost/throw_exception.hpp>
 
diff -ruN mir-2.15.0.orig/src/platforms/wayland/display.h mir-2.15.0/src/platforms/wayland/display.h
--- mir-2.15.0.orig/src/platforms/wayland/display.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/platforms/wayland/display.h	2023-10-28 21:13:21.138993022 +0700
@@ -25,7 +25,7 @@
 #include <mir/graphics/display_report.h>
 #include <mir/renderer/gl/context_source.h>
 
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 
 #include <thread>
 #include <deque>
diff -ruN mir-2.15.0.orig/src/platforms/wayland/display_input.h mir-2.15.0/src/platforms/wayland/display_input.h
--- mir-2.15.0.orig/src/platforms/wayland/display_input.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/platforms/wayland/display_input.h	2023-10-28 21:13:21.152326245 +0700
@@ -22,7 +22,7 @@
 #include <mir/geometry/point.h>
 #include <mir/geometry/displacement.h>
 
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 
 #include <chrono>
 #include <vector>
diff -ruN mir-2.15.0.orig/src/platforms/wayland/input_device.h mir-2.15.0/src/platforms/wayland/input_device.h
--- mir-2.15.0.orig/src/platforms/wayland/input_device.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/platforms/wayland/input_device.h	2023-10-28 21:13:21.248992114 +0700
@@ -24,7 +24,7 @@
 #include <mir/input/input_device.h>
 #include <mir/input/input_device_info.h>
 
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 
 #include <chrono>
 #include <functional>
diff -ruN mir-2.15.0.orig/src/platforms/x11/input/input_platform.cpp mir-2.15.0/src/platforms/x11/input/input_platform.cpp
--- mir-2.15.0.orig/src/platforms/x11/input/input_platform.cpp	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/platforms/x11/input/input_platform.cpp	2023-10-28 21:13:21.458990380 +0700
@@ -32,8 +32,8 @@
 #include <chrono>
 
 #include <xcb/xfixes.h>
-#include <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-x11.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon-x11.h>
 
 // xcb/xkb.h has a struct member named "explicit", which C++ does not like
 #ifdef __clang__
diff -ruN mir-2.15.0.orig/src/server/frontend_wayland/keyboard_helper.h mir-2.15.0/src/server/frontend_wayland/keyboard_helper.h
--- mir-2.15.0.orig/src/server/frontend_wayland/keyboard_helper.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/server/frontend_wayland/keyboard_helper.h	2023-10-28 21:13:22.002319227 +0700
@@ -26,7 +26,7 @@
 struct MirEvent;
 struct MirKeyboardEvent;
 
-// from <xkbcommon/xkbcommon.h>
+// from <libxkbcommon/xkbcommon/xkbcommon.h>
 struct xkb_keymap;
 struct xkb_state;
 struct xkb_context;
diff -ruN mir-2.15.0.orig/src/server/frontend_wayland/wl_keyboard.cpp mir-2.15.0/src/server/frontend_wayland/wl_keyboard.cpp
--- mir-2.15.0.orig/src/server/frontend_wayland/wl_keyboard.cpp	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/server/frontend_wayland/wl_keyboard.cpp	2023-10-28 21:13:22.412315841 +0700
@@ -22,7 +22,7 @@
 #include "mir/events/keyboard_event.h"
 #include "mir/wayland/client.h"
 
-#include <xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
 #include <cstring> // memcpy
 
 namespace mf = mir::frontend;
diff -ruN mir-2.15.0.orig/src/server/input/key_repeat_dispatcher.cpp mir-2.15.0/src/server/input/key_repeat_dispatcher.cpp
--- mir-2.15.0.orig/src/server/input/key_repeat_dispatcher.cpp	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/src/server/input/key_repeat_dispatcher.cpp	2023-10-28 21:13:23.275642046 +0700
@@ -23,7 +23,7 @@
 #include "mir/events/event_builders.h"
 #include "mir/cookie/authority.h"
 
-#include <xkbcommon/xkbcommon-keysyms.h>
+#include <libxkbcommon/xkbcommon/xkbcommon-keysyms.h>
 
 #include <boost/throw_exception.hpp>
 
diff -ruN mir-2.15.0.orig/tests/include/mir/test/doubles/mock_xkb.h mir-2.15.0/tests/include/mir/test/doubles/mock_xkb.h
--- mir-2.15.0.orig/tests/include/mir/test/doubles/mock_xkb.h	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/tests/include/mir/test/doubles/mock_xkb.h	2023-10-28 21:13:25.625622641 +0700
@@ -19,8 +19,8 @@
 
 #include <gmock/gmock.h>
 
-#include <xkbcommon/xkbcommon.h>
-#include <xkbcommon/xkbcommon-x11.h>
+#include <libxkbcommon/xkbcommon/xkbcommon.h>
+#include <libxkbcommon/xkbcommon/xkbcommon-x11.h>
 
 struct xcb_connection_t;
 
diff -ruN mir-2.15.0.orig/tests/unit-tests/input/test_key_repeat_dispatcher.cpp mir-2.15.0/tests/unit-tests/input/test_key_repeat_dispatcher.cpp
--- mir-2.15.0.orig/tests/unit-tests/input/test_key_repeat_dispatcher.cpp	2023-08-22 17:47:37.000000000 +0700
+++ mir-2.15.0/tests/unit-tests/input/test_key_repeat_dispatcher.cpp	2023-10-28 21:13:27.655605879 +0700
@@ -35,7 +35,7 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include <xkbcommon/xkbcommon-keysyms.h>
+#include <libxkbcommon/xkbcommon/xkbcommon-keysyms.h>
 
 namespace mi = mir::input;
 namespace mev = mir::events;
openSUSE Build Service is sponsored by
Places