Date: Wednesday, November 2, 2011 @ 14:12:45
Author: andrea
Revision: 141771
db-move: moved kdebase-workspace from [staging] to [extra] (x86_64)
Added:
kdebase-workspace/repos/extra-x86_64/PKGBUILD
(from rev 141742, kdebase-workspace/repos/staging-x86_64/PKGBUILD)
kdebase-workspace/repos/extra-x86_64/fix-powerprofiles.patch
(from rev 141742,
kdebase-workspace/repos/staging-x86_64/fix-powerprofiles.patch)
kdebase-workspace/repos/extra-x86_64/fixpath.patch
(from rev 141742, kdebase-workspace/repos/staging-x86_64/fixpath.patch)
kdebase-workspace/repos/extra-x86_64/kde-np.pam
(from rev 141742, kdebase-workspace/repos/staging-x86_64/kde-np.pam)
kdebase-workspace/repos/extra-x86_64/kde.pam
(from rev 141742, kdebase-workspace/repos/staging-x86_64/kde.pam)
kdebase-workspace/repos/extra-x86_64/kdebase-workspace.install
(from rev 141742,
kdebase-workspace/repos/staging-x86_64/kdebase-workspace.install)
kdebase-workspace/repos/extra-x86_64/kdm
(from rev 141742, kdebase-workspace/repos/staging-x86_64/kdm)
kdebase-workspace/repos/extra-x86_64/kdm-xinitrd.patch
(from rev 141742, kdebase-workspace/repos/staging-x86_64/kdm-xinitrd.patch)
kdebase-workspace/repos/extra-x86_64/kdm-zsh-profile.patch
(from rev 141742,
kdebase-workspace/repos/staging-x86_64/kdm-zsh-profile.patch)
kdebase-workspace/repos/extra-x86_64/kscreensaver.pam
(from rev 141742, kdebase-workspace/repos/staging-x86_64/kscreensaver.pam)
kdebase-workspace/repos/extra-x86_64/terminate-server.patch
(from rev 141742,
kdebase-workspace/repos/staging-x86_64/terminate-server.patch)
Deleted:
kdebase-workspace/repos/extra-x86_64/PKGBUILD
kdebase-workspace/repos/extra-x86_64/fixpath.patch
kdebase-workspace/repos/extra-x86_64/kde-np.pam
kdebase-workspace/repos/extra-x86_64/kde.pam
kdebase-workspace/repos/extra-x86_64/kdebase-workspace.install
kdebase-workspace/repos/extra-x86_64/kdm
kdebase-workspace/repos/extra-x86_64/kdm-xinitrd.patch
kdebase-workspace/repos/extra-x86_64/kdm-zsh-profile.patch
kdebase-workspace/repos/extra-x86_64/kscreensaver.pam
kdebase-workspace/repos/extra-x86_64/terminate-server.patch
kdebase-workspace/repos/staging-x86_64/
---------------------------+
PKGBUILD | 165 ++++++++++++++++++++++----------------------
fix-powerprofiles.patch | 23 ++++++
fixpath.patch | 68 +++++++++---------
kde-np.pam | 14 +--
kde.pam | 14 +--
kdebase-workspace.install | 50 ++++++-------
kdm | 72 +++++++++----------
kdm-xinitrd.patch | 36 ++++-----
kdm-zsh-profile.patch | 22 ++---
kscreensaver.pam | 2
terminate-server.patch | 22 ++---
11 files changed, 256 insertions(+), 232 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/PKGBUILD 2011-11-02 18:12:45 UTC (rev 141771)
@@ -1,82 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org>
-# Contributor: Pierre Schmitz <pie...@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.7.2
-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')
-makedepends=('pkgconfig' '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/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2";
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
- 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('afd37b2f583690e391828c1ceb7311e2e8d37c6f'
- '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
- '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
- 'f7b38af38549242a240f1a90ab9964ca8a366129'
- '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd509dac592bd8b310df27991b208c95b6d907514')
-
-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
-
- 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=OFF \
- -DKWIN_BUILD_WITH_OPENGLES=OFF
- 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/extra-x86_64/PKGBUILD (from rev 141742,
kdebase-workspace/repos/staging-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-11-02 18:12:45 UTC (rev 141771)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@archlinux.org>
+# Contributor: Pierre Schmitz <pie...@archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.7.3
+pkgrel=3
+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')
+makedepends=('pkgconfig' '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/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2";
+ 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
+ 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e'
+ '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
+ '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
+ 'f7b38af38549242a240f1a90ab9964ca8a366129'
+ '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
+ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+ 'd509dac592bd8b310df27991b208c95b6d907514')
+
+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
+
+ 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=OFF \
+ -DKWIN_BUILD_WITH_OPENGLES=OFF \
+ -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/extra-x86_64/fix-powerprofiles.patch (from rev
141742, kdebase-workspace/repos/staging-x86_64/fix-powerprofiles.patch)
===================================================================
--- extra-x86_64/fix-powerprofiles.patch (rev 0)
+++ extra-x86_64/fix-powerprofiles.patch 2011-11-02 18:12:45 UTC (rev
141771)
@@ -0,0 +1,23 @@
+From: Dario Freddi <d...@kde.org>
+Date: Tue, 04 Oct 2011 14:09:09 +0000
+Subject: Use full config when reading settings
+X-Git-Url:
http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=8d59876457387d1c72ca3626ae2d267adf100014
+---
+Use full config when reading settings
+
+BUG: 267323
+---
+
+
+--- a/powerdevil/daemon/powerdevilcore.cpp
++++ b/powerdevil/daemon/powerdevilcore.cpp
+@@ -88,7 +88,7 @@ void Core::onBackendReady()
+ {
+ kDebug() << "Backend is ready, KDE Power Management system initialized";
+
+- m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc",
KConfig::SimpleConfig);
++ m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc",
KConfig::FullConfig);
+
+ // Is it brand new?
+ if (m_profilesConfig->groupList().isEmpty()) {
+
Deleted: extra-x86_64/fixpath.patch
===================================================================
--- extra-x86_64/fixpath.patch 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/fixpath.patch 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
Copied: kdebase-workspace/repos/extra-x86_64/fixpath.patch (from rev 141742,
kdebase-workspace/repos/staging-x86_64/fixpath.patch)
===================================================================
--- extra-x86_64/fixpath.patch (rev 0)
+++ extra-x86_64/fixpath.patch 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
Deleted: extra-x86_64/kde-np.pam
===================================================================
--- extra-x86_64/kde-np.pam 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/kde-np.pam 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
Copied: kdebase-workspace/repos/extra-x86_64/kde-np.pam (from rev 141742,
kdebase-workspace/repos/staging-x86_64/kde-np.pam)
===================================================================
--- extra-x86_64/kde-np.pam (rev 0)
+++ extra-x86_64/kde-np.pam 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
Deleted: extra-x86_64/kde.pam
===================================================================
--- extra-x86_64/kde.pam 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/kde.pam 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
Copied: kdebase-workspace/repos/extra-x86_64/kde.pam (from rev 141742,
kdebase-workspace/repos/staging-x86_64/kde.pam)
===================================================================
--- extra-x86_64/kde.pam (rev 0)
+++ extra-x86_64/kde.pam 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
Deleted: extra-x86_64/kdebase-workspace.install
===================================================================
--- extra-x86_64/kdebase-workspace.install 2011-11-02 18:12:43 UTC (rev
141770)
+++ extra-x86_64/kdebase-workspace.install 2011-11-02 18:12:45 UTC (rev
141771)
@@ -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
-}
Copied: kdebase-workspace/repos/extra-x86_64/kdebase-workspace.install (from
rev 141742, kdebase-workspace/repos/staging-x86_64/kdebase-workspace.install)
===================================================================
--- extra-x86_64/kdebase-workspace.install (rev 0)
+++ extra-x86_64/kdebase-workspace.install 2011-11-02 18:12:45 UTC (rev
141771)
@@ -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
+}
Deleted: extra-x86_64/kdm
===================================================================
--- extra-x86_64/kdm 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/kdm 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
Copied: kdebase-workspace/repos/extra-x86_64/kdm (from rev 141742,
kdebase-workspace/repos/staging-x86_64/kdm)
===================================================================
--- extra-x86_64/kdm (rev 0)
+++ extra-x86_64/kdm 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
Deleted: extra-x86_64/kdm-xinitrd.patch
===================================================================
--- extra-x86_64/kdm-xinitrd.patch 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/kdm-xinitrd.patch 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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"
Copied: kdebase-workspace/repos/extra-x86_64/kdm-xinitrd.patch (from rev
141742, kdebase-workspace/repos/staging-x86_64/kdm-xinitrd.patch)
===================================================================
--- extra-x86_64/kdm-xinitrd.patch (rev 0)
+++ extra-x86_64/kdm-xinitrd.patch 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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: extra-x86_64/kdm-zsh-profile.patch
===================================================================
--- extra-x86_64/kdm-zsh-profile.patch 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/kdm-zsh-profile.patch 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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"
Copied: kdebase-workspace/repos/extra-x86_64/kdm-zsh-profile.patch (from rev
141742, kdebase-workspace/repos/staging-x86_64/kdm-zsh-profile.patch)
===================================================================
--- extra-x86_64/kdm-zsh-profile.patch (rev 0)
+++ extra-x86_64/kdm-zsh-profile.patch 2011-11-02 18:12:45 UTC (rev 141771)
@@ -0,0 +1,11 @@
+--- 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: extra-x86_64/kscreensaver.pam
===================================================================
--- extra-x86_64/kscreensaver.pam 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/kscreensaver.pam 2011-11-02 18:12:45 UTC (rev 141771)
@@ -1 +0,0 @@
-auth required pam_unix_auth.so
Copied: kdebase-workspace/repos/extra-x86_64/kscreensaver.pam (from rev 141742,
kdebase-workspace/repos/staging-x86_64/kscreensaver.pam)
===================================================================
--- extra-x86_64/kscreensaver.pam (rev 0)
+++ extra-x86_64/kscreensaver.pam 2011-11-02 18:12:45 UTC (rev 141771)
@@ -0,0 +1 @@
+auth required pam_unix_auth.so
Deleted: extra-x86_64/terminate-server.patch
===================================================================
--- extra-x86_64/terminate-server.patch 2011-11-02 18:12:43 UTC (rev 141770)
+++ extra-x86_64/terminate-server.patch 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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/extra-x86_64/terminate-server.patch (from rev
141742, kdebase-workspace/repos/staging-x86_64/terminate-server.patch)
===================================================================
--- extra-x86_64/terminate-server.patch (rev 0)
+++ extra-x86_64/terminate-server.patch 2011-11-02 18:12:45 UTC (rev 141771)
@@ -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
