diff --git a/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch b/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch deleted file mode 100644 index 03828ca..0000000 --- a/plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nurr plasma-workspace-5.24.90/shell/packageplugins/lookandfeel/lookandfeel.cpp plasma-workspace-5.24.90-new/shell/packageplugins/lookandfeel/lookandfeel.cpp ---- plasma-workspace-5.24.90/shell/packageplugins/lookandfeel/lookandfeel.cpp 2022-05-19 12:38:19.000000000 +0200 -+++ plasma-workspace-5.24.90-new/shell/packageplugins/lookandfeel/lookandfeel.cpp 2022-05-21 17:44:56.201054375 +0200 -@@ -10,7 +10,7 @@ - #include - #include - --#define DEFAULT_LOOKANDFEEL "org.kde.breeze.desktop" -+#define DEFAULT_LOOKANDFEEL "@DEFAULT_LOOKANDFEEL@" - - void LookAndFeelPackage::initPackage(KPackage::Package *package) - { -diff -Nurr plasma-workspace-5.24.90/startkde/startplasma.cpp plasma-workspace-5.24.90-new/startkde/startplasma.cpp ---- plasma-workspace-5.24.90/startkde/startplasma.cpp 2022-05-19 12:38:19.000000000 +0200 -+++ plasma-workspace-5.24.90-new/startkde/startplasma.cpp 2022-05-21 17:44:53.033054894 +0200 -@@ -350,7 +350,7 @@ - qputenv("XDG_CONFIG_DIRS", QFile::encodeName(extraConfigDir) + ':' + currentConfigDirs); - - const KConfig globals; -- const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("org.kde.breeze.desktop")); -+ const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("@DEFAULT_LOOKANDFEEL@")); - QFile activeLnf(extraConfigDir + QLatin1String("/package")); - activeLnf.open(QIODevice::ReadOnly); - if (activeLnf.readLine() != currentLnf.toUtf8()) { diff --git a/plasma-workspace-PR1508-sddm-theme-pc3.patch b/plasma-workspace-PR1508-sddm-theme-pc3.patch deleted file mode 100644 index 22ef7f9..0000000 --- a/plasma-workspace-PR1508-sddm-theme-pc3.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 119195493cf2492ddc35fbbc4d97266ceee16ad1 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Sat, 5 Mar 2022 19:48:56 +0100 -Subject: [PATCH] Port SDDM theme to PlasmaComponents 3.0 - -Uses a combobox instead of a menu + button ---- - sddm-theme/BreezeMenuStyle.qml | 25 ------------------ - sddm-theme/KeyboardButton.qml | 47 ++++++++++++---------------------- - sddm-theme/Main.qml | 1 - - sddm-theme/SessionButton.qml | 37 +++++++------------------- - 4 files changed, 26 insertions(+), 84 deletions(-) - delete mode 100644 sddm-theme/BreezeMenuStyle.qml - -diff --git a/sddm-theme/BreezeMenuStyle.qml b/sddm-theme/BreezeMenuStyle.qml -deleted file mode 100644 -index e4a91d4d6..000000000 ---- a/sddm-theme/BreezeMenuStyle.qml -+++ /dev/null -@@ -1,25 +0,0 @@ --import QtQuick 2.15 --// Don't bump them any further, these are the latest. --import QtQuick.Controls 1.6 as QQC --import QtQuick.Controls.Styles 1.4 as QQCS -- --import org.kde.plasma.core 2.0 as PlasmaCore -- --QQCS.MenuStyle { -- frame: Rectangle { -- color: PlasmaCore.ColorScope.backgroundColor -- border.color: Qt.tint(PlasmaCore.ColorScope.textColor, Qt.rgba(color.r, color.g, color.b, 0.7)) -- border.width: 1 -- } -- itemDelegate.label: QQC.Label { -- height: contentHeight * 1.2 -- verticalAlignment: Text.AlignVCenter -- color: styleData.selected ? PlasmaCore.ColorScope.highlightedTextColor : PlasmaCore.ColorScope.textColor -- font.pointSize: config.fontSize -- text: styleData.text -- } -- itemDelegate.background: Rectangle { -- visible: styleData.selected -- color: PlasmaCore.ColorScope.highlightColor -- } --} -diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml -index 6ebf0d5bb..a95884d04 100644 ---- a/sddm-theme/KeyboardButton.qml -+++ b/sddm-theme/KeyboardButton.qml -@@ -1,38 +1,25 @@ --import QtQuick 2.15 --import QtQuick.Controls 1.6 as QQC // Don't bump it any further, this is the latest. -+/* -+ SPDX-FileCopyrightText: 2016 David Edmundson - --import org.kde.plasma.core 2.0 as PlasmaCore --import org.kde.plasma.components 2.0 as PlasmaComponents // Because PC3 ToolButton can't take a menu -+ SPDX-License-Identifier: LGPL-2.0-or-later -+*/ - --PlasmaComponents.ToolButton { -- id: keyboardButton -+import QtQuick 2.15 - -- property int currentIndex: -1 -+import org.kde.plasma.core 2.0 as PlasmaCore -+import org.kde.plasma.components 3.0 as PlasmaComponents - -- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName) -- implicitWidth: minimumWidth -+PlasmaComponents.ComboBox { -+ id: root - -- visible: menu.items.length > 1 -+ PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup -+ PlasmaCore.ColorScope.inherit: false - -- Component.onCompleted: { -- currentIndex = Qt.binding(() => keyboard.currentLayout); -- } -+ currentIndex: keyboard.currentLayout -+ onCurrentIndexChanged: keyboard.currentLayout = currentIndex - -- menu: QQC.Menu { -- id: keyboardMenu -- style: BreezeMenuStyle {} -- Instantiator { -- id: instantiator -- model: keyboard.layouts -- onObjectAdded: keyboardMenu.insertItem(index, object) -- onObjectRemoved: keyboardMenu.removeItem(object) -- delegate: QQC.MenuItem { -- text: modelData.longName -- property string shortName: modelData.shortName -- onTriggered: { -- keyboard.currentLayout = model.index -- } -- } -- } -- } -+ visible: count > 1 -+ textRole: "longName" -+ model: keyboard.layouts -+ displayText: currentText.length === 0 ? "" : i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", currentText) - } -diff --git a/sddm-theme/Main.qml b/sddm-theme/Main.qml -index 0d6b66e77..690c132e3 100644 ---- a/sddm-theme/Main.qml -+++ b/sddm-theme/Main.qml -@@ -6,7 +6,6 @@ - - import QtQuick 2.15 - import QtQuick.Layouts 1.15 --import QtQuick.Controls 1.6 // Don't bump it any further, this is the latest. - import QtQuick.Controls 2.15 as QQC2 - import QtGraphicalEffects 1.15 - -diff --git a/sddm-theme/SessionButton.qml b/sddm-theme/SessionButton.qml -index 6934abda7..ed6ef96c2 100644 ---- a/sddm-theme/SessionButton.qml -+++ b/sddm-theme/SessionButton.qml -@@ -5,39 +5,20 @@ - */ - - import QtQuick 2.15 --import QtQuick.Controls 1.6 as QQC // Don't bump it any further, this is the latest. - - import org.kde.plasma.core 2.0 as PlasmaCore --import org.kde.plasma.components 2.0 as PlasmaComponents // Because PC3 ToolButton can't take a menu -+import org.kde.plasma.components 3.0 as PlasmaComponents - --PlasmaComponents.ToolButton { -+PlasmaComponents.ComboBox { - id: root -- property int currentIndex: -1 - -- implicitWidth: minimumWidth -+ PlasmaCore.ColorScope.colorGroup: PlasmaCore.Theme.NormalColorGroup -+ PlasmaCore.ColorScope.inherit: false - -- visible: menu.items.length > 1 -+ currentIndex: sessionModel.lastIndex - -- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", instantiator.objectAt(currentIndex).text || "") -- -- Component.onCompleted: { -- currentIndex = sessionModel.lastIndex -- } -- -- menu: QQC.Menu { -- id: menu -- style: BreezeMenuStyle {} -- Instantiator { -- id: instantiator -- model: sessionModel -- onObjectAdded: menu.insertItem(index, object) -- onObjectRemoved: menu.removeItem( object ) -- delegate: QQC.MenuItem { -- text: model.name -- onTriggered: { -- root.currentIndex = model.index -- } -- } -- } -- } -+ visible: count > 1 -+ model: sessionModel -+ textRole: "name" -+ displayText: currentText.length === 0 ? "" : i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Desktop Session: %1", currentText) - } --- -GitLab - diff --git a/plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch b/plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch deleted file mode 100644 index 4a02762..0000000 --- a/plasma-workspace-PR1510-sddm-theme-fix-weird-behavior.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b1b5877de0231f77f98475daabdb89a57351e4a2 Mon Sep 17 00:00:00 2001 -From: Aleix Pol -Date: Sun, 6 Mar 2022 03:05:14 +0100 -Subject: [PATCH] sddm/lockscreen: Fix weird behaviour - -Only make space for the virtual keyboard when it's visible. - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2058468 ---- - lookandfeel/contents/components/VirtualKeyboard_wayland.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lookandfeel/contents/components/VirtualKeyboard_wayland.qml b/lookandfeel/contents/components/VirtualKeyboard_wayland.qml -index 42895e2d9..b472fd529 100644 ---- a/lookandfeel/contents/components/VirtualKeyboard_wayland.qml -+++ b/lookandfeel/contents/components/VirtualKeyboard_wayland.qml -@@ -10,7 +10,7 @@ import org.kde.plasma.workspace.keyboardlayout 1.0 as Keyboards - - Item { - id: inputPanel -- readonly property bool active: Qt.inputMethod.visible -+ readonly property bool active: Keyboards.KWinVirtualKeyboard.visible - property bool activated: false - visible: Qt.inputMethod.visible - --- -GitLab - diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 4d11b3c..68a4351 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -28,7 +28,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.25.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://invent.kde.org/plasma/%{name} @@ -52,10 +52,6 @@ Source10: kde Source11: startkderc Source15: fedora.desktop -# backported breeze sddm from plasma 5.24.80~pre -# lets us apply patches to fix the sddm theme -Source19: sddm-theme-5.24.80~pre.tar.gz - # breeze fedora sddm theme components # includes f25-based preview (better than breeze or nothing at least) Source20: breeze-fedora-0.2.tar.gz @@ -72,7 +68,6 @@ Source41: spice-vdagent.conf ## downstream Patches Patch100: plasma-workspace-konsole-in-contextmenu.patch -Patch101: plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch # default to folderview (instead of desktop) containment, see also # https://mail.kde.org/pipermail/distributions/2016-July/000133.html # and example, @@ -261,13 +256,7 @@ Requires: iceauth xrdb xprop Requires: kde-settings-plasma # Default look-and-feel theme -%if 0%{?fedora} -%global default_lookandfeel org.fedoraproject.fedora.desktop Requires: plasma-lookandfeel-fedora = %{version}-%{release} -%endif -%if ! 0%{?default_lookandfeel:1} -Requires: desktop-backgrounds-compat -%endif Requires: systemd @@ -468,23 +457,8 @@ BuildArch: noarch %prep -%setup -q -a 19 -a 20 - -## upstream patches - -## upstreamable patches - -## downstream patches -%patch100 -p1 -b .konsole-in-contextmenu -# XXX: This is horribly broken and needs fixes upstream -- ngompa -%if 0%{?default_lookandfeel:1} -%patch101 -p1 -b .set-fedora-default-look-and-feel -sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfeel:org.kde.breeze.desktop}|g" \ - shell/packageplugins/lookandfeel/lookandfeel.cpp startkde/startplasma.cpp -%endif -%patch105 -p1 +%autosetup -a 20 -p1 -%if 0%{?fedora} # Populate initial lookandfeel package cp -a lookandfeel lookandfeel.fedora # Overwrite settings to configure twilight mode @@ -493,7 +467,6 @@ install -m 0644 %{SOURCE15} lookandfeel.fedora/metadata.desktop cat >> CMakeLists.txt <= 34 # Set Fedora distro vendor logo sed -i -e 's|^showlogo=.*$|showlogo=shown|g' %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/theme.conf sed -i -e 's|^logo=.*$|logo=%{_datadir}/pixmaps/fedora_whitelogo.svg|g' %{buildroot}%{_datadir}/sddm/themes/01-breeze-fedora/theme.conf -%endif # move sddm configuration snippet to the right place mkdir -p %{buildroot}%{_prefix}/lib/sddm mv %{buildroot}%{_sysconfdir}/sddm.conf.d %{buildroot}%{_prefix}/lib/sddm -%if 0%{?fedora} > 30 ## customize plasma-lookandfeel-fedora defaults # from [Wallpaper] Image=Next to Image=Fedora sed -i -e 's|^Image=.*$|Image=Fedora|g' \ %{buildroot}%{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/contents/defaults -%endif # Make kcheckpass work install -m644 -p -D %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/kde @@ -795,13 +762,16 @@ fi %{_datadir}/xsessions/plasmax11.desktop %endif -%if 0%{?fedora} %files -n plasma-lookandfeel-fedora %{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.desktop/ -%endif %changelog +* Tue Jun 14 2022 Neal Gompa - 5.25.0-2 +- Remove broken mechanism for setting default look and feel +- Always ship Fedora look and feel theme +- Drop unneeded sddm theme snapshot and patches + * Thu Jun 09 2022 Marc Deop - 5.25.0-1 - 5.25.0 diff --git a/sources b/sources index 789ab92..18ae78c 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344 SHA512 (plasma-workspace-5.25.0.tar.xz) = 0d52ab01752421e8056db666640e4c8fc31070a6a7704f78e8087f6b32fe22290da54ff830bb59870dcd7e007bd6798859358e163e4ed334d4f31041a3b743c8 diff --git a/sources.keep b/sources.keep index 20f7e0e..58c0216 100644 --- a/sources.keep +++ b/sources.keep @@ -1,2 +1 @@ SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 -SHA512 (sddm-theme-5.24.80~pre.tar.gz) = 3b04c739d6054ecd9149178cafd3d7f53214a48fea834092707c5fd309018ea4986d4a955db7a2888a428c9b264e40403c36adae5f079d51979fe37912895344