Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2f22e9e20f27e877ab45ca9788b45b066c6ef844
commit 2f22e9e20f27e877ab45ca9788b45b066c6ef844 Author: crazy <[email protected]> Date: Thu Jun 23 16:56:42 2016 +0200 plasma-workspace-5.6.5.1-1-x86_64 * Version bump * removed patch .. seem to be in now * added missing rodepends=() diff --git a/source/plasma/plasma-workspace/FrugalBuild b/source/plasma/plasma-workspace/FrugalBuild index a3cfe40..46137a9 100644 --- a/source/plasma/plasma-workspace/FrugalBuild +++ b/source/plasma/plasma-workspace/FrugalBuild @@ -3,14 +3,14 @@ pkgname=plasma-workspace -pkgver=5.6.5 +pkgver=5.6.5.1 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 ksmserver.patch set-breeze-default.patch) +source+=(start-scripts-minimal-fix.patch kde set-breeze-default.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" \ @@ -22,7 +22,8 @@ options+=('scriptlet') ## these all are needed by startkde and startplasma* rodepends+=('xrdb' 'socat' 'xset' 'xsetroot' 'fontconfig' 'mkfontdir' 'xprop' \ "qt5-qdbus>=5.6.0-2" "qt5-tools>=$_F_kdever_qt5" "xorg-server>=1.18.3" \ - 'xf86-input-keyboard' 'xf86-input-libinput') + 'xf86-input-keyboard' 'xf86-input-libinput' 'hicolor-icon-theme' 'xdg-utils' \ + 'desktop-file-utils') #theme rodepends+=("breeze>=$_F_kdever_plasma" "kde-cli-tools>=$_F_kdever_plasma" "milou>=$_F_kdever_plasma" 'oxygen-sounds') @@ -50,7 +51,6 @@ conflicts=("${replaces[@]}") sha1sums=('3c0b9641947c3330370affb40161ace1254b63a8' \ 'f6dd82ee9546972d8c9f62d5d278bd5603935419' \ '6216aad404aa0b846c835a0e8f9df4941bf74d37' \ - '831f62ca3cbfa09b0c84e33efa7c7d7bd23e3a9c' \ 'b7cc41df461adeefa1b983e18ccbf3ebac41c170') subpkgs=('plasma-wayland-session') @@ -59,6 +59,7 @@ subrodepends=('plasma-workspace qt5-wayland kwayland-integration xorg-server-xwa subgroups=('kde5-extra') subarchs=('i686 x86_64') +_F_cd_path="$pkgname-$_F_kdever_plasma" build() { Fcd KDE_build diff --git a/source/plasma/plasma-workspace/ksmserver.patch b/source/plasma/plasma-workspace/ksmserver.patch deleted file mode 100644 index 8d41348..0000000 --- a/source/plasma/plasma-workspace/ksmserver.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur plasma-workspace-5.6.2/ksmserver/shutdown.cpp plasma-workspace-5.6.2-p/ksmserver/shutdown.cpp ---- plasma-workspace-5.6.2/ksmserver/shutdown.cpp 2016-04-05 15:58:32.000000000 +0200 -+++ plasma-workspace-5.6.2-p/ksmserver/shutdown.cpp 2016-04-11 15:30:05.965002077 +0200 -@@ -276,7 +276,7 @@ - // callbacks - void KSMServer::saveYourselfDone( KSMClient* client, bool success ) - { -- if ( state == Idle ) { -+ if ( state != Shutdown && state != Checkpoint ) { - // State saving when it's not shutdown or checkpoint. Probably - // a shutdown was canceled and the client is finished saving - // only now. Discard the saved state in order to avoid _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
