From fa0df640602991dc28de88da1e6747767d2ce70e Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 4 Feb 2020 21:03:59 +0100
Subject: [PATCH 1/3] tooltips always have normal color group

---
 applets/digital-clock/package/contents/ui/Tooltip.qml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applets/digital-clock/package/contents/ui/Tooltip.qml b/applets/digital-clock/package/contents/ui/Tooltip.qml
index d82fc7fc7..e5492cb4d 100644
--- a/applets/digital-clock/package/contents/ui/Tooltip.qml
+++ b/applets/digital-clock/package/contents/ui/Tooltip.qml
@@ -34,6 +34,8 @@ Item {
 
     LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
+    PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup
+    PlasmaCore.ColorScope.inherit: false
 
     function timeForZone(zone) {
         var compactRepresentationItem = plasmoid.compactRepresentationItem;

From 88bfbad0db28fbebaf5748492634aca26320b64b Mon Sep 17 00:00:00 2001
From: Jonathan Riddell <jr@jriddell.org>
Date: Thu, 6 Feb 2020 12:55:53 +0000
Subject: [PATCH 2/3] Update version number for 5.18.0 GIT_SILENT

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ac58afaa..2358810f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(plasma-workspace)
-set(PROJECT_VERSION "5.17.90")
+set(PROJECT_VERSION "5.18.0")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.12.0")

From 76ccc0909999993c534d32f4a9ca7c2a678f9c4d Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Sat, 8 Feb 2020 13:24:08 +0100
Subject: [PATCH 3/3] sddm-theme: Use non-deprecated KDEInstallDirs variable

Summary:
Also drop the prefix and use the KDE_INSTALL_FULL.. variant for an
absolute path (similar to logo=${KDE_INSTALL_FULL_DATADIR}...).

Test Plan:
Checked that the path of the background image is the same as
before.

Reviewers: #plasma

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D27241
---
 sddm-theme/theme.conf.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
index 36668cf48..8494a5c8a 100644
--- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake
@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
 type=image
 color=#1d99f3
 fontSize=10
-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.jpg
+background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
 needsFullUserModel=false