Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=2857ec6efc95550ce3e210343188f9fec959d426
commit 2857ec6efc95550ce3e210343188f9fec959d426
Author: crazy <cr...@frugalware.org>
Date: Wed Oct 12 15:57:59 2016 +0200
plasma-workspace-5.8.1-1-x86_64
* Version bump
diff --git a/source/plasma/plasma-workspace/FrugalBuild
b/source/plasma/plasma-workspace/FrugalBuild
index 81f7c5d..ed29a29 100644
--- a/source/plasma/plasma-workspace/FrugalBuild
+++ b/source/plasma/plasma-workspace/FrugalBuild
@@ -3,14 +3,14 @@
pkgname=plasma-workspace
-pkgver=5.8.0
-pkgrel=3
+pkgver=5.8.1
+pkgrel=1
pkgdesc="KDE Plasma Workspace."
groups=('plasma')
archs=('i686' 'x86_64')
_F_kde_project="plasma"
Finclude kf5
-source+=(kde plasma-workspace-kcminit.5.8.0.patch startkde.patch)
+source+=(kde startkde.patch)
depends=("libksysguard5>=$_F_kdever_plasma" "knewstuff>=$_F_kf5_full"
"krunner5>=$_F_kf5_full" "kdesu>=$_F_kf5_full" \
"baloo5>=$_F_kf5_full" "kjsembed>=$_F_kf5_full" "knotifyconfig>=$_F_kf5_full"
"libkscreen5>=$_F_kdever_plasma" \
"ktexteditor>=$_F_kf5_full" "kinit>=$_F_kf5_full" "kcmutils>=$_F_kf5_full"
"kwin5>=$_F_kdever_plasma" \
@@ -49,10 +49,9 @@ replaces+=('kdelibs' 'kdelibs-core' 'kdelibs-data'
'kdelibs-interfaces' 'libkdec
conflicts=("${replaces[@]}")
-sha1sums=('dc536a53a95ad53524a40c1fe3b1796fb260683a' \
+sha1sums=('8ed58860152a5bbd25f70327b88754c3b8cebbe5' \
'6216aad404aa0b846c835a0e8f9df4941bf74d37' \
- '4b755b78093b8ba9978bbb6b06ba0ced2f2a2ac0' \
- '41d33bfab77beeb774c8be97a7e506034e83676d')
+ '07d67e8cc92a4a682644f06b2a853c71bea3c416')
subpkgs=('plasma-wayland-session')
subdescs='Plasma Wayland session'
diff --git
a/source/plasma/plasma-workspace/plasma-workspace-kcminit.5.8.0.patch
b/source/plasma/plasma-workspace/plasma-workspace-kcminit.5.8.0.patch
deleted file mode 100644
index 2a63cbf..0000000
--- a/source/plasma/plasma-workspace/plasma-workspace-kcminit.5.8.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Any KCMinit module which are at X-KDE-Init-Phase=1 or 2 will now get
-run. It also means kcminit_startup closes, instead of lingersing on
-startup doing nothing until it times out 5 minutes later.
-
-Test Plan: Confirmed kcminit_startup now exits properly.
-
-Reviewers: #plasma, apol
-
-Reviewed By: apol
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D2887
----
-
-
---- a/startkde/kcminit/main.cpp
-+++ b/startkde/kcminit/main.cpp
-@@ -212,6 +212,10 @@
-
- sendReady();
- QTimer::singleShot( 300 * 1000, qApp, &QCoreApplication::quit); // just
in case
-+
-+ QDBusConnection::sessionBus().registerObject(QStringLiteral("/kcminit"),
this, QDBusConnection::ExportScriptableContents);
-+
QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kcminit"));
-+
- qApp->exec(); // wait for runPhase1() and runPhase2()
- }
- else
-@@ -266,8 +270,6 @@
- about.processCommandLine(&parser);
-
- KCMInit kcminit( parser );
-- QDBusConnection::sessionBus().registerObject(QStringLiteral("/kcminit"),
&kcminit, QDBusConnection::ExportScriptableContents);
--
QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kcminit"));
- return 0;
- }
diff --git a/source/plasma/plasma-workspace/startkde.patch
b/source/plasma/plasma-workspace/startkde.patch
index e048a1d..4bfa675 100644
--- a/source/plasma/plasma-workspace/startkde.patch
+++ b/source/plasma/plasma-workspace/startkde.patch
@@ -1,7 +1,7 @@
-diff -Naur plasma-workspace-5.8.0/startkde/startkde.cmake
plasma-workspace-5.8.0-p-start/startkde/startkde.cmake
---- plasma-workspace-5.8.0/startkde/startkde.cmake 2016-09-29
13:35:01.000000000 +0200
-+++ plasma-workspace-5.8.0-p-start/startkde/startkde.cmake 2016-10-08
19:10:01.433263125 +0200
-@@ -3,12 +3,6 @@
+diff -Naur plasma-workspace-5.8.1/startkde/startkde.cmake
plasma-workspace-5.8.1-p/startkde/startkde.cmake
+--- plasma-workspace-5.8.1/startkde/startkde.cmake 2016-10-11
14:46:00.000000000 +0200
++++ plasma-workspace-5.8.1-p/startkde/startkde.cmake 2016-10-12
15:39:02.918845003 +0200
+@@ -3,13 +3,6 @@
# DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
@@ -11,10 +11,11 @@ diff -Naur plasma-workspace-5.8.0/startkde/startkde.cmake
plasma-workspace-5.8.0
- QT_XCB_FORCE_SOFTWARE_OPENGL=1
- export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL
-fi
-
+-
# When the X server dies we get a HUP signal from xinit. We must ignore it
# because we still need to do some cleanup.
-@@ -17,19 +11,6 @@
+ trap 'echo GOT SIGHUP' HUP
+@@ -17,18 +10,6 @@
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
unset DYLD_FORCE_FLAT_NAMESPACE
@@ -30,35 +31,13 @@ diff -Naur plasma-workspace-5.8.0/startkde/startkde.cmake
plasma-workspace-5.8.0
-else
- qdbus=qdbus
-fi
--
+
# Check if a KDE session already is running and whether it's possible to
connect to X
kcheckrunning
- kcheckrunning_result=$?
-@@ -95,44 +76,20 @@
- kdeglobalsfile=$configDir/kdeglobals
- test -f $kdeglobalsfile || {
- cat >$kdeglobalsfile <<EOF
-+[KDE]
-+widgetStyle=breeze
-+
-+[Icons]
-+Theme=breeze
-+
- [General]
-+ColorScheme=Breeze
- XftAntialias=true
- XftHintStyle=hintmedium
- XftSubPixel=none
- EOF
- }
+@@ -109,30 +90,6 @@
+ # Oxygen font under ${XDG_DATA_HOME} and make it known to
+ # fontconfig
--# Make sure the Oxygen font is installed
--# This is necessary for setups where CMAKE_INSTALL_PREFIX
--# is not in /usr. fontconfig looks in /usr, ~/.fonts and
--# $XDG_DATA_HOME for fonts. In this case, we symlink the
--# Oxygen font under ${XDG_DATA_HOME} and make it known to
--# fontconfig
--
-usr_share="/usr/share"
-install_share="@KDE_INSTALL_FULL_DATADIR@"
-
@@ -116,7 +95,7 @@ diff -Naur plasma-workspace-5.8.0/startkde/startkde.cmake
plasma-workspace-5.8.0
exit 1
fi
--qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+-$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+qdbus-qt5 org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
# finally, give the session control to the session manager
@@ -128,7 +107,8 @@ diff -Naur plasma-workspace-5.8.0/startkde/startkde.cmake
plasma-workspace-5.8.0
- wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group
WaitForDrKonqi --key Timeout --default 900`
+ wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group
WaitForDrKonqi --key Timeout --default 120`
wait_drkonqi_counter=0
- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+- while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++ while qdbus-qt5 | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
sleep 5
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
@@ -140,19 +120,38 @@ diff -Naur plasma-workspace-5.8.0/startkde/startkde.cmake
plasma-workspace-5.8.0
done
break
fi
-diff -Naur plasma-workspace-5.8.0/startkde/startplasma.cmake
plasma-workspace-5.8.0-p-start/startkde/startplasma.cmake
---- plasma-workspace-5.8.0/startkde/startplasma.cmake 2016-09-29
13:35:01.000000000 +0200
-+++ plasma-workspace-5.8.0-p-start/startkde/startplasma.cmake 2016-10-08
19:11:26.605264388 +0200
-@@ -128,7 +128,7 @@
+diff -Naur plasma-workspace-5.8.1/startkde/startplasma.cmake
plasma-workspace-5.8.1-p/startkde/startplasma.cmake
+--- plasma-workspace-5.8.1/startkde/startplasma.cmake 2016-10-11
14:46:00.000000000 +0200
++++ plasma-workspace-5.8.1-p/startkde/startplasma.cmake 2016-10-12
15:41:07.290846846 +0200
+@@ -49,18 +49,6 @@
+ esac
+ fi
+
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+- qbindir=`qtpaths --binaries-dir`
+- qdbus=$qbindir/qdbus
+- case $PATH in
+- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+- *) PATH=$bindir:$PATH; export PATH;;
+- esac
+-else
+- qdbus=qdbus
+-fi
+
+ # Activate the kde font directories.
+ #
+@@ -140,7 +128,7 @@
exit 1
fi
--qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+-$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+qdbus-qt5 org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
# finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence
-@@ -155,15 +155,15 @@
+@@ -167,15 +155,15 @@
if test x"$wait_drkonqi"x = x"true"x ; then
# wait for remaining drkonqi instances with timeout (in seconds)
@@ -172,9 +171,9 @@ diff -Naur
plasma-workspace-5.8.0/startkde/startplasma.cmake plasma-workspace-5.
done
break
fi
-diff -Naur plasma-workspace-5.8.0/startkde/startplasmacompositor.cmake
plasma-workspace-5.8.0-p-start/startkde/startplasmacompositor.cmake
---- plasma-workspace-5.8.0/startkde/startplasmacompositor.cmake
2016-09-29 13:35:01.000000000 +0200
-+++ plasma-workspace-5.8.0-p-start/startkde/startplasmacompositor.cmake
2016-10-08 19:14:13.738266865 +0200
+diff -Naur plasma-workspace-5.8.1/startkde/startplasmacompositor.cmake
plasma-workspace-5.8.1-p/startkde/startplasmacompositor.cmake
+--- plasma-workspace-5.8.1/startkde/startplasmacompositor.cmake
2016-10-11 14:46:00.000000000 +0200
++++ plasma-workspace-5.8.1-p/startkde/startplasmacompositor.cmake
2016-10-12 15:43:50.158849260 +0200
@@ -3,18 +3,6 @@
# DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
#
@@ -194,21 +193,7 @@ diff -Naur
plasma-workspace-5.8.0/startkde/startplasmacompositor.cmake plasma-wo
# We need to create config folder so we can write startupconfigkeys
if [ ${XDG_CONFIG_HOME} ]; then
-@@ -55,44 +43,20 @@
- kdeglobalsfile=$configDir/kdeglobals
- test -f $kdeglobalsfile || {
- cat >$kdeglobalsfile <<EOF
-+[KDE]
-+widgetStyle=breeze
-+
-+[Icons]
-+Theme=breeze
-+
- [General]
-+ColorScheme=Breeze
- XftAntialias=true
- XftHintStyle=hintmedium
- XftSubPixel=none
+@@ -62,37 +50,6 @@
EOF
}
@@ -246,7 +231,7 @@ diff -Naur
plasma-workspace-5.8.0/startkde/startplasmacompositor.cmake plasma-wo
kstartupconfig5
returncode=$?
-@@ -148,7 +112,7 @@
+@@ -148,7 +105,7 @@
# better use the Autostart folder.
# TODO: Use GenericConfigLocation once we depend on Qt 5.4
@@ -255,7 +240,7 @@ diff -Naur
plasma-workspace-5.8.0/startkde/startplasmacompositor.cmake plasma-wo
# Add /env/ to the directory to locate the scripts to be sourced
for prefix in `echo $scriptpath`; do
-@@ -168,15 +132,6 @@
+@@ -168,15 +125,6 @@
fi
export XDG_DATA_DIRS
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
