Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=e0a214bc24d04627c187fe087fbee97c00f5cd0b
commit e0a214bc24d04627c187fe087fbee97c00f5cd0b Author: crazy <[email protected]> Date: Fri Feb 17 22:44:31 2017 +0100 plasma-workspace-5.9.2-1-x86_64 * Version bump diff --git a/source/plasma/plasma-workspace/FrugalBuild b/source/plasma/plasma-workspace/FrugalBuild index 7f56c43..9fc505d 100644 --- a/source/plasma/plasma-workspace/FrugalBuild +++ b/source/plasma/plasma-workspace/FrugalBuild @@ -3,14 +3,14 @@ pkgname=plasma-workspace -pkgver=5.8.5 -pkgrel=3 +pkgver=5.9.2 +pkgrel=1 pkgdesc="KDE Plasma Workspace." groups=('plasma') archs=("x86_64") _F_kde_project="plasma" Finclude kf5 -source+=(kde startkde.patch) +source+=(kde) 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,9 +49,8 @@ replaces+=('kdelibs' 'kdelibs-core' 'kdelibs-data' 'kdelibs-interfaces' 'libkdec conflicts=("${replaces[@]}") -sha1sums=('23080795b3cbeaffa334d1d3d10f852369ea6b6b' \ - '6216aad404aa0b846c835a0e8f9df4941bf74d37' \ - 'c813c61958b390bc8529c01d659ba02819ae5212') +sha1sums=('9f2a7a8e6ef4047c4c91e2a1360b8695ecc62992' \ + '6216aad404aa0b846c835a0e8f9df4941bf74d37') subpkgs=('plasma-wayland-session') subdescs='Plasma Wayland session' diff --git a/source/plasma/plasma-workspace/startkde.patch b/source/plasma/plasma-workspace/startkde.patch deleted file mode 100644 index 2174d68..0000000 --- a/source/plasma/plasma-workspace/startkde.patch +++ /dev/null @@ -1,276 +0,0 @@ -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-14 19:03:03.899587814 +0200 -@@ -3,13 +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. - 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 - --# 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 -@@ -109,30 +90,6 @@ - # 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 -@@ -350,7 +297,7 @@ - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR@/start_kdeinit_wrapper --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2 -@@ -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 -+ 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.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-14 19:03:03.900587814 +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. - # -@@ -131,7 +119,7 @@ - - # We set LD_BIND_NOW to increase the efficiency of kdeinit. - # kdeinit unsets this variable before loading applications. --LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup -+LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR@/start_kdeinit_wrapper --kded +kcminit_startup - if test $? -ne 0; then - # Startup error - echo 'startplasma: Could not start kdeinit5. Check your installation.' 1>&2 -@@ -140,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 -@@ -167,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.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-14 19:03:03.901587814 +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 -@@ -62,37 +50,6 @@ - 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 +105,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 +125,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
