From b8b124dccb4c1ea2c7ab2b5e918524e044075726 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Fri, 22 Jan 2021 11:25:19 -0500
Subject: [PATCH] Switch to new Breeze Twilight-based theme
 (pagureio#fedora-kde/SIG#12)

- Adapt Wayland by default to new upstream settings
---
 .gitignore            |  3 +++
 plasma-workspace.spec | 40 ++++++++++++++++++++++++++++++----------
 sources               |  4 +++-
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b76a2d..79a158e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@
 /plasma-workspace-5.20.4.tar.xz
 /plasma-workspace-5.20.5.tar.xz
 /plasma-workspace-5.20.90.tar.xz
+/breezetwilight-defaults
+/breezetwilight-fullscreenpreview.jpg
+/breezetwilight-preview.png
diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index 8d82a11..f7bae67 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -4,7 +4,7 @@
 # repo or arch where there's no package that would provide plasmashell
 #global bootstrap 1
 
-%global kf5_version_min 5.50.0
+%global kf5_version_min 5.78.0
 
 # Control wayland by default
 %if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9)
@@ -16,7 +16,7 @@
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
 Version: 5.20.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 URL:     https://invent.kde.org/plasma/%{name}
@@ -43,6 +43,14 @@ Source15:       fedora.desktop
 # includes f25-based preview (better than breeze or nothing at least)
 Source20:       breeze-fedora-0.2.tar.gz
 
+# breeze fedora plasma theme components
+# includes breeze twilight settings and preview files
+# this will not be needed in 5.22 when breeze twilight replaces breeze
+# cf. https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/552
+Source30:       breezetwilight-defaults
+Source31:       breezetwilight-fullscreenpreview.jpg
+Source32:       breezetwilight-preview.png
+
 ## downstream Patches
 Patch100:       plasma-workspace-5.12.5-konsole-in-contextmenu.patch
 Patch101:       plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch
@@ -137,6 +145,8 @@ BuildRequires:  kf5-plasma-devel >= %{kf5_version_min}
 Requires:       kf5-plasma%{?_isa} >= %{_kf5_version}
 BuildRequires:  kf5-threadweaver-devel >= %{kf5_version_min}
 BuildRequires:  kf5-kded-devel >= %{kf5_version_min}
+BuildRequires:  kf5-kirigami2-devel >= %{kf5_version_min}
+BuildRequires:  kf5-kquickcharts-devel >= %{kf5_version_min}
 
 
 BuildRequires:  kf5-ksysguard-devel >= %{majmin_ver}
@@ -148,6 +158,7 @@ BuildRequires:  kwin-devel >= %{majmin_ver}
 
 BuildRequires:  kuserfeedback-devel
 BuildRequires:  plasma-wayland-protocols-devel
+BuildRequires:  plasma-breeze-devel >= %{version}
 
 BuildRequires:  chrpath
 BuildRequires:  desktop-file-utils
@@ -373,14 +384,18 @@ Requires:       qt5-qttools
 %description wayland
 %{summary}.
 
-%package xorg
+%package x11
 Summary:        Xorg support for Plasma
+# Rename this package to match upstream
+Obsoletes:      %{name}-xorg < 5.20.90-2
+Provides:       %{name}-xorg = %{version}-%{release}
+Provides:       %{name}-xorg%{?_isa} = %{version}-%{release}
 # Split of Xorg session into subpackage
 Obsoletes:      %{name} < 5.19.5-2
 Requires:       %{name} = %{version}-%{release}
 Requires:       kwin-x11 >= %{majmin_ver}
 Requires:       xorg-x11-server-Xorg
-%description xorg
+%description x11
 %{summary}.
 
 %package -n plasma-lookandfeel-fedora
@@ -415,6 +430,9 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee
 %if 0%{?fedora}
 cp -a lookandfeel lookandfeel-fedora
 install -m 0644 %{SOURCE15} lookandfeel-fedora/metadata.desktop
+install -m 0644 %{SOURCE30} lookandfeel-fedora/defaults
+install -m 0644 %{SOURCE31} lookandfeel-fedora/fullscreenpreview.jpg
+install -m 0644 %{SOURCE32} lookandfeel-fedora/preview.png
 cat >> CMakeLists.txt <<EOL
 plasma_install_package(lookandfeel-fedora org.fedoraproject.fedora.desktop look-and-feel lookandfeel)
 EOL
@@ -422,7 +440,8 @@ EOL
 
 
 %build
-%{cmake_kf5}
+%{cmake_kf5} %{?with_wayland_default:-DPLASMA_WAYLAND_DEFAULT_SESSION:BOOL=ON}
+
 %cmake_build
 
 
@@ -437,9 +456,6 @@ ln -s startplasma-x11 %{buildroot}%{_kf5_bindir}/startkde
 %else
 # compat symlink
 ln -s startplasma-wayland %{buildroot}%{_kf5_bindir}/startkde
-# rename desktop files
-mv %{buildroot}%{_datadir}/wayland-sessions/plasmawayland.desktop %{buildroot}%{_datadir}/wayland-sessions/plasma.desktop
-mv %{buildroot}%{_datadir}/xsessions/plasma.desktop %{buildroot}%{_datadir}/xsessions/plasmaxorg.desktop
 %endif
 
 %if 0%{?fedora}
@@ -686,12 +702,12 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 %{_datadir}/wayland-sessions/plasma.desktop
 %endif
 
-%files xorg
+%files x11
 %{_kf5_bindir}/startplasma-x11
 %if ! %{with wayland_default}
 %{_datadir}/xsessions/plasma.desktop
 %else
-%{_datadir}/xsessions/plasmaxorg.desktop
+%{_datadir}/xsessions/plasmax11.desktop
 %endif
 
 %if 0%{?fedora}
@@ -701,6 +717,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 
 
 %changelog
+* Fri Jan 22 2021 Neal Gompa <ngompa13@gmail.com> - 5.20.90-2
+- Switch to new Breeze Twilight-based theme (pagureio#fedora-kde/SIG#12)
+- Adapt Wayland by default to new upstream settings
+
 * Thu Jan 21 2021 Jan Grulich <jgrulich@redhat.com> - 5.20.90-1
 - 5.20.90 (beta)
 
diff --git a/sources b/sources
index 504bb16..4f994f7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,4 @@
-SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8
 SHA512 (plasma-workspace-5.20.90.tar.xz) = 06c75637600053a8329791c58d2500f9f29f539e9b54a430f3ac7d81d8515a5ef412f972a0b564b46081da558b8facbce4d3f713ebd658e0e66350b409425b87
+SHA512 (breezetwilight-defaults) = e05f7dab75704f95c576d9963260d38fa91ab9860be603a104a4742dabfad593ba24f26e11f02070b7f0e627886d589784ac5a0f35aee989ec53cbb317b571ed
+SHA512 (breezetwilight-fullscreenpreview.jpg) = e9e60cbe450696d9d7ed1f5f30122150079f0b75106be3a52122a1c246dca66bd99b75be850434ec3ae37b003a51423d495a506d3e35f2e0a563be172dec1cdb
+SHA512 (breezetwilight-preview.png) = e625ebd61624a0ac45d80f274c7f6ed2f1dd3ac1f7d66cc2a72524545ca4fc7a3997dd90a57a506b4840978a47c5403630b65ea546d37ab1de165ebf013e8148