-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
plasma-integration: Update to v6.0.1 for Plasma 6
Release blog available [here](https://kde.org/announcements/megarelease/6/) Full Release Notes: - [5.27.80](https://kde.org/announcements/changelogs/plasma/5.27.9-5.27.80/) - [5.90.0](https://kde.org/announcements/changelogs/plasma/5.27.80-5.90.0/) - [5.91.0](https://kde.org/announcements/changelogs/plasma/5.90.0-5.91.0/) - [5.92.0](https://kde.org/announcements/changelogs/plasma/5.91.0-5.92.0/) - [5.93.0](https://kde.org/announcements/changelogs/plasma/5.92.0-5.93.0/) - [6.0.0](https://kde.org/announcements/changelogs/plasma/6/6.0.0-6.0.1/) Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
- Loading branch information
1 parent
1ed0230
commit 3754228
Showing
8 changed files
with
942 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| KDEPlasmaPlatformTheme.so | ||
| plasmaimplatforminputcontextplugin.so | ||
| KDEPlasmaPlatformTheme5.so | ||
| KDEPlasmaPlatformTheme6.so |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| KDEPlasmaPlatformTheme.so:org_kde_kwin_appmenu_interface | ||
| KDEPlasmaPlatformTheme.so:org_kde_kwin_appmenu_manager_interface | ||
| KDEPlasmaPlatformTheme.so:org_kde_kwin_server_decoration_palette_interface | ||
| KDEPlasmaPlatformTheme.so:org_kde_kwin_server_decoration_palette_manager_interface | ||
| KDEPlasmaPlatformTheme.so:qt_plugin_instance | ||
| KDEPlasmaPlatformTheme.so:qt_plugin_query_metadata | ||
| plasmaimplatforminputcontextplugin.so:qt_plugin_instance | ||
| plasmaimplatforminputcontextplugin.so:qt_plugin_query_metadata | ||
| KDEPlasmaPlatformTheme5.so:org_kde_kwin_appmenu_interface | ||
| KDEPlasmaPlatformTheme5.so:org_kde_kwin_appmenu_manager_interface | ||
| KDEPlasmaPlatformTheme5.so:org_kde_kwin_server_decoration_palette_interface | ||
| KDEPlasmaPlatformTheme5.so:org_kde_kwin_server_decoration_palette_manager_interface | ||
| KDEPlasmaPlatformTheme5.so:qt_plugin_instance | ||
| KDEPlasmaPlatformTheme5.so:qt_plugin_query_metadata | ||
| KDEPlasmaPlatformTheme6.so:org_kde_kwin_appmenu_interface | ||
| KDEPlasmaPlatformTheme6.so:org_kde_kwin_appmenu_manager_interface | ||
| KDEPlasmaPlatformTheme6.so:org_kde_kwin_server_decoration_palette_interface | ||
| KDEPlasmaPlatformTheme6.so:org_kde_kwin_server_decoration_palette_manager_interface | ||
| KDEPlasmaPlatformTheme6.so:qt_plugin_instance | ||
| KDEPlasmaPlatformTheme6.so:qt_plugin_query_metadata_v2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
54 changes: 37 additions & 17 deletions
54
packages/p/plasma-integration/files/0001-Solus-default-tweaks.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,55 @@ | ||
| From 86189adb7d1c9a3e6477187e48389caf30f7f9de Mon Sep 17 00:00:00 2001 | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: "F. von Gellhorn" <flinux@vongellhorn.ch> | ||
| Date: Sat, 20 Feb 2021 19:35:33 +0100 | ||
| Subject: [PATCH 1/1] Solus default tweaks | ||
| Subject: [PATCH] Solus default tweaks | ||
|
|
||
| - We use SolusDark as default | ||
| - We use BreezeDark as default | ||
| --- | ||
| src/platformtheme/khintssettings.cpp | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| qt5/src/platformtheme/khintssettings.cpp | 4 ++-- | ||
| qt6/src/platformtheme/khintssettings.cpp | 4 ++-- | ||
| 2 files changed, 4 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/src/platformtheme/khintssettings.cpp b/src/platformtheme/khintssettings.cpp | ||
| index 0a4e909..919745f 100644 | ||
| --- a/src/platformtheme/khintssettings.cpp | ||
| +++ b/src/platformtheme/khintssettings.cpp | ||
| @@ -56,7 +56,7 @@ | ||
| diff --git a/qt5/src/platformtheme/khintssettings.cpp b/qt5/src/platformtheme/khintssettings.cpp | ||
| index e3b9181..bd66e58 100644 | ||
| --- a/qt5/src/platformtheme/khintssettings.cpp | ||
| +++ b/qt5/src/platformtheme/khintssettings.cpp | ||
| @@ -43,7 +43,7 @@ | ||
| #include <X11/Xcursor/Xcursor.h> | ||
| #endif | ||
|
|
||
| -static const QString defaultLookAndFeelPackage = QStringLiteral("org.kde.breeze.desktop"); | ||
| +static const QString defaultLookAndFeelPackage = QStringLiteral("solusdark.desktop"); | ||
| +static const QString defaultLookAndFeelPackage = QStringLiteral("org.kde.breezedark.desktop"); | ||
|
|
||
| const QDBusArgument &operator>>(const QDBusArgument &argument, QMap<QString, QVariantMap> &map) | ||
| { | ||
| @@ -471,7 +471,7 @@ void KHintsSettings::loadPalettes() | ||
| @@ -428,7 +428,7 @@ void KHintsSettings::loadPalettes() | ||
| return; | ||
| } | ||
|
|
||
| - const QString scheme = readConfigValue(QStringLiteral("General"), QStringLiteral("ColorScheme"), QStringLiteral("BreezeLight")).toString(); | ||
| + const QString scheme = readConfigValue(QStringLiteral("General"), QStringLiteral("ColorScheme"), QStringLiteral("SolusDark")).toString(); | ||
| + const QString scheme = readConfigValue(QStringLiteral("General"), QStringLiteral("ColorScheme"), QStringLiteral("BreezeDark")).toString(); | ||
| path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("color-schemes/") + scheme + QStringLiteral(".colors")); | ||
|
|
||
| if (!path.isEmpty()) { | ||
| -- | ||
| 2.30.0 | ||
|
|
||
| if (path.isEmpty()) { | ||
| diff --git a/qt6/src/platformtheme/khintssettings.cpp b/qt6/src/platformtheme/khintssettings.cpp | ||
| index aa36043..40cff1a 100644 | ||
| --- a/qt6/src/platformtheme/khintssettings.cpp | ||
| +++ b/qt6/src/platformtheme/khintssettings.cpp | ||
| @@ -43,7 +43,7 @@ | ||
| #include <private/qtx11extras_p.h> | ||
| #endif | ||
|
|
||
| -static const QString defaultLookAndFeelPackage = QStringLiteral("org.kde.breeze.desktop"); | ||
| +static const QString defaultLookAndFeelPackage = QStringLiteral("org.kde.breezedark.desktop"); | ||
|
|
||
| const QDBusArgument &operator>>(const QDBusArgument &argument, QMap<QString, QVariantMap> &map) | ||
| { | ||
| @@ -428,7 +428,7 @@ void KHintsSettings::loadPalettes() | ||
| return; | ||
| } | ||
|
|
||
| - const QString scheme = readConfigValue(QStringLiteral("General"), QStringLiteral("ColorScheme"), QStringLiteral("BreezeLight")).toString(); | ||
| + const QString scheme = readConfigValue(QStringLiteral("General"), QStringLiteral("ColorScheme"), QStringLiteral("BreezeDark")).toString(); | ||
| path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("color-schemes/") + scheme + QStringLiteral(".colors")); | ||
|
|
||
| if (path.isEmpty()) { |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,62 @@ | ||
| name : plasma-integration | ||
| version : 5.27.10 | ||
| release : 98 | ||
| version : 6.0.1 | ||
| release : 103 | ||
| source : | ||
| - https://cdn.download.kde.org/stable/plasma/5.27.10/plasma-integration-5.27.10.tar.xz : 35f2c81e8586051acd4bbccd9c44bab7dc86a1b3f5f0988589f43777032affbb | ||
| - https://cdn.download.kde.org/stable/plasma/6.0.1/plasma-integration-6.0.1.tar.xz : 16d123dc3f59c492251b8e2fba949c75d3bf0f67f3cecf96c51be48dc414429f | ||
| homepage : https://www.kde.org/workspaces/plasmadesktop/ | ||
| license : LGPL-2.1-only | ||
| component : desktop.kde.core | ||
| summary : Integration of Qt application with KDE workspaces | ||
| description: | | ||
| Integration of Qt application with KDE workspaces. | ||
| optimize : lto | ||
| builddeps : | ||
| - pkgconfig(KF5WaylandClient) | ||
| - pkgconfig(Qt5QuickControls2) | ||
| - pkgconfig(Qt5WaylandClient) | ||
| - pkgconfig(Qt5X11Extras) | ||
| - pkgconfig(Qt6WaylandClient) | ||
| - pkgconfig(xcb) | ||
| - pkgconfig(xcursor) | ||
| - breeze-devel | ||
| - pkgconfig(wayland-server) | ||
| - font-hack-ttf | ||
| - kconfig-devel | ||
| - kconfigwidgets-devel | ||
| - kf6-kconfig-devel | ||
| - kf6-kconfigwidgets-devel | ||
| - kf6-kguiaddons-devel | ||
| - kf6-ki18n-devel | ||
| - kf6-kiconthemes-devel | ||
| - kf6-kio-devel | ||
| - kf6-knotifications-devel | ||
| - kf6-kstatusnotifieritem-devel | ||
| - kf6-kwindowsystem-devel | ||
| - kf6-kxmlgui-devel | ||
| - ki18n-devel | ||
| - kiconthemes-devel | ||
| - kio-devel | ||
| - knotifications-devel | ||
| - kwindowsystem-devel | ||
| - kguiaddons-devel | ||
| - kxmlgui-devel | ||
| - noto-sans-ttf | ||
| - plasma-wayland-protocols-devel | ||
| - xdg-desktop-portal-kde | ||
| rundeps : | ||
| - font-hack-ttf | ||
| - noto-sans-ttf | ||
| - qqc2-desktop-style | ||
| - xdg-desktop-portal-kde | ||
| clang : yes | ||
| optimize : | ||
| - speed | ||
| - thin-lto | ||
| setup : | | ||
| %apply_patches | ||
| %cmake_ninja | ||
| %patch -p1 -i $pkgfiles/0001-Solus-default-tweaks.patch | ||
| %cmake_kf6 -B qt5-build -DBUILD_QT5=ON -DBUILD_QT6=OFF | ||
| %cmake_kf6 -B qt6-build -DBUILD_QT5=OFF -DBUILD_QT6=ON | ||
| build : | | ||
| %ninja_build | ||
| %ninja_build -C qt5-build | ||
| %ninja_build -C qt6-build | ||
| install : | | ||
| %ninja_install | ||
| %ninja_install -C qt5-build | ||
| %ninja_install -C qt6-build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters