diff options
| author | root <root@rshg054.dnsready.net> | 2013-09-08 02:19:16 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-09-08 02:19:16 -0700 |
| commit | de304c3ed7036488819426771b7edd1897e2ba9a (patch) | |
| tree | e9c4427e11229cb8251fa5a269e4bc2c0071eaa9 /extra/kdebase-workspace | |
| parent | b764a223c0b6b4a0001839d8b0fd83b604fbb219 (diff) | |
Sun Sep 8 02:16:12 PDT 2013
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/kdebase-workspace/plasma-desktop-crash.patch | 21 |
2 files changed, 31 insertions, 5 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 139461116..a864fd983 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193487 2013-08-21 09:33:33Z andrea $ +# $Id: PKGBUILD 193949 2013-09-07 16:57:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.11.0 -pkgrel=2 +pkgrel=3 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -28,7 +28,8 @@ backup=('usr/share/config/kdm/kdmrc') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate' 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' - 'plasma-desktop-dbus.patch') + 'plasma-desktop-dbus.patch' + 'plasma-desktop-crash.patch') sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' @@ -38,9 +39,12 @@ sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514' - '57315ab3adf4d7eed9410c4494f0a63204122763') + '57315ab3adf4d7eed9410c4494f0a63204122763' + 'e031dd5c989b63e7149a489cdf220c1b9f55317e') prepare() { + mkdir build + cd ${_pkgname}-${pkgver} # reads the shell scripts in /etc/kde/ @@ -52,10 +56,11 @@ prepare() { patch -p0 -i "${srcdir}"/terminate-server.patch # KDEBUG#321695 patch -p1 -i "${srcdir}"/plasma-desktop-dbus.patch + # KDEBUG#322283 + patch -p1 -i "${srcdir}"/plasma-desktop-crash.patch } build() { - mkdir build cd build cmake ../${_pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebase-workspace/plasma-desktop-crash.patch b/extra/kdebase-workspace/plasma-desktop-crash.patch new file mode 100644 index 000000000..eaa714687 --- /dev/null +++ b/extra/kdebase-workspace/plasma-desktop-crash.patch @@ -0,0 +1,21 @@ +commit 6878e972b87e9ef34617c6280eda8ac5d7113a29 +Author: Eike Hein <hein@kde.org> +Date: Sun Aug 25 16:38:15 2013 +0200 + + Don't attempt to publish geometry for launcher items. + + CCBUG:322283 + +diff --git a/plasma/desktop/applets/tasks/package/contents/code/tools.js b/plasma/desktop/applets/tasks/package/contents/code/tools.js +index 53e5563..028dd2c 100644 +--- a/plasma/desktop/applets/tasks/package/contents/code/tools.js ++++ b/plasma/desktop/applets/tasks/package/contents/code/tools.js +@@ -100,7 +100,7 @@ function publishIconGeometries(taskItems) { + for (j = 0; j < taskIdList.length; ++j) { + tasks.itemGeometryChanged(taskIdList[j].itemId, task.x, task.y, task.width, task.height); + } +- } else { ++ } else if (!task.isLauncher) { + tasks.itemGeometryChanged(task.itemId, task.x, task.y, task.width, task.height); + } + } |