diff --git a/files/0001-Solus-tweaks-to-default-kicker-kickoff.patch b/files/0001-Solus-tweaks-to-default-kicker-kickoff.patch new file mode 100644 --- /dev/null +++ b/files/0001-Solus-tweaks-to-default-kicker-kickoff.patch @@ -0,0 +1,64 @@ +From 787c263605e876f36af23d27981819dd4087575c Mon Sep 17 00:00:00 2001 +From: "F. von Gellhorn" +Date: Tue, 31 Dec 2019 18:39:42 +0100 +Subject: [PATCH 1/1] Solus tweaks to default kicker/kickoff + +- Add shortcuts for Software Center in menu +- Change user icon to solus +--- + applets/kicker/package/contents/config/main.xml | 2 +- + applets/kickoff/package/contents/config/main.xml | 4 ++-- + applets/kickoff/package/contents/ui/Header.qml | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/applets/kicker/package/contents/config/main.xml b/applets/kicker/package/contents/config/main.xml +index cddcad4..eb20d16 100644 +--- a/applets/kicker/package/contents/config/main.xml ++++ b/applets/kicker/package/contents/config/main.xml +@@ -38,7 +38,7 @@ + + + +- preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover ++ preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,solus-sc.desktop + + + +diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml +index be031dc..fba96eb 100644 +--- a/applets/kickoff/package/contents/config/main.xml ++++ b/applets/kickoff/package/contents/config/main.xml +@@ -20,7 +20,7 @@ + + + +- preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover.desktop ++ preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,solus-sc.desktop + + + +@@ -28,7 +28,7 @@ + + + +- systemsettings.desktop,org.kde.kinfocenter.desktop,org.kde.discover.desktop ++ systemsettings.desktop,org.kde.kinfocenter.desktop,solus-sc.desktop + + + +diff --git a/applets/kickoff/package/contents/ui/Header.qml b/applets/kickoff/package/contents/ui/Header.qml +index c3d4d6a..0770cfa 100644 +--- a/applets/kickoff/package/contents/ui/Header.qml ++++ b/applets/kickoff/package/contents/ui/Header.qml +@@ -86,7 +86,7 @@ Item { + } + + PlasmaCore.IconItem { +- source: "user-identity" ++ source: "solus-identity" + visible: faceIcon.status !== Image.Ready + width: units.gridUnit * 3 + height: width +-- +2.24.1 + diff --git a/files/0001-Solus-tweaks-to-the-default-config.patch b/files/0001-Solus-tweaks-to-the-default-config.patch deleted file mode 100644 --- a/files/0001-Solus-tweaks-to-the-default-config.patch +++ /dev/null @@ -1,104 +0,0 @@ -From cd7cae4a7b112574207750afd759ab7fec7be5cb Mon Sep 17 00:00:00 2001 -From: "flinux@vongellhorn.ch" -Date: Thu, 20 Jun 2019 14:41:30 +0200 -Subject: [PATCH 1/1] Solus tweaks to the default config - - - Remove toolbox icon from desktop - - Decrease desktop icon sizes - - Add shortcuts for Software Center in menu - - Set default Monospace font size to 10 - - move showdesktop in front of systemtray ---- - applets/kicker/package/contents/config/main.xml | 2 +- - applets/kickoff/package/contents/config/main.xml | 4 ++-- - containments/desktop/package/contents/config/main.xml | 4 ++-- - kcms/fonts/fonts.cpp | 2 +- - .../org.kde.plasma.desktop.defaultPanel/contents/layout.js | 2 +- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/applets/kicker/package/contents/config/main.xml b/applets/kicker/package/contents/config/main.xml -index cddcad4..eb20d16 100644 ---- a/applets/kicker/package/contents/config/main.xml -+++ b/applets/kicker/package/contents/config/main.xml -@@ -38,7 +38,7 @@ - - - -- preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover -+ preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,solus-sc.desktop - - - -diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml -index be031dc..fba96eb 100644 ---- a/applets/kickoff/package/contents/config/main.xml -+++ b/applets/kickoff/package/contents/config/main.xml -@@ -20,7 +20,7 @@ - - - -- preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover.desktop -+ preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,solus-sc.desktop - - - -@@ -28,7 +28,7 @@ - - - -- systemsettings.desktop,org.kde.kinfocenter.desktop,org.kde.discover.desktop -+ systemsettings.desktop,org.kde.kinfocenter.desktop,solus-sc.desktop - - - -diff --git a/containments/desktop/package/contents/config/main.xml b/containments/desktop/package/contents/config/main.xml -index 43a4935..78fb7ac 100644 ---- a/containments/desktop/package/contents/config/main.xml -+++ b/containments/desktop/package/contents/config/main.xml -@@ -100,7 +100,7 @@ - - - -- 4 -+ 3 - - - -@@ -138,7 +138,7 @@ - - - -- true -+ false - - - -diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp -index faed0a4..b705f04 100644 ---- a/kcms/fonts/fonts.cpp -+++ b/kcms/fonts/fonts.cpp -@@ -476,7 +476,7 @@ void KFonts::defaults() - #else - setGeneralFont(QFont("Noto Sans", 10)); - setMenuFont(QFont("Noto Sans", 10)); -- setFixedWidthFont(QFont("Hack", 9)); -+ setFixedWidthFont(QFont("Hack", 10)); - setToolbarFont(QFont("Noto Sans", 10)); - setSmallFont(QFont("Noto Sans", 8)); - setWindowTitleFont(QFont("Noto Sans", 10)); -diff --git a/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js b/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js -index 048671e..e52d6d9 100644 ---- a/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js -+++ b/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js -@@ -78,7 +78,7 @@ if (langIds.indexOf(languageId) != -1) { - panel.addWidget("org.kde.plasma.kimpanel"); - } - -+panel.addWidget("org.kde.plasma.showdesktop") - panel.addWidget("org.kde.plasma.systemtray") - panel.addWidget("org.kde.plasma.digitalclock") --panel.addWidget("org.kde.plasma.showdesktop") - --- -2.22.0 - diff --git a/files/0002-Solus-tweaks-to-the-default-config.patch b/files/0002-Solus-tweaks-to-the-default-config.patch new file mode 100644 --- /dev/null +++ b/files/0002-Solus-tweaks-to-the-default-config.patch @@ -0,0 +1,67 @@ +From b696d98c55d289518c8af9692291a9453a54df20 Mon Sep 17 00:00:00 2001 +From: "F. von Gellhorn" +Date: Tue, 31 Dec 2019 15:48:47 +0100 +Subject: [PATCH 3/3] Solus tweaks to the default config + +- Remove toolbox icon from desktop +- Decrease desktop icon sizes +- Set default Monospace font size to 10 +- Move showdesktop in front of the systemtray +--- + containments/desktop/package/contents/config/main.xml | 4 ++-- + kcms/fonts/fonts.cpp | 2 +- + .../org.kde.plasma.desktop.defaultPanel/contents/layout.js | 3 ++- + 3 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/containments/desktop/package/contents/config/main.xml b/containments/desktop/package/contents/config/main.xml +index 43a4935..78fb7ac 100644 +--- a/containments/desktop/package/contents/config/main.xml ++++ b/containments/desktop/package/contents/config/main.xml +@@ -100,7 +100,7 @@ + + + +- 4 ++ 3 + + + +@@ -138,7 +138,7 @@ + + + +- true ++ false + + + +diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp +index 3aa146f..652bc72 100644 +--- a/kcms/fonts/fonts.cpp ++++ b/kcms/fonts/fonts.cpp +@@ -506,7 +506,7 @@ void KFonts::defaults() + #else + setGeneralFont(QFont("Noto Sans", 10)); + setMenuFont(QFont("Noto Sans", 10)); +- setFixedWidthFont(QFont("Hack", 9)); ++ setFixedWidthFont(QFont("Hack", 10)); + setToolbarFont(QFont("Noto Sans", 10)); + setSmallFont(QFont("Noto Sans", 8)); + setWindowTitleFont(QFont("Noto Sans", 10)); +diff --git a/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js b/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js +index 048671e..c17410d 100644 +--- a/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js ++++ b/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js +@@ -78,7 +78,8 @@ if (langIds.indexOf(languageId) != -1) { + panel.addWidget("org.kde.plasma.kimpanel"); + } + ++panel.addWidget("org.kde.plasma.showdesktop") + panel.addWidget("org.kde.plasma.systemtray") + panel.addWidget("org.kde.plasma.digitalclock") +-panel.addWidget("org.kde.plasma.showdesktop") ++ + +-- +2.24.1 + diff --git a/files/series b/files/series new file mode 100644 --- /dev/null +++ b/files/series @@ -0,0 +1,2 @@ +0001-Solus-tweaks-to-default-kicker-kickoff.patch +0002-Solus-tweaks-to-the-default-config.patch diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,6 +1,6 @@ name : plasma-desktop version : 5.17.4 -release : 55 +release : 56 source : - https://cdn.download.kde.org/stable/plasma/5.17.4/plasma-desktop-5.17.4.tar.xz : c17d1854947c6e647bcf359773da8c8081fb562338b84fdc6739a063348943ff license : @@ -72,7 +72,7 @@ - qt5-graphicaleffects - qt5-quickcontrols2 setup : | - %patch -p1 < $pkgfiles/0001-Solus-tweaks-to-the-default-config.patch + %apply_patches %cmake_ninja -DBUILD_TESTING=OFF build : | %ninja_build diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -5390,7 +5390,7 @@ programming.devel - plasma-desktop + plasma-desktop /usr/lib64/libkfontinst.so @@ -5398,8 +5398,8 @@ - - 2019-12-14 + + 2019-12-31 5.17.4 Packaging update F. von Gellhorn