From a235aa6bd38ae81c85e0530027daaf38df254d18 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 17 Feb 2019 08:55:53 +0100
Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file) - always resolve
 ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 scripts/minimizeall/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/minimizeall/metadata.desktop b/scripts/minimizeall/metadata.desktop
index 3396b33cf3..c642d3ef47 100644
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@@ -7,7 +7,7 @@ Name[da]=Minimér alle
 Name[de]=Alle minimieren
 Name[el]=ΕλαχιστοποίησηΌλων
 Name[en_GB]=MinimiseAll
-Name[es]=Maximizar todo
+Name[es]=Minimizar todo
 Name[et]=Kõigi minimeerimine
 Name[eu]=Minimizatu guztiak
 Name[fi]=Pienennä kaikki

From 054ba695818581f92a25f76274d8b880e2af36f4 Mon Sep 17 00:00:00 2001
From: Jonathan Riddell <jr@jriddell.org>
Date: Tue, 5 Mar 2019 12:04:52 +0000
Subject: [PATCH 2/3] Update version number for 5.12.8 GIT_SILENT

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be4c0787b3..d94d8b88cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
 
 project(KWIN)
-set(PROJECT_VERSION "5.12.7")
+set(PROJECT_VERSION "5.12.8")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.9.0")

From f7af113261f7e899e1d954b0558b2c637a9cced1 Mon Sep 17 00:00:00 2001
From: Vlad Zagorodniy <vladzzag@gmail.com>
Date: Mon, 4 Mar 2019 16:09:55 +0200
Subject: [PATCH 3/3] Properly restore current desktop from session

Summary:
VirtualDesktopManager is initialized in two places: Workspace::init and
Workspace::initWithX11. The former method loads virtual desktops from
the config file and the latter method synchronizes VirtualDesktopManager
with RootInfo.

Both methods do

    if (!VirtualDesktopManager::self()->setCurrent(m_initialDesktop))
        VirtualDesktopManager::self()->setCurrent(1);

which makes sense in Workspace::init, but not in Workspace::initWithX11.

When Workspace::initWithX11 is called, the current virtual desktop is
the same as m_initialDesktop. So that piece of code basically makes
the first virtual desktop current no matter what.

BUG: 390295
FIXED-IN: 5.15.3

Reviewers: #kwin, davidedmundson

Reviewed By: #kwin, davidedmundson

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D19520
---
 workspace.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index bb3673d185..a0e6d5dbcc 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -398,10 +398,10 @@ void Workspace::initWithX11()
     // TODO: only in X11 mode
     // Extra NETRootInfo instance in Client mode is needed to get the values of the properties
     NETRootInfo client_info(connection(), NET::ActiveWindow | NET::CurrentDesktop);
-    if (!qApp->isSessionRestored())
+    if (!qApp->isSessionRestored()) {
         m_initialDesktop = client_info.currentDesktop();
-    if (!VirtualDesktopManager::self()->setCurrent(m_initialDesktop))
-        VirtualDesktopManager::self()->setCurrent(1);
+        vds->setCurrent(m_initialDesktop);
+    }
 
     // TODO: better value
     rootInfo->setActiveWindow(None);