Date: Thursday, December 8, 2011 @ 11:18:07 Author: andrea Revision: 144859
archrelease: copy trunk to kde-unstable-x86_64 Added: kdebase-workspace/repos/kde-unstable-x86_64/PKGBUILD (from rev 144858, kdebase-workspace/trunk/PKGBUILD) kdebase-workspace/repos/kde-unstable-x86_64/fixpath.patch (from rev 144858, kdebase-workspace/trunk/fixpath.patch) kdebase-workspace/repos/kde-unstable-x86_64/kde-np.pam (from rev 144858, kdebase-workspace/trunk/kde-np.pam) kdebase-workspace/repos/kde-unstable-x86_64/kde.pam (from rev 144858, kdebase-workspace/trunk/kde.pam) kdebase-workspace/repos/kde-unstable-x86_64/kdebase-workspace.install (from rev 144858, kdebase-workspace/trunk/kdebase-workspace.install) kdebase-workspace/repos/kde-unstable-x86_64/kdm (from rev 144858, kdebase-workspace/trunk/kdm) kdebase-workspace/repos/kde-unstable-x86_64/kdm-xinitrd.patch (from rev 144858, kdebase-workspace/trunk/kdm-xinitrd.patch) kdebase-workspace/repos/kde-unstable-x86_64/kscreensaver.pam (from rev 144858, kdebase-workspace/trunk/kscreensaver.pam) kdebase-workspace/repos/kde-unstable-x86_64/terminate-server.patch (from rev 144858, kdebase-workspace/trunk/terminate-server.patch) Deleted: kdebase-workspace/repos/kde-unstable-x86_64/kscreensaver.pam kdebase-workspace/repos/kde-unstable-x86_64/terminate-server.patch ---------------------------+ PKGBUILD | 80 ++++++++++++++++++++++++++++++++++++++++++++ fixpath.patch | 34 ++++++++++++++++++ kde-np.pam | 7 +++ kde.pam | 7 +++ kdebase-workspace.install | 25 +++++++++++++ kdm | 36 +++++++++++++++++++ kdm-xinitrd.patch | 18 +++++++++ kscreensaver.pam | 2 - terminate-server.patch | 22 ++++++------ 9 files changed, 219 insertions(+), 12 deletions(-) Copied: kdebase-workspace/repos/kde-unstable-x86_64/PKGBUILD (from rev 144858, kdebase-workspace/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=kdebase-workspace +_pkgname=kde-workspace +pkgver=4.7.90 +pkgrel=2 +pkgdesc="KDE Base Workspace" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde') +# note on libxdamage: +# 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' + 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama' + 'xorg-xrdb' 'libgles' 'libegl' 'kactivities' 'libxres') +makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python' 'networkmanager') +optdepends=('kde-wallpapers: officials KDE wallapers') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' + 'kdebase-kinfocenter') +install="${pkgname}.install" +backup=('usr/share/config/kdm/kdmrc' + 'etc/pam.d/kde' + 'etc/pam.d/kde-np' + 'etc/pam.d/kscreensaver') +options=('emptydirs') +source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2" + 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') +sha1sums=('7146fbc0bcc9a7cd11e6f266963bd358452eb347' + '5db3a245201bd4a50e65aa2ef583cf5490e4f646' + 'f7b38af38549242a240f1a90ab9964ca8a366129' + '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' + 'd509dac592bd8b310df27991b208c95b6d907514') + +build() { + cd "${srcdir}"/${_pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + patch -p0 -i "${srcdir}"/terminate-server.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xmms=OFF \ + -DWITH_Googlegadgets=OFF \ + -DWITH_libgps=OFF \ + -DWITH_OpenGLES=ON \ + -DKWIN_BUILD_WITH_OPENGLES=ON \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install + + install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm + install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde + install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np + install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver + install -d -m755 "${pkgdir}"/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/ + install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown} + + install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm +} Copied: kdebase-workspace/repos/kde-unstable-x86_64/fixpath.patch (from rev 144858, kdebase-workspace/trunk/fixpath.patch) =================================================================== --- fixpath.patch (rev 0) +++ fixpath.patch 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -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 Copied: kdebase-workspace/repos/kde-unstable-x86_64/kde-np.pam (from rev 144858, kdebase-workspace/trunk/kde-np.pam) =================================================================== --- kde-np.pam (rev 0) +++ kde-np.pam 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_nologin.so +auth required pam_permit.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so \ No newline at end of file Copied: kdebase-workspace/repos/kde-unstable-x86_64/kde.pam (from rev 144858, kdebase-workspace/trunk/kde.pam) =================================================================== --- kde.pam (rev 0) +++ kde.pam 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so \ No newline at end of file Copied: kdebase-workspace/repos/kde-unstable-x86_64/kdebase-workspace.install (from rev 144858, kdebase-workspace/trunk/kdebase-workspace.install) =================================================================== --- kdebase-workspace.install (rev 0) +++ kdebase-workspace.install 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1,25 @@ +post_install() { + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_remove() { + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} Copied: kdebase-workspace/repos/kde-unstable-x86_64/kdm (from rev 144858, kdebase-workspace/trunk/kdm) =================================================================== --- kdm (rev 0) +++ kdm 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/kdm) +case "$1" in + start) + stat_busy "Starting KDE Desktop Manager" + [ -z "$PID" ] && /usr/bin/kdm &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon kdm + stat_done + fi + ;; + stop) + stat_busy "Stopping KDE Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kdm + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Copied: kdebase-workspace/repos/kde-unstable-x86_64/kdm-xinitrd.patch (from rev 144858, kdebase-workspace/trunk/kdm-xinitrd.patch) =================================================================== --- kdm-xinitrd.patch (rev 0) +++ kdm-xinitrd.patch 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1,18 @@ +--- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000 ++++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000 +@@ -742,6 +742,15 @@ + "[ -f /etc/xprofile ] && . /etc/xprofile\n" + "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n" + "\n" ++"# run all system xinitrc shell scripts.\n" ++"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n" ++" for i in /etc/X11/xinit/xinitrc.d/* ; do\n" ++" if [ -x \"$i\" ]; then\n" ++" . \"$i\"\n" ++" fi\n" ++" done\n" ++"fi\n" ++"\n" + "if [ -d /etc/X11/Xresources ]; then\n" + " for i in /etc/X11/Xresources/*; do\n" + " [ -f $i ] && xrdb -merge $i\n" Deleted: kscreensaver.pam =================================================================== --- kscreensaver.pam 2011-12-08 16:17:28 UTC (rev 144858) +++ kscreensaver.pam 2011-12-08 16:18:07 UTC (rev 144859) @@ -1 +0,0 @@ -auth required pam_unix_auth.so Copied: kdebase-workspace/repos/kde-unstable-x86_64/kscreensaver.pam (from rev 144858, kdebase-workspace/trunk/kscreensaver.pam) =================================================================== --- kscreensaver.pam (rev 0) +++ kscreensaver.pam 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1 @@ +auth required pam_unix_auth.so Deleted: terminate-server.patch =================================================================== --- terminate-server.patch 2011-12-08 16:17:28 UTC (rev 144858) +++ terminate-server.patch 2011-12-08 16:18:07 UTC (rev 144859) @@ -1,11 +0,0 @@ ---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 -+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 -@@ -1448,7 +1448,7 @@ - - Key: TerminateServer - Type: bool --Default: false -+Default: true - User: core - Instance: #:*/! - Merge: xdm Copied: kdebase-workspace/repos/kde-unstable-x86_64/terminate-server.patch (from rev 144858, kdebase-workspace/trunk/terminate-server.patch) =================================================================== --- terminate-server.patch (rev 0) +++ terminate-server.patch 2011-12-08 16:18:07 UTC (rev 144859) @@ -0,0 +1,11 @@ +--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 +@@ -1448,7 +1448,7 @@ + + Key: TerminateServer + Type: bool +-Default: false ++Default: true + User: core + Instance: #:*/! + Merge: xdm