From 9b5772c4820f3bda81e0ec3680162261cfc16185 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 23 Oct 2017 11:48:54 -0400
Subject: [PATCH] Keyboard: warn about missing ckbcomp, thanks @abucodonosor

---
 src/modules/keyboard/keyboard.conf                      | 2 ++
 src/modules/keyboard/keyboardwidget/keyboardpreview.cpp | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/src/modules/keyboard/keyboard.conf b/src/modules/keyboard/keyboard.conf
index 9f8f27524..ee97c3939 100644
--- a/src/modules/keyboard/keyboard.conf
+++ b/src/modules/keyboard/keyboard.conf
@@ -1,3 +1,5 @@
+# NOTE: you must have ckbcomp installed and runnable
+#       on the live system, for keyboard layout previews.
 ---
 # The name of the file to write X11 keyboard settings to
 # The default value is the name used by upstream systemd-localed.
diff --git a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
index f9fdf72e8..2916cbdf4 100644
--- a/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
+++ b/src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
@@ -20,6 +20,7 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "utils/Logger.h"
 #include "keyboardpreview.h"
 
 KeyBoardPreview::KeyBoardPreview( QWidget* parent )
@@ -113,10 +114,16 @@ bool KeyBoardPreview::loadCodes() {
     process.setEnvironment(QStringList() << "LANG=C" << "LC_MESSAGES=C");
     process.start("ckbcomp", param);
     if (!process.waitForStarted())
+    {
+        cDebug() << "WARNING: ckbcomp not found , keyboard preview disabled";
         return false;
+    }
 
     if (!process.waitForFinished())
+    {
+        cDebug() << "WARNING: ckbcomp failed, keyboard preview disabled";
         return false;
+    }
 
     // Clear codes
     codes.clear();