Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=9d83249d863329c858668bb91ea1fee4f02392dc
commit 9d83249d863329c858668bb91ea1fee4f02392dc Author: crazy <[email protected]> Date: Sat Oct 8 19:26:18 2016 +0200 plasma-workspace-5.8.0-1-x86_64 * Version bump diff --git a/source/plasma/plasma-workspace/FrugalBuild b/source/plasma/plasma-workspace/FrugalBuild index b30b6fc..5312640 100644 --- a/source/plasma/plasma-workspace/FrugalBuild +++ b/source/plasma/plasma-workspace/FrugalBuild @@ -3,14 +3,14 @@ pkgname=plasma-workspace -pkgver=5.7.5 -pkgrel=2 +pkgver=5.8.0 +pkgrel=1 pkgdesc="KDE Plasma Workspace." groups=('plasma') archs=('i686' 'x86_64') _F_kde_project="plasma" Finclude kf5 -source+=(start-scripts-minimal-fix.patch kde set-breeze-default.patch) +source+=(plasma-workspace-kcminit.5.8.0.patch 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=('7a79f4cbfb3dedbf06cc41213197a9607d49d38d' \ - 'f6dd82ee9546972d8c9f62d5d278bd5603935419' \ - '6216aad404aa0b846c835a0e8f9df4941bf74d37' \ - 'b7cc41df461adeefa1b983e18ccbf3ebac41c170') +sha1sums=('dc536a53a95ad53524a40c1fe3b1796fb260683a' \ + '4b755b78093b8ba9978bbb6b06ba0ced2f2a2ac0' \ + '41d33bfab77beeb774c8be97a7e506034e83676d') subpkgs=('plasma-wayland-session') subdescs='Plasma Wayland session' diff --git a/source/plasma/plasma-workspace/set-breeze-default.patch b/source/plasma/plasma-workspace/set-breeze-default.patch deleted file mode 100644 index 974ceda..0000000 --- a/source/plasma/plasma-workspace/set-breeze-default.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur plasma-workspace-5.6.2/startkde/startkde.cmake plasma-workspace-5.6.2-p/startkde/startkde.cmake ---- plasma-workspace-5.6.2/startkde/startkde.cmake 2016-04-05 15:58:32.000000000 +0200 -+++ plasma-workspace-5.6.2-p/startkde/startkde.cmake 2016-04-16 20:03:46.837934043 +0200 -@@ -95,7 +95,14 @@ - kdeglobalsfile=$configDir/kdeglobals - test -f $kdeglobalsfile || { - cat >$kdeglobalsfile <<EOF -+[KDE] -+widgetStyle=breeze -+ -+[Icons] -+Theme=breeze -+ - [General] -+ColorScheme=Breeze - XftAntialias=true - XftHintStyle=hintmedium - XftSubPixel=none -diff -Naur plasma-workspace-5.6.2/startkde/startplasmacompositor.cmake plasma-workspace-5.6.2-p/startkde/startplasmacompositor.cmake ---- plasma-workspace-5.6.2/startkde/startplasmacompositor.cmake 2016-04-05 15:58:32.000000000 +0200 -+++ plasma-workspace-5.6.2-p/startkde/startplasmacompositor.cmake 2016-04-16 20:05:07.453187620 +0200 -@@ -55,7 +55,14 @@ - kdeglobalsfile=$configDir/kdeglobals - test -f $kdeglobalsfile || { - cat >$kdeglobalsfile <<EOF -+[KDE] -+widgetStyle=breeze -+ -+[Icons] -+Theme=breeze -+ - [General] -+ColorScheme=Breeze - XftAntialias=true - XftHintStyle=hintmedium - XftSubPixel=none diff --git a/source/plasma/plasma-workspace/start-scripts-minimal-fix.patch b/source/plasma/plasma-workspace/start-scripts-minimal-fix.patch deleted file mode 100644 index 2acbdb3..0000000 --- a/source/plasma/plasma-workspace/start-scripts-minimal-fix.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -Naur plasma-workspace-5.6.0/startkde/startkde.cmake plasma-workspace-5.6.0-p/startkde/startkde.cmake ---- plasma-workspace-5.6.0/startkde/startkde.cmake 2016-03-17 12:03:23.000000000 +0100 -+++ plasma-workspace-5.6.0-p/startkde/startkde.cmake 2016-03-23 20:54:04.921363928 +0100 -@@ -15,19 +15,21 @@ - trap 'echo GOT SIGHUP' HUP - - # we have to unset this for Darwin since it will screw up KDE's dynamic-loading --unset DYLD_FORCE_FLAT_NAMESPACE -+# unset DYLD_FORCE_FLAT_NAMESPACE - - # 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` -+ qbindir=`qtpaths-qt5 --binaries-dir` - qdbus=$qbindir/qdbus - case $PATH in - $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; - *) PATH=$bindir:$PATH; export PATH;; - esac - else -- qdbus=qdbus -+## welll no-no-no -- we want qt5 qdbus wth -+ qbindir=`qtpaths-qt5 --binaries-dir` -+ qdbus=$qbindir/qdbus - fi - - # Check if a KDE session already is running and whether it's possible to connect to X -@@ -189,7 +191,7 @@ - - # Source scripts found in <config locations>/plasma-workspace/env/*.sh - # (where <config locations> correspond to the system and user's configuration --# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -+# directories, as identified by Qt's qtpaths-qt5, e.g. $HOME/.config - # and /etc/xdg/ on Linux) - # - # This is where you can define environment variables that will be available to -@@ -201,8 +203,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` -+scriptpath=`qtpaths-qt5 --paths GenericConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` - - # Add /env/ to the directory to locate the scripts to be sourced - for prefix in `echo $scriptpath`; do -diff -Naur plasma-workspace-5.6.0/startkde/startplasmacompositor.cmake plasma-workspace-5.6.0-p/startkde/startplasmacompositor.cmake ---- plasma-workspace-5.6.0/startkde/startplasmacompositor.cmake 2016-03-17 12:03:23.000000000 +0100 -+++ plasma-workspace-5.6.0-p/startkde/startplasmacompositor.cmake 2016-03-23 20:54:04.922363955 +0100 -@@ -6,14 +6,16 @@ - # 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` -+ qbindir=`qtpaths-qt5 --binaries-dir` - qdbus=$qbindir/qdbus - case $PATH in - $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; - *) PATH=$bindir:$PATH; export PATH;; - esac - else -- qdbus=qdbus -+## well no-no-no - *again* :D -+ qbindir=`qtpaths-qt5 --binaries-dir` -+ qdbus=$qbindir/qdbus - fi - - # We need to create config folder so we can write startupconfigkeys -@@ -126,7 +128,7 @@ - - # Source scripts found in <config locations>/plasma-workspace/env/*.sh - # (where <config locations> correspond to the system and user's configuration --# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -+# directories, as identified by Qt's qtpaths-qt5, e.g. $HOME/.config - # and /etc/xdg/ on Linux) - # - # This is where you can define environment variables that will be available to -@@ -138,8 +140,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --# TODO: Use GenericConfigLocation once we depend on Qt 5.4 --scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` -+scriptpath=`qtpaths-qt5 --paths GenericConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` - - # Add /env/ to the directory to locate the scripts to be sourced - for prefix in `echo $scriptpath`; do diff --git a/source/plasma/plasma-workspace/startkde.patch b/source/plasma/plasma-workspace/startkde.patch new file mode 100644 index 0000000..e048a1d --- /dev/null +++ b/source/plasma/plasma-workspace/startkde.patch @@ -0,0 +1,273 @@ +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 @@ + # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + +-if test "x$1" = x--failsafe; then +- KDE_FAILSAFE=1 # General failsafe flag +- KWIN_COMPOSE=N # Disable KWin's compositing +- 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 @@ + # we have to unset this for Darwin since it will screw up KDE's dynamic-loading + unset DYLD_FORCE_FLAT_NAMESPACE + +-# 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 +- + # 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 + } + +-# 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@" +- +-if [ ! $install_share = $usr_share ]; then +- +- if [ ${XDG_DATA_HOME} ]; then +- fontsDir="${XDG_DATA_HOME}/fonts" +- else +- fontsDir="${HOME}/.fonts" +- fi +- +- test -d $fontsDir || { +- mkdir -p $fontsDir +- } +- +- oxygenDir=$fontsDir/oxygen +- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" +- +- # if the oxygen dir doesn't exist, create a symlink to be sure that the +- # Oxygen font is available to the user +- test -d $oxygenDir || test -d $prefixDir && { +- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir +- } +-fi + + kstartupconfig5 + returncode=$? +@@ -206,7 +163,7 @@ + # better use the Autostart folder. + + # TODO: Use GenericConfigLocation once we depend on Qt 5.4 +-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` ++scriptpath=`qtpaths-qt5 --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` + + # Add /env/ to the directory to locate the scripts to be sourced + for prefix in `echo $scriptpath`; do +@@ -287,16 +244,6 @@ + fi + export XDG_DATA_DIRS + +-# Make sure that D-Bus is running +-if $qdbus >/dev/null 2>/dev/null; then +- : # ok +-else +- echo 'startkde: Could not start D-Bus. Can you call qdbus?' 1>&2 +- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?" +- exit 1 +-fi +- + + # Mark that full KDE session is running (e.g. Konqueror preloading works only + # with full KDE running). The KDE_FULL_SESSION property can be detected by +@@ -359,7 +306,7 @@ + exit 1 + fi + +-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 +@@ -388,15 +335,15 @@ + + if test x"$wait_drkonqi"x = x"true"x ; then + # wait for remaining drkonqi instances with timeout (in seconds) +- 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 + sleep 5 + wait_drkonqi_counter=$((wait_drkonqi_counter+5)) + if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then + # ask remaining drkonqis to die in a graceful way +- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do +- $qdbus "$address" "/MainApplication" "quit" ++ qdbus-qt5 | grep 'org.kde.drkonqi-' | while read address ; do ++ qdbus-qt5 "$address" "/MainApplication" "quit" + 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 @@ + exit 1 + fi + +-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 @@ + + if test x"$wait_drkonqi"x = x"true"x ; then + # wait for remaining drkonqi instances with timeout (in seconds) +- 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-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 + # ask remaining drkonqis to die in a graceful way +- $qdbus | grep 'org.kde.drkonqi-' | while read address ; do +- $qdbus "$address" "/MainApplication" "quit" ++ qdbus-qt5 | grep 'org.kde.drkonqi-' | while read address ; do ++ qdbus-qt5 "$address" "/MainApplication" "quit" + 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 +@@ -3,18 +3,6 @@ + # DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ ) + # + +-# 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 + + # 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 + EOF + } + +-# 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@" +- +-if [ ! $install_share = $usr_share ]; then +- +- if [ ${XDG_DATA_HOME} ]; then +- fontsDir="${XDG_DATA_HOME}/fonts" +- else +- fontsDir="${HOME}/.fonts" +- fi +- +- test -d $fontsDir || { +- mkdir -p $fontsDir +- } +- +- oxygenDir=$fontsDir/truetype/oxygen +- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/truetype/oxygen" +- +- # if the oxygen dir doesn't exist, create a symlink to be sure that the +- # Oxygen font is available to the user +- test -d $oxygenDir || test -d $prefixDir && { +- test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir +- } +-fi + + kstartupconfig5 + returncode=$? +@@ -148,7 +112,7 @@ + # better use the Autostart folder. + + # TODO: Use GenericConfigLocation once we depend on Qt 5.4 +-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` ++scriptpath=`qtpaths-qt5 --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'` + + # Add /env/ to the directory to locate the scripts to be sourced + for prefix in `echo $scriptpath`; do +@@ -168,15 +132,6 @@ + fi + export XDG_DATA_DIRS + +-# Make sure that D-Bus is running +-if $qdbus >/dev/null 2>/dev/null; then +- : # ok +-else +- echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 +- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null +- exit 1 +-fi +- + + # Mark that full KDE session is running (e.g. Konqueror preloading works only + # with full KDE running). The KDE_FULL_SESSION property can be detected by _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
