diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-22 15:46:48 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-08-22 15:46:48 +0200 |
| commit | 06dc337f60287526f4db95ce79a2ea506023bffa (patch) | |
| tree | 1eecfa4a004b96e68b0be4da4b9a9f797f1e633b /extra/kdebase-workspace | |
| parent | f4e7589d7749be9ccaf3d1db51808ea1ab7c3282 (diff) | |
| parent | e9509842445d4a99493d1b643ffdafdca62263ae (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
extra/kdepim/PKGBUILD
extra/libgtop/PKGBUILD
libre/bitlbee-libre/PKGBUILD
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/kdebase-workspace/plasma-desktop-dbus.patch | 27 |
2 files changed, 35 insertions, 4 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index f1055f735..1c39daf36 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193234 2013-08-19 09:54:29Z andrea $ +# $Id: PKGBUILD 193487 2013-08-21 09:33:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -27,7 +27,8 @@ install="${pkgname}.install" 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') + 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'plasma-desktop-dbus.patch') sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' @@ -36,7 +37,8 @@ sha1sums=('3e877c9f82ad4b3d10c0752adbb50240707d632d' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + '57315ab3adf4d7eed9410c4494f0a63204122763') prepare() { cd ${_pkgname}-${pkgver} @@ -48,6 +50,8 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch + # KDEBUG#321695 + patch -p1 -i "${srcdir}"/plasma-desktop-dbus.patch } build() { diff --git a/extra/kdebase-workspace/plasma-desktop-dbus.patch b/extra/kdebase-workspace/plasma-desktop-dbus.patch new file mode 100644 index 000000000..70790dac3 --- /dev/null +++ b/extra/kdebase-workspace/plasma-desktop-dbus.patch @@ -0,0 +1,27 @@ +From: Hrvoje Senjan <hrvoje.senjan@gmail.com> +Date: Tue, 20 Aug 2013 11:35:57 +0000 +Subject: Partially revert commit 83d3018 +X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=bb2bddb083eb293786206ac91ae1feeaf942db32 +--- +Partially revert commit 83d3018 + +Somehow unique made ksplash quit too soon and/or plasma start +too late + +REVIEW: 112073 +BUG: 321695 +FIXED-IN: 4.11.1 +--- + + +--- a/plasma/desktop/shell/data/plasma-desktop.desktop ++++ b/plasma/desktop/shell/data/plasma-desktop.desktop +@@ -1,6 +1,6 @@ + [Desktop Entry] + Exec=plasma-desktop +-X-DBUS-StartupType=unique ++X-DBUS-StartupType=multi + Name=Plasma Desktop Workspace + Name[ar]=مساحة عمل بلازما + Name[ast]=Espaciu de trabayu del escritoriu Plasma + |