From deacb3dc1d689de057c76aa6c339b0d63d0fbdc6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jul 06 2015 12:08:00 +0000
Subject: Switch to Next Keyboard Layout shortcut restores after OS restarting (#1234082)


---

diff --git a/do_not_reset_shortcut_for_changing_layout.patch b/do_not_reset_shortcut_for_changing_layout.patch
new file mode 100644
index 0000000..a4ccd71
--- /dev/null
+++ b/do_not_reset_shortcut_for_changing_layout.patch
@@ -0,0 +1,27 @@
+From d5d809aa349a72a4c6fa7c031c4cfe6938ea3eaa Mon Sep 17 00:00:00 2001
+From: Ivan Romanov <drizt@land.ru>
+Date: Sun, 5 Jul 2015 00:46:16 +0500
+Subject: [PATCH] keyboard: do not reset shortcut for changing layout
+
+With KGlobalAccel::NoAutoloading after restarting plasma
+Ctrl-Alt-K always is set to 'Switch to Next Keyboard Layout'
+---
+ kcms/keyboard/bindings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kcms/keyboard/bindings.cpp b/kcms/keyboard/bindings.cpp
+index a11941f..968721f 100644
+--- a/kcms/keyboard/bindings.cpp
++++ b/kcms/keyboard/bindings.cpp
+@@ -42,7 +42,7 @@ KeyboardLayoutActionCollection::KeyboardLayoutActionCollection(QObject* parent,
+ 	toggleAction->setText( i18n(actionName) );
+         KGlobalAccel::self()->setShortcut(toggleAction,
+                                           QList<QKeySequence>() << QKeySequence(Qt::ALT+Qt::CTRL+Qt::Key_K),
+-                                          KGlobalAccel::NoAutoloading);
++                                          KGlobalAccel::Autoloading);
+ 	if( configAction ) {
+ 	    toggleAction->setProperty("isConfigurationAction", true);
+ 	}
+-- 
+2.4.3
+
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 6dc182f..c5b89cc 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -1,6 +1,6 @@
 Name:           plasma-desktop
 Version:        5.3.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plasma Desktop shell
 
 License:        GPLv2+ and (GPLv2 or GPLv3)
@@ -27,6 +27,9 @@ Patch102: plasma-desktop-fedora_layout.patch
 Patch1: 0001-Fix-touchpad-backend-initialization.patch
 
 ## upstreamable patches
+# https://bugzilla.redhat.com/show_bug.cgi?id=1234082
+# https://git.reviewboard.kde.org/r/124255/
+Patch50: do_not_reset_shortcut_for_changing_layout.patch
 
 BuildRequires:  libusb-devel
 BuildRequires:  fontconfig-devel
@@ -284,6 +287,9 @@ fi
 
 
 %changelog
+* Mon Jul 06 2015 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-3
+- Switch to Next Keyboard Layout shortcut restores after OS restarting (#1234082)
+
 * Sat Jun 27 2015 Rex Dieter <rdieter@fedoraproject.org> 5.3.2-2
 - pull in upstream fix for kcm_touchpad: No touchpad found (#1199825)