Hello community, here is the log from the commit of package plasma-nm5 for openSUSE:Factory checked in at 2020-05-14 23:23:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-nm5 (Old) and /work/SRC/openSUSE:Factory/.plasma-nm5.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-nm5" Thu May 14 23:23:06 2020 rev:108 rq:805054 version:5.18.5 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-nm5/plasma-nm5.changes 2020-05-07 15:10:55.832423409 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-nm5.new.2738/plasma-nm5.changes 2020-05-14 23:23:09.280766268 +0200 @@ -1,0 +2,7 @@ +Wed May 13 08:25:17 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patches to fix appearance of the KCM (kde#418416): + * 0001-Use-system-color-scheme-from-Kirigami-instead-of-Pla.patch + * 0002-KCM-restore-original-color.patch + +------------------------------------------------------------------- New: ---- 0001-Use-system-color-scheme-from-Kirigami-instead-of-Pla.patch 0002-KCM-restore-original-color.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-nm5.spec ++++++ --- /var/tmp/diff_new_pack.yi2MV2/_old 2020-05-14 23:23:10.100768058 +0200 +++ /var/tmp/diff_new_pack.yi2MV2/_new 2020-05-14 23:23:10.104768067 +0200 @@ -35,6 +35,9 @@ Patch1: 0001-Revert-Require-NM-1.4.0-and-newer.patch Patch2: 0001-Revert-Use-NetworkManager-DeviceStatistics-instead-o.patch Patch3: 0001-Revert-Inform-about-missing-NetworkManager-VPN-plugi.patch +# PATCH-FIX-UPSTREAM (master) +Patch100: 0001-Use-system-color-scheme-from-Kirigami-instead-of-Pla.patch +Patch101: 0002-KCM-restore-original-color.patch BuildRequires: NetworkManager-devel >= 0.9.8.4 BuildRequires: extra-cmake-modules >= 1.3.0 BuildRequires: fdupes @@ -71,6 +74,7 @@ BuildRequires: pkgconfig(openconnect) >= 5.2 Requires: NetworkManager Requires: kded +Requires: kirigami2 Requires: kwalletd5 Requires: prison-qt5-imports Recommends: mobile-broadband-provider-info ++++++ 0001-Use-system-color-scheme-from-Kirigami-instead-of-Pla.patch ++++++ >From a380fadeb1357a56223ca0e8d0c9c319271f48e3 Mon Sep 17 00:00:00 2001 From: Jan Grulich <jgrul...@redhat.com> Date: Tue, 3 Mar 2020 11:19:36 +0100 Subject: [PATCH 1/2] Use system color scheme from Kirigami instead of Plasma theme color Summary: BUG: 418416 Reviewers: ngraham, #plasma, davidedmundson Reviewed By: #plasma, davidedmundson Subscribers: davidre, plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D27799 --- CMakeLists.txt | 15 +++++++-------- kcm/qml/main.qml | 5 ++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1339b789..22134c89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,14 +55,13 @@ set_package_properties(KF5ModemManagerQt PROPERTIES ecm_find_qmlmodule(org.kde.prison 1.0) -if (BUILD_MOBILE) - find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG) - set_package_properties(KF5Kirigami2 PROPERTIES - DESCRIPTION "A QtQuick based components set" - PURPOSE "Required at runtime by the mobile KCMs" - TYPE RUNTIME - ) -endif() +find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG) +set_package_properties(KF5Kirigami2 PROPERTIES + DESCRIPTION "A QtQuick based components set" + PURPOSE "Required at runtime by the KCMs" + TYPE RUNTIME +) + # Required only for getting information about NetworkManager version in CMake find_package(NetworkManager 1.4.0) diff --git a/kcm/qml/main.qml b/kcm/qml/main.qml index dd7e9a2e..cb21a280 100755 --- a/kcm/qml/main.qml +++ b/kcm/qml/main.qml @@ -24,6 +24,7 @@ import QtQuick.Controls 2.5 as QQC2 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.networkmanagement 0.2 as PlasmaNM +import org.kde.kirigami 2.9 as Kirigami Item { id: root @@ -35,11 +36,13 @@ Item { signal requestExportConnection(string connection) signal requestToChangeConnection(string name, string path) + Kirigami.Theme.colorSet: Kirigami.Theme.View + Rectangle { id: background anchors.fill: parent focus: true - color: theme.backgroundColor + color: Kirigami.Theme.backgroundColor } PlasmaNM.Handler { -- 2.25.1 ++++++ 0002-KCM-restore-original-color.patch ++++++ >From 750308b13e78fbe0bab0d323c18fdb92183995ac Mon Sep 17 00:00:00 2001 From: Jan Grulich <jgrul...@redhat.com> Date: Tue, 3 Mar 2020 14:53:37 +0100 Subject: [PATCH 2/2] KCM: restore original color BUG: 418416 --- kcm/qml/main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kcm/qml/main.qml b/kcm/qml/main.qml index cb21a280..3ada6ac6 100755 --- a/kcm/qml/main.qml +++ b/kcm/qml/main.qml @@ -36,7 +36,7 @@ Item { signal requestExportConnection(string connection) signal requestToChangeConnection(string name, string path) - Kirigami.Theme.colorSet: Kirigami.Theme.View + Kirigami.Theme.colorSet: Kirigami.Theme.Window Rectangle { id: background -- 2.25.1
