diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-31 01:35:35 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-31 01:35:35 -0700 |
| commit | 5827948456201df72a1bd73e87977c569129fb27 (patch) | |
| tree | 4842639ddc958690e68f74c496ea60844200450b /extra/kdebase-workspace | |
| parent | 455295fdb5009a8cd7b033a93e01f7450fd3087b (diff) | |
Wed Oct 31 01:34:59 PDT 2012
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 31 | ||||
| -rw-r--r-- | extra/kdebase-workspace/etc-scripts.patch | 11 |
2 files changed, 24 insertions, 18 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 99f5db087..ed6d4d6ad 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168704 2012-10-14 16:38:05Z thomas $ +# $Id: PKGBUILD 169946 2012-10-30 22:46:25Z heftig $ # 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/extra/kdebase-workspace/etc-scripts.patch b/extra/kdebase-workspace/etc-scripts.patch new file mode 100644 index 000000000..903a90a53 --- /dev/null +++ b/extra/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 |