summaryrefslogtreecommitdiff
path: root/testing/kdebase-workspace
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-10-19 08:15:39 -0700
committerroot <root@rshg054.dnsready.net>2012-10-19 08:15:39 -0700
commitdcc55a1cfa32068d0759c1c8307f6c07c11aec99 (patch)
tree2f6cd8ae52f7f49ed4ac2db1b0f4bf88a8ba5d96 /testing/kdebase-workspace
parent9e3985ed7c9851da65023a0ab3d0739cce1858e2 (diff)
Fri Oct 19 08:15:38 PDT 2012
Diffstat (limited to 'testing/kdebase-workspace')
-rw-r--r--testing/kdebase-workspace/PKGBUILD31
-rw-r--r--testing/kdebase-workspace/etc-scripts.patch11
2 files changed, 24 insertions, 18 deletions
diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD
index e3384d191..50d2c2724 100644
--- a/testing/kdebase-workspace/PKGBUILD
+++ b/testing/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168549 2012-10-13 11:06:38Z andrea $
+# $Id: PKGBUILD 169286 2012-10-18 19:49:13Z jgc $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.9.2
-pkgrel=4
+pkgrel=5
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -15,22 +15,17 @@ groups=('kde')
# not detected by namcap because libgl depends on it
# but nvidia providing libgl does not depend on libxdamage
depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
- 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
+ 'qimageblitz' 'polkit-kde' 'xorg-xprop' 'libxdamage'
'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
'xorg-xmessage' 'libusb-compat' 'kde-base-artwork')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager')
+makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa')
optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
- 'etc/pam.d/kde'
- 'etc/pam.d/kde-np'
- 'etc/pam.d/kscreensaver')
-options=('emptydirs')
+backup=('usr/share/config/kdm/kdmrc')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
- 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service'
- 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
- 'kdm.logrotate'
+ 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
+ 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
'logind-support.patch')
sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
@@ -38,23 +33,22 @@ sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
'b7980f2e199963caf8e92b499042d244ece2fca0'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
- 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
+ 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+ 'c079ebd157c836ba996190f0d2bcea1a7828d02c'
'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
'd509dac592bd8b310df27991b208c95b6d907514'
- 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
build() {
cd ${_pkgname}-${pkgver}
+ # reads the shell scripts in /etc/kde/
+ patch -p0 -i "${srcdir}"/etc-scripts.patch
# FS#26120
patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
- patch -p0 -i "${srcdir}"/fixpath.patch
-
# KDEBUG#202629
patch -p0 -i "${srcdir}"/terminate-server.patch
-
# KDEBUG#307412 (fixed upstream)
patch -p1 -i "${srcdir}"/logind-support.patch
@@ -69,7 +63,8 @@ build() {
-DWITH_Xmms=OFF \
-DWITH_Googlegadgets=OFF \
-DWITH_libgps=OFF \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DWITH_CkConnector=OFF
make
}
diff --git a/testing/kdebase-workspace/etc-scripts.patch b/testing/kdebase-workspace/etc-scripts.patch
new file mode 100644
index 000000000..903a90a53
--- /dev/null
+++ b/testing/kdebase-workspace/etc-scripts.patch
@@ -0,0 +1,11 @@
+--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100
++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100
+@@ -206,7 +190,7 @@
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+
+-libpath=`kde4-config --path lib | tr : '\n'`
++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
+
+ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+ for file in "$prefix"*.sh; do