$ git diff --patch-with-stat --summary ab6e932aab3b080733199076a045e6de1538e853..e129ac885f320878a7e99cf986b11a797f887377
.abf.yml | 4 +++-
plasma-desktop-5.5.3-use-openmandriva-settings.patch | 20 ++++++++++----------
plasma-desktop.spec | 7 ++++---
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index ab28510..a07bef2 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,4 @@
+removed_sources:
+ plasma-desktop-5.12.3.tar.xz: 8334778f08edb08ff034119793c639ad0184e1af
sources:
- plasma-desktop-5.10.5.tar.xz: 8d0cfffb4d3669752915416130e6c921d777e54a
+ plasma-desktop-5.12.6.tar.xz: d7bc564cfb935cba6a6d87d945791f6b9c6ec6eb
diff --git a/plasma-desktop-5.5.3-use-openmandriva-settings.patch b/plasma-desktop-5.5.3-use-openmandriva-settings.patch
index 0a4cc92..1986825 100644
--- a/plasma-desktop-5.5.3-use-openmandriva-settings.patch
+++ b/plasma-desktop-5.5.3-use-openmandriva-settings.patch
@@ -1,5 +1,5 @@
---- plasma-desktop-5.10.0/applets/kicker/package/contents/config/main.xml.0004~ 2017-05-26 11:04:19.000000000 +0200
-+++ plasma-desktop-5.10.0/applets/kicker/package/contents/config/main.xml 2017-05-29 10:56:03.966583570 +0200
+--- plasma-desktop-5.11.0/applets/kicker/package/contents/config/main.xml.0004~ 2017-10-05 14:47:34.000000000 +0200
++++ plasma-desktop-5.11.0/applets/kicker/package/contents/config/main.xml 2017-10-06 01:31:45.754384604 +0200
@@ -8,7 +8,7 @@
<group name="General">
<entry name="icon" type="String">
@@ -27,8 +27,8 @@
</entry>
<entry name="favoriteSystemActions" type="StringList">
<label>List of system action favorites.</label>
---- plasma-desktop-5.10.0/applets/kicker/package/metadata.desktop.0004~ 2017-05-26 11:04:19.000000000 +0200
-+++ plasma-desktop-5.10.0/applets/kicker/package/metadata.desktop 2017-05-29 10:50:59.469562238 +0200
+--- plasma-desktop-5.11.0/applets/kicker/package/metadata.desktop.0004~ 2017-10-05 14:47:34.000000000 +0200
++++ plasma-desktop-5.11.0/applets/kicker/package/metadata.desktop 2017-10-06 01:31:45.754384604 +0200
@@ -92,7 +92,7 @@ Comment[zh_CN]=基于层叠弹出窗口
Comment[zh_TW]=以啟動器為基底的彈出式串連選單
@@ -38,8 +38,8 @@
X-KDE-ServiceTypes=Plasma/Applet
X-Plasma-API=declarativeappletscript
---- plasma-desktop-5.10.0/applets/kickoff/package/contents/config/main.xml.0004~ 2017-05-26 11:04:19.000000000 +0200
-+++ plasma-desktop-5.10.0/applets/kickoff/package/contents/config/main.xml 2017-05-29 10:50:59.469562238 +0200
+--- plasma-desktop-5.11.0/applets/kickoff/package/contents/config/main.xml.0004~ 2017-10-06 01:31:45.754384604 +0200
++++ plasma-desktop-5.11.0/applets/kickoff/package/contents/config/main.xml 2017-10-06 01:34:27.142596924 +0200
@@ -16,11 +16,11 @@
</entry>
<entry name="icon" type="String">
@@ -52,10 +52,10 @@
- <default>preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover.desktop</default>
+ <default>preferred://browser,org.kde.kmail.desktop,org.kde.konversation.desktop,kcm_kdeconnect.desktop,org.kde.dolphin.desktop,org.kde.kate.desktop,org.kde.konsole.desktop,systemsettings.desktop,openmandriva-drakconf.desktop</default>
</entry>
- <entry name="systemApplications" type="StringList">
- <label>List of applications at the top of the "Computer" tab.</label>
---- plasma-desktop-5.10.0/applets/kickoff/package/metadata.desktop.0004~ 2017-05-26 11:04:19.000000000 +0200
-+++ plasma-desktop-5.10.0/applets/kickoff/package/metadata.desktop 2017-05-29 10:50:59.469562238 +0200
+ <entry name="favoritesPortedToKAstats" type="Bool">
+ <label>Are the favorites ported to use KActivitiesStats to allow per-activity favorites</label>
+--- plasma-desktop-5.11.0/applets/kickoff/package/metadata.desktop.0004~ 2017-10-05 14:47:34.000000000 +0200
++++ plasma-desktop-5.11.0/applets/kickoff/package/metadata.desktop 2017-10-06 01:31:45.754384604 +0200
@@ -162,7 +162,7 @@ Comment[wa]=Enondeu po lancî des progra
Comment[x-test]=xxLauncher to start applicationsxx
Comment[zh_CN]=应用程序的启动器
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 0893744..82ab6d4 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -4,7 +4,7 @@
%define stable %([ "`echo %{version} |cut -d. -f3`" -ge 80 ] && echo -n un; echo -n stable)
Name: plasma-desktop
-Version: 5.10.5
+Version: 5.12.6
Release: 1
Source0: http://download.kde.org/%{stable}/plasma/%{plasmaver}/%{name}-%{version}.tar.xz
Source100: %{name}.rpmlintrc
@@ -21,6 +21,7 @@ BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(AppStreamQt)
BuildRequires: cmake(ECM)
BuildRequires: cmake(KF5)
+BuildRequires: cmake(Breeze)
BuildRequires: cmake(KDecoration2)
BuildRequires: cmake(LibKWorkspace)
BuildRequires: cmake(LibTaskManager)
@@ -215,13 +216,13 @@ rm -f %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/layo
%{_sysconfdir}/xdg/lookandfeel.knsrc
%{_bindir}/solid-action-desktop-gen
%{_bindir}/kaccess
-%{_bindir}/kapplymousetheme
%{_bindir}/kcolorschemeeditor
%{_bindir}/kcm-touchpad-list-devices
%{_bindir}/kfontinst
%{_bindir}/kfontview
%{_bindir}/knetattach
%{_bindir}/krdb
+%{_bindir}/lookandfeeltool
%{_libdir}/kconf_update_bin/*
%{_libdir}/libexec/kauth/fontinst
%{_libdir}/libexec/kauth/fontinst_helper
@@ -257,7 +258,6 @@ rm -f %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/layo
%{_iconsdir}/hicolor/*/*/*.*[g-z]
%{_datadir}/kcm_componentchooser
%{_datadir}/kcm_phonon
-%{_datadir}/kcminput
%{_datadir}/kcmkeyboard
%{_datadir}/kcmkeys
%{_datadir}/kcmsolidactions
@@ -269,6 +269,7 @@ rm -f %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/layo
%{_datadir}/konqsidebartng
%{_datadir}/kpackage/kcms/kcm_desktoptheme
%{_datadir}/kpackage/kcms/kcm_lookandfeel
+%{_datadir}/kpackage/kcms/kcm_nightcolor
%{_datadir}/kpackage/kcms/kcm_splashscreen
%{_datadir}/kservices5/*.desktop
%{_datadir}/kservices5/kded/*.desktop