[arch-commits] Commit in kdebase-workspace/repos (18 files)
Andrea Scarpino
andrea at archlinux.org
Thu Dec 8 16:10:10 UTC 2011
Date: Thursday, December 8, 2011 @ 11:10:09
Author: andrea
Revision: 144857
archrelease: copy trunk to kde-unstable-i686, kde-unstable-x86_64
Modified:
kdebase-workspace/repos/extra-i686/PKGBUILD
kdebase-workspace/repos/extra-x86_64/PKGBUILD
Deleted:
kdebase-workspace/repos/extra-i686/kdm-zsh-profile.patch
kdebase-workspace/repos/extra-x86_64/kdm-zsh-profile.patch
kdebase-workspace/repos/kde-unstable-i686/PKGBUILD
kdebase-workspace/repos/kde-unstable-i686/fixpath.patch
kdebase-workspace/repos/kde-unstable-i686/kde-np.pam
kdebase-workspace/repos/kde-unstable-i686/kde.pam
kdebase-workspace/repos/kde-unstable-i686/kdebase-workspace.install
kdebase-workspace/repos/kde-unstable-i686/kdm
kdebase-workspace/repos/kde-unstable-i686/kdm-xinitrd.patch
kdebase-workspace/repos/kde-unstable-x86_64/PKGBUILD
kdebase-workspace/repos/kde-unstable-x86_64/fixpath.patch
kdebase-workspace/repos/kde-unstable-x86_64/kde-np.pam
kdebase-workspace/repos/kde-unstable-x86_64/kde.pam
kdebase-workspace/repos/kde-unstable-x86_64/kdebase-workspace.install
kdebase-workspace/repos/kde-unstable-x86_64/kdm
kdebase-workspace/repos/kde-unstable-x86_64/kdm-xinitrd.patch
-----------------------------------------------+
extra-i686/PKGBUILD | 6 -
extra-i686/kdm-zsh-profile.patch | 11 ---
extra-x86_64/PKGBUILD | 6 -
extra-x86_64/kdm-zsh-profile.patch | 11 ---
kde-unstable-i686/PKGBUILD | 80 ------------------------
kde-unstable-i686/fixpath.patch | 34 ----------
kde-unstable-i686/kde-np.pam | 7 --
kde-unstable-i686/kde.pam | 7 --
kde-unstable-i686/kdebase-workspace.install | 25 -------
kde-unstable-i686/kdm | 36 ----------
kde-unstable-i686/kdm-xinitrd.patch | 18 -----
kde-unstable-x86_64/PKGBUILD | 80 ------------------------
kde-unstable-x86_64/fixpath.patch | 34 ----------
kde-unstable-x86_64/kde-np.pam | 7 --
kde-unstable-x86_64/kde.pam | 7 --
kde-unstable-x86_64/kdebase-workspace.install | 25 -------
kde-unstable-x86_64/kdm | 36 ----------
kde-unstable-x86_64/kdm-xinitrd.patch | 18 -----
18 files changed, 4 insertions(+), 444 deletions(-)
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-12-08 16:09:06 UTC (rev 144856)
+++ extra-i686/PKGBUILD 2011-12-08 16:10:09 UTC (rev 144857)
@@ -5,7 +5,7 @@
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -32,10 +32,9 @@
'etc/pam.d/kscreensaver')
options=('emptydirs')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+ 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
sha1sums=('b7810ba13f6f2a1c4783b153ad9349a1dd27b495'
- '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
'603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
@@ -46,7 +45,6 @@
build() {
cd "${srcdir}"/${_pkgname}-${pkgver}
- patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch
patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
patch -p0 -i "${srcdir}"/fixpath.patch
patch -p0 -i "${srcdir}"/terminate-server.patch
Deleted: extra-i686/kdm-zsh-profile.patch
===================================================================
--- extra-i686/kdm-zsh-profile.patch 2011-12-08 16:09:06 UTC (rev 144856)
+++ extra-i686/kdm-zsh-profile.patch 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- " zhome=${ZDOTDIR:-$HOME}\n"
- " # zshenv is always sourced automatically.\n"
--" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+" [ -f /etc/profile ] && . /etc/profile\n"
- " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-12-08 16:09:06 UTC (rev 144856)
+++ extra-x86_64/PKGBUILD 2011-12-08 16:10:09 UTC (rev 144857)
@@ -5,7 +5,7 @@
pkgname=kdebase-workspace
_pkgname=kde-workspace
pkgver=4.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Base Workspace"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -32,10 +32,9 @@
'etc/pam.d/kscreensaver')
options=('emptydirs')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+ 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
sha1sums=('b7810ba13f6f2a1c4783b153ad9349a1dd27b495'
- '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
'5db3a245201bd4a50e65aa2ef583cf5490e4f646'
'f7b38af38549242a240f1a90ab9964ca8a366129'
'603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
@@ -46,7 +45,6 @@
build() {
cd "${srcdir}"/${_pkgname}-${pkgver}
- patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch
patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
patch -p0 -i "${srcdir}"/fixpath.patch
patch -p0 -i "${srcdir}"/terminate-server.patch
Deleted: extra-x86_64/kdm-zsh-profile.patch
===================================================================
--- extra-x86_64/kdm-zsh-profile.patch 2011-12-08 16:09:06 UTC (rev 144856)
+++ extra-x86_64/kdm-zsh-profile.patch 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- " zhome=${ZDOTDIR:-$HOME}\n"
- " # zshenv is always sourced automatically.\n"
--" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+" [ -f /etc/profile ] && . /etc/profile\n"
- " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-i686/PKGBUILD 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.7.90
-pkgrel=1
-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
-}
Deleted: kde-unstable-i686/fixpath.patch
===================================================================
--- kde-unstable-i686/fixpath.patch 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-i686/fixpath.patch 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,34 +0,0 @@
---- 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
Deleted: kde-unstable-i686/kde-np.pam
===================================================================
--- kde-unstable-i686/kde-np.pam 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-i686/kde-np.pam 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,7 +0,0 @@
-#%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
Deleted: kde-unstable-i686/kde.pam
===================================================================
--- kde-unstable-i686/kde.pam 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-i686/kde.pam 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,7 +0,0 @@
-#%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
Deleted: kde-unstable-i686/kdebase-workspace.install
===================================================================
--- kde-unstable-i686/kdebase-workspace.install 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-i686/kdebase-workspace.install 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,25 +0,0 @@
-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
-}
Deleted: kde-unstable-i686/kdm
===================================================================
--- kde-unstable-i686/kdm 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-i686/kdm 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,36 +0,0 @@
-#!/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
Deleted: kde-unstable-i686/kdm-xinitrd.patch
===================================================================
--- kde-unstable-i686/kdm-xinitrd.patch 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-i686/kdm-xinitrd.patch 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,18 +0,0 @@
---- 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: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-x86_64/PKGBUILD 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,80 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.7.90
-pkgrel=1
-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
-}
Deleted: kde-unstable-x86_64/fixpath.patch
===================================================================
--- kde-unstable-x86_64/fixpath.patch 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-x86_64/fixpath.patch 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,34 +0,0 @@
---- 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
Deleted: kde-unstable-x86_64/kde-np.pam
===================================================================
--- kde-unstable-x86_64/kde-np.pam 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-x86_64/kde-np.pam 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,7 +0,0 @@
-#%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
Deleted: kde-unstable-x86_64/kde.pam
===================================================================
--- kde-unstable-x86_64/kde.pam 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-x86_64/kde.pam 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,7 +0,0 @@
-#%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
Deleted: kde-unstable-x86_64/kdebase-workspace.install
===================================================================
--- kde-unstable-x86_64/kdebase-workspace.install 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-x86_64/kdebase-workspace.install 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,25 +0,0 @@
-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
-}
Deleted: kde-unstable-x86_64/kdm
===================================================================
--- kde-unstable-x86_64/kdm 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-x86_64/kdm 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,36 +0,0 @@
-#!/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
Deleted: kde-unstable-x86_64/kdm-xinitrd.patch
===================================================================
--- kde-unstable-x86_64/kdm-xinitrd.patch 2011-12-08 16:09:06 UTC (rev 144856)
+++ kde-unstable-x86_64/kdm-xinitrd.patch 2011-12-08 16:10:09 UTC (rev 144857)
@@ -1,18 +0,0 @@
---- 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"
More information about the arch-commits
mailing list