$ git diff --patch-with-stat --summary aa7c1aed98657684ec2a720c3e4ddca278eed539..168083e2017bccdaf1195e737bb141358c206feb
.abf.yml | 4 ++-
plasma-workspace-5.9.0-startup-scripts.patch | 48 ++++++++++++----------------
plasma-workspace.spec | 19 ++++++-----
3 files changed, 34 insertions(+), 37 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 073101b..3ef77f7 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,4 @@
+removed_sources:
+ plasma-workspace-5.12.3.tar.xz: 868ea884cd18eaa150ce4e170e8a03f0e6abb5fb
sources:
- plasma-workspace-5.10.5.tar.xz: 82c9bb6112d271ebc7341b68729cdc18546cb101
+ plasma-workspace-5.12.6.tar.xz: 9087f0fa205b0ad0b775d89d1ea5b49049efc308
diff --git a/plasma-workspace-5.9.0-startup-scripts.patch b/plasma-workspace-5.9.0-startup-scripts.patch
index 33043be..a3536ad 100644
--- a/plasma-workspace-5.9.0-startup-scripts.patch
+++ b/plasma-workspace-5.9.0-startup-scripts.patch
@@ -1,8 +1,7 @@
-diff -Naur plasma-workspace-5.9.0/startkde/startkde.cmake plasma-workspace-5.9.0.tpg/startkde/startkde.cmake
---- plasma-workspace-5.9.0/startkde/startkde.cmake 2017-01-26 12:28:32.000000000 +0000
-+++ plasma-workspace-5.9.0.tpg/startkde/startkde.cmake 2017-02-01 20:29:58.929864499 +0000
+--- plasma-workspace-5.12.2/startkde/startkde.cmake.0000~ 2018-02-20 16:41:25.000000000 +0100
++++ plasma-workspace-5.12.2/startkde/startkde.cmake 2018-02-22 01:15:31.712274165 +0100
@@ -3,6 +3,11 @@
- # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ # DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
+LIBDIR=@LIBDIR@
@@ -13,8 +12,8 @@ diff -Naur plasma-workspace-5.9.0/startkde/startkde.cmake plasma-workspace-5.9.0
# When the X server dies we get a HUP signal from xinit. We must ignore it
# because we still need to do some cleanup.
trap 'echo GOT SIGHUP' HUP
-@@ -42,15 +47,12 @@
-
+@@ -43,15 +48,12 @@ sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xd
+ # We need to create config folder so we can write startupconfigkeys
mkdir -p $configDir
-#This is basically setting defaults so we can use them with kstartupconfig5
@@ -35,7 +34,7 @@ diff -Naur plasma-workspace-5.9.0/startkde/startkde.cmake plasma-workspace-5.9.0
# preload the user's locale on first start
plasmalocalerc=$configDir/plasma-localerc
-@@ -71,12 +73,12 @@
+@@ -72,12 +74,12 @@ test -f $exportformatssettings && {
# Write a default kdeglobals file to set up the font
kdeglobalsfile=$configDir/kdeglobals
test -f $kdeglobalsfile || {
@@ -54,26 +53,21 @@ diff -Naur plasma-workspace-5.9.0/startkde/startkde.cmake plasma-workspace-5.9.0
}
kstartupconfig5
-diff -Naur plasma-workspace-5.9.0/startkde/startplasmacompositor.cmake plasma-workspace-5.9.0.tpg/startkde/startplasmacompositor.cmake
---- plasma-workspace-5.9.0/startkde/startplasmacompositor.cmake 2017-01-26 12:28:32.000000000 +0000
-+++ plasma-workspace-5.9.0.tpg/startkde/startplasmacompositor.cmake 2017-02-01 20:32:28.526583002 +0000
-@@ -2,6 +2,14 @@
- #
- # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+--- plasma-workspace-5.12.2/startkde/startplasmacompositor.cmake.0000~ 2018-02-20 16:41:25.000000000 +0100
++++ plasma-workspace-5.12.2/startkde/startplasmacompositor.cmake 2018-02-22 01:16:27.472377635 +0100
+@@ -3,6 +3,10 @@
+ # DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
-+if [ arch != "i586" ]; then
-+ LIBDIR=lib64
-+else
-+ LIBDIR=lib
-+fi
-+
+
++LIBDIR=@LIBDIR@
+export PATH=/usr/$LIBDIR/qt5/bin:$PATH
+export QML2_IMPORT_PATH=/usr/$LIBDIR/qml:/usr/$LIBDIR/qt5/qml:$QML2_IMPORT_PATH
-
- # in case we have been started with full pathname spec without being in PATH
- bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-@@ -25,15 +33,12 @@
-
++
+ # We need to create config folder so we can write startupconfigkeys
+ if [ ${XDG_CONFIG_HOME} ]; then
+ configDir=$XDG_CONFIG_HOME;
+@@ -14,14 +18,11 @@ sysConfigDirs=${XDG_CONFIG_DIRS:-/etc/xd
+ # We need to create config folder so we can write startupconfigkeys
mkdir -p $configDir
-#This is basically setting defaults so we can use them with kstartupconfig5
@@ -82,19 +76,17 @@ diff -Naur plasma-workspace-5.9.0/startkde/startplasmacompositor.cmake plasma-wo
-kcminputrc Mouse cursorSize ''
-ksplashrc KSplash Theme Breeze
-ksplashrc KSplash Engine KSplashQML
--kdeglobals KScreen ScaleFactor 1
--kcmfonts General forceFontDPI 0
+-kcmfonts General forceFontDPIWayland 0
-EOF
+kdehome=$HOME/@KDE_DEFAULT_HOME@
+test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
-+# see kstartupconfig source for usage
+mkdir -m 700 -p $kdehome
+mkdir -m 700 -p $kdehome/share
+mkdir -m 700 -p $kdehome/share/config
# preload the user's locale on first start
plasmalocalerc=$configDir/plasma-localerc
-@@ -54,12 +59,12 @@
+@@ -42,12 +43,12 @@ test -f $exportformatssettings && {
# Write a default kdeglobals file to set up the font
kdeglobalsfile=$configDir/kdeglobals
test -f $kdeglobalsfile || {
diff --git a/plasma-workspace.spec b/plasma-workspace.spec
index 47cadbb..2ffc9e6 100644
--- a/plasma-workspace.spec
+++ b/plasma-workspace.spec
@@ -4,8 +4,8 @@
%define stable %([ "`echo %{version} |cut -d. -f3`" -ge 80 ] && echo -n un; echo -n stable)
Name: plasma-workspace
-Version: 5.10.5
-Release: 3
+Version: 5.12.6
+Release: 1
Source0: http://download.kde.org//%{stable}/plasma/%{plasmaver}/%{name}-%{version}.tar.xz
Source1: kde.pam
Source100: %{name}.rpmlintrc
@@ -172,8 +172,7 @@ KDE Breeze theme for the SDDM display manager.
%prep
%setup -q
%apply_patches
-
-sed -i -e 's,@LIBDIR@,%{_lib},g' startkde/startkde.cmake
+sed -i -e 's,@LIBDIR@,%{_lib},g' startkde/startkde.cmake startkde/startplasmacompositor.cmake
%cmake_kde5 -DKDE4_COMMON_PAM_SERVICE=kde -DKDE_DEFAULT_HOME=.kde4
@@ -197,10 +196,12 @@ sed -i -e "s#^type=.*#type=image#" %{buildroot}%{_datadir}/sddm/themes/breeze/th
%find_lang %{name} --all-name --with-html
+%libpackage colorcorrect 5
+
%files -f %{name}.lang
%{_sysconfdir}/xdg/autostart/krunner.desktop
%{_sysconfdir}/xdg/autostart/klipper.desktop
-%{_sysconfdir}/xdg/autostart/plasmashell.desktop
+%{_sysconfdir}/xdg/autostart/org.kde.plasmashell.desktop
%{_sysconfdir}/xdg/autostart/xembedsniproxy.desktop
%{_sysconfdir}/xdg/plasmoids.knsrc
%{_sysconfdir}/xdg/wallpaper.knsrc
@@ -224,8 +225,8 @@ sed -i -e "s#^type=.*#type=image#" %{buildroot}%{_datadir}/sddm/themes/breeze/th
%{_bindir}/systemmonitor
%{_bindir}/startplasmacompositor
%{_bindir}/xembedsniproxy
+%{_libdir}/libexec/baloorunner
%{_libdir}/libexec/startplasma
-%{_libdir}/libexec/drkonqi
%{_libdir}/libexec/ksyncdbusenv
%{_libdir}/libexec/ksmserver-logout-greeter
%{_libdir}/libexec/ksmserver-switchuser-greeter
@@ -251,6 +252,7 @@ sed -i -e "s#^type=.*#type=image#" %{buildroot}%{_datadir}/sddm/themes/breeze/th
%{_libdir}/qt5/plugins/plasma-geolocation-gps.so
%{_libdir}/qt5/plugins/plasma-geolocation-ip.so
%{_libdir}/qt5/plugins/plasmacalendarplugins
+%{_libdir}/qt5/qml/org/kde/colorcorrect
%dir %{_libdir}/qt5/qml/org/kde/plasma/private
%{_libdir}/qt5/qml/org/kde/plasma/private/digitalclock
%{_libdir}/qt5/qml/org/kde/plasma/private/notifications
@@ -262,6 +264,8 @@ sed -i -e "s#^type=.*#type=image#" %{buildroot}%{_datadir}/sddm/themes/breeze/th
%{_libdir}/qt5/qml/org/kde/plasma/private/appmenu
%{_datadir}/metainfo/*.xml
%{_datadir}/applications/org.kde.klipper.desktop
+%{_datadir}/applications/org.kde.plasmashell.desktop
+%{_datadir}/applications/org.kde.systemmonitor.desktop
%{_datadir}/applications/plasma-windowed.desktop
%{_datadir}/config.kcfg/*.kcfg
%{_datadir}/dbus-1/services/*.service
@@ -269,11 +273,9 @@ sed -i -e "s#^type=.*#type=image#" %{buildroot}%{_datadir}/sddm/themes/breeze/th
%{_datadir}/kio_desktop/DesktopLinks/*.desktop
%{_datadir}/kio_desktop/directory.desktop
%{_datadir}/kio_desktop/directory.trash
-%{_datadir}/drkonqi
%{_datadir}/knotifications5/*.notifyrc
%{_datadir}/kservices5/*
%{_datadir}/kservicetypes5/*.desktop
-%{_datadir}/ksmserver
%{_datadir}/ksplash
%{_datadir}/kstyle
%{_datadir}/solid/actions/test-predicate-openinwindow.desktop
@@ -335,4 +337,5 @@ sed -i -e "s#^type=.*#type=image#" %{buildroot}%{_datadir}/sddm/themes/breeze/th
%{_libdir}/cmake/KSMServerDBusInterface
%{_libdir}/cmake/LibKWorkspace
%{_libdir}/cmake/LibTaskManager
+%{_libdir}/cmake/LibColorCorrect
%{_datadir}/dbus-1/interfaces/*.xml