From e4be4082a0146220ea27705a9f74e05d6cc08199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Mon, 28 Apr 2014 12:07:28 +0200
Subject: [PATCH] Require xkbcommon 0.4.1

That's the version required in Qt 5.3 and causing issues if there's a
mismatch in versions.

CCBUG: 333459
---
 CMakeLists.txt              | 2 +-
 cmake/modules/FindXKB.cmake | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ae42ccc3c..a4f1080c80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ set_package_properties(Wayland PROPERTIES
 add_feature_info("Wayland-Client" Wayland_Client_FOUND "Required for building the Wayland backend in KWin")
 add_feature_info("Wayland-EGL" Wayland_Egl_FOUND "Required for building the Wayland EGL compositing backend in KWin")
 
-find_package(XKB)
+find_package(XKB 0.4.1)
 set_package_properties(XKB PROPERTIES
                        TYPE OPTIONAL
                        PURPOSE "Required for building KWin with Wayland support"
diff --git a/cmake/modules/FindXKB.cmake b/cmake/modules/FindXKB.cmake
index 94a1e93547..e662b63388 100644
--- a/cmake/modules/FindXKB.cmake
+++ b/cmake/modules/FindXKB.cmake
@@ -46,6 +46,7 @@ if(NOT WIN32)
 
     set(XKB_LIBRARIES ${XKB_LIBRARY})
     set(XKB_INCLUDE_DIRS ${XKB_INCLUDE_DIR})
+    set(XKB_VERSION ${PKG_XKB_VERSION})
 
     include(FindPackageHandleStandardArgs)
     find_package_handle_standard_args(XKB
@@ -54,6 +55,8 @@ if(NOT WIN32)
         REQUIRED_VARS
             XKB_LIBRARY
             XKB_INCLUDE_DIR
+        VERSION_VAR
+            XKB_VERSION
     )
 
     if(XKB_FOUND AND NOT TARGET XKB::XKB)