[arch-commits] Commit in kdebase-workspace/repos (26 files)
Andrea Scarpino
andrea at archlinux.org
Sat Oct 13 14:47:43 UTC 2012
Date: Saturday, October 13, 2012 @ 10:47:43
Author: andrea
Revision: 168620
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
kdebase-workspace/repos/staging-i686/
kdebase-workspace/repos/staging-i686/PKGBUILD
(from rev 168619, kdebase-workspace/trunk/PKGBUILD)
kdebase-workspace/repos/staging-i686/fixpath.patch
(from rev 168619, kdebase-workspace/trunk/fixpath.patch)
kdebase-workspace/repos/staging-i686/kde-np.pam
(from rev 168619, kdebase-workspace/trunk/kde-np.pam)
kdebase-workspace/repos/staging-i686/kde.pam
(from rev 168619, kdebase-workspace/trunk/kde.pam)
kdebase-workspace/repos/staging-i686/kdebase-workspace.install
(from rev 168619, kdebase-workspace/trunk/kdebase-workspace.install)
kdebase-workspace/repos/staging-i686/kdm
(from rev 168619, kdebase-workspace/trunk/kdm)
kdebase-workspace/repos/staging-i686/kdm-xinitrd.patch
(from rev 168619, kdebase-workspace/trunk/kdm-xinitrd.patch)
kdebase-workspace/repos/staging-i686/kdm.logrotate
(from rev 168619, kdebase-workspace/trunk/kdm.logrotate)
kdebase-workspace/repos/staging-i686/kdm.service
(from rev 168619, kdebase-workspace/trunk/kdm.service)
kdebase-workspace/repos/staging-i686/kscreensaver.pam
(from rev 168619, kdebase-workspace/trunk/kscreensaver.pam)
kdebase-workspace/repos/staging-i686/logind-support.patch
(from rev 168619, kdebase-workspace/trunk/logind-support.patch)
kdebase-workspace/repos/staging-i686/terminate-server.patch
(from rev 168619, kdebase-workspace/trunk/terminate-server.patch)
kdebase-workspace/repos/staging-x86_64/
kdebase-workspace/repos/staging-x86_64/PKGBUILD
(from rev 168619, kdebase-workspace/trunk/PKGBUILD)
kdebase-workspace/repos/staging-x86_64/fixpath.patch
(from rev 168619, kdebase-workspace/trunk/fixpath.patch)
kdebase-workspace/repos/staging-x86_64/kde-np.pam
(from rev 168619, kdebase-workspace/trunk/kde-np.pam)
kdebase-workspace/repos/staging-x86_64/kde.pam
(from rev 168619, kdebase-workspace/trunk/kde.pam)
kdebase-workspace/repos/staging-x86_64/kdebase-workspace.install
(from rev 168619, kdebase-workspace/trunk/kdebase-workspace.install)
kdebase-workspace/repos/staging-x86_64/kdm
(from rev 168619, kdebase-workspace/trunk/kdm)
kdebase-workspace/repos/staging-x86_64/kdm-xinitrd.patch
(from rev 168619, kdebase-workspace/trunk/kdm-xinitrd.patch)
kdebase-workspace/repos/staging-x86_64/kdm.logrotate
(from rev 168619, kdebase-workspace/trunk/kdm.logrotate)
kdebase-workspace/repos/staging-x86_64/kdm.service
(from rev 168619, kdebase-workspace/trunk/kdm.service)
kdebase-workspace/repos/staging-x86_64/kscreensaver.pam
(from rev 168619, kdebase-workspace/trunk/kscreensaver.pam)
kdebase-workspace/repos/staging-x86_64/logind-support.patch
(from rev 168619, kdebase-workspace/trunk/logind-support.patch)
kdebase-workspace/repos/staging-x86_64/terminate-server.patch
(from rev 168619, kdebase-workspace/trunk/terminate-server.patch)
------------------------------------------+
staging-i686/PKGBUILD | 95 +++++++++++++++++++++++++++++
staging-i686/fixpath.patch | 34 ++++++++++
staging-i686/kde-np.pam | 12 +++
staging-i686/kde.pam | 8 ++
staging-i686/kdebase-workspace.install | 25 +++++++
staging-i686/kdm | 36 ++++++++++
staging-i686/kdm-xinitrd.patch | 18 +++++
staging-i686/kdm.logrotate | 6 +
staging-i686/kdm.service | 9 ++
staging-i686/kscreensaver.pam | 1
staging-i686/logind-support.patch | 66 ++++++++++++++++++++
staging-i686/terminate-server.patch | 11 +++
staging-x86_64/PKGBUILD | 95 +++++++++++++++++++++++++++++
staging-x86_64/fixpath.patch | 34 ++++++++++
staging-x86_64/kde-np.pam | 12 +++
staging-x86_64/kde.pam | 8 ++
staging-x86_64/kdebase-workspace.install | 25 +++++++
staging-x86_64/kdm | 36 ++++++++++
staging-x86_64/kdm-xinitrd.patch | 18 +++++
staging-x86_64/kdm.logrotate | 6 +
staging-x86_64/kdm.service | 9 ++
staging-x86_64/kscreensaver.pam | 1
staging-x86_64/logind-support.patch | 66 ++++++++++++++++++++
staging-x86_64/terminate-server.patch | 11 +++
24 files changed, 642 insertions(+)
Copied: kdebase-workspace/repos/staging-i686/PKGBUILD (from rev 168619, kdebase-workspace/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.9.2
+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'
+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' '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')
+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')
+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'
+ 'logind-support.patch')
+sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
+ '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
+ '660eae40a707d2711d8d7f32a93214865506b795'
+ 'b7980f2e199963caf8e92b499042d244ece2fca0'
+ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
+ 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+ 'd509dac592bd8b310df27991b208c95b6d907514'
+ 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+ 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
+
+build() {
+ cd ${_pkgname}-${pkgver}
+
+ # 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
+
+ cd ../
+
+ 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 \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DWITH_CkConnector=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ 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
+ install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
+ install -D -m644 "${srcdir}"/kdm.service \
+ "${pkgdir}"/usr/lib/systemd/system/kdm.service
+ install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
+}
Copied: kdebase-workspace/repos/staging-i686/fixpath.patch (from rev 168619, kdebase-workspace/trunk/fixpath.patch)
===================================================================
--- staging-i686/fixpath.patch (rev 0)
+++ staging-i686/fixpath.patch 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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/staging-i686/kde-np.pam (from rev 168619, kdebase-workspace/trunk/kde-np.pam)
===================================================================
--- staging-i686/kde-np.pam (rev 0)
+++ staging-i686/kde-np.pam 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth required pam_tally.so onerr=succeed file=/var/log/faillog
+auth required pam_shells.so
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth optional pam_permit.s
+
+account include system-login
+
+password include system-login
+
+session include system-login
Copied: kdebase-workspace/repos/staging-i686/kde.pam (from rev 168619, kdebase-workspace/trunk/kde.pam)
===================================================================
--- staging-i686/kde.pam (rev 0)
+++ staging-i686/kde.pam 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-login
+
+account include system-login
+
+password include system-login
+
+session include system-login
Copied: kdebase-workspace/repos/staging-i686/kdebase-workspace.install (from rev 168619, kdebase-workspace/trunk/kdebase-workspace.install)
===================================================================
--- staging-i686/kdebase-workspace.install (rev 0)
+++ staging-i686/kdebase-workspace.install 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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/staging-i686/kdm (from rev 168619, kdebase-workspace/trunk/kdm)
===================================================================
--- staging-i686/kdm (rev 0)
+++ staging-i686/kdm 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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/staging-i686/kdm-xinitrd.patch (from rev 168619, kdebase-workspace/trunk/kdm-xinitrd.patch)
===================================================================
--- staging-i686/kdm-xinitrd.patch (rev 0)
+++ staging-i686/kdm-xinitrd.patch 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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"
Copied: kdebase-workspace/repos/staging-i686/kdm.logrotate (from rev 168619, kdebase-workspace/trunk/kdm.logrotate)
===================================================================
--- staging-i686/kdm.logrotate (rev 0)
+++ staging-i686/kdm.logrotate 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,6 @@
+/var/log/kdm.log {
+ maxage 365
+ size=+1024k
+ notifempty
+ missingok
+}
Copied: kdebase-workspace/repos/staging-i686/kdm.service (from rev 168619, kdebase-workspace/trunk/kdm.service)
===================================================================
--- staging-i686/kdm.service (rev 0)
+++ staging-i686/kdm.service 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,9 @@
+[Unit]
+Description=K Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+
+[Install]
+Alias=display-manager.service
Copied: kdebase-workspace/repos/staging-i686/kscreensaver.pam (from rev 168619, kdebase-workspace/trunk/kscreensaver.pam)
===================================================================
--- staging-i686/kscreensaver.pam (rev 0)
+++ staging-i686/kscreensaver.pam 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1 @@
+auth required pam_unix_auth.so
Copied: kdebase-workspace/repos/staging-i686/logind-support.patch (from rev 168619, kdebase-workspace/trunk/logind-support.patch)
===================================================================
--- staging-i686/logind-support.patch (rev 0)
+++ staging-i686/logind-support.patch 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,66 @@
+From: Lukas Tinkl <lukas at kde.org>
+Date: Fri, 05 Oct 2012 09:57:13 +0000
+Subject: store the filedescriptor in a member variable
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1
+---
+store the filedescriptor in a member variable
+
+make systemd-inhibit work as intended, PowerDevil now handles
+power/sleep/lid buttons as intended
+
+BUG: 307412
+---
+
+
+--- a/powerdevil/daemon/powerdevilpolicyagent.cpp
++++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
+@@ -29,7 +29,6 @@
+ #include <QtDBus/QDBusPendingReply>
+ #include <QtDBus/QDBusConnectionInterface>
+ #include <QtDBus/QDBusServiceWatcher>
+-#include <QtDBus/QDBusUnixFileDescriptor>
+
+ #include <KGlobal>
+ #include <KDebug>
+@@ -225,6 +224,9 @@
+ onActiveSessionChanged(m_activeSessionPath);
+
+ // inhibit systemd handling of power/sleep/lid buttons
++ // http://www.freedesktop.org/wiki/Software/systemd/inhibit
++ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
++
+ QVariantList args;
+ args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
+ args << "PowerDevil"; // who
+@@ -232,8 +234,9 @@
+ args << "block"; // mode
+ QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
+ desc.waitForFinished();
+- if (desc.isValid() && desc.value().isValid()) {
+- kDebug() << "systemd powersave events handling inhibited";
++ if (desc.isValid()) {
++ m_systemdInhibitFd = desc.value();
++ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
+ }
+ else
+ kWarning() << "failed to inhibit systemd powersave handling";
+
+--- a/powerdevil/daemon/powerdevilpolicyagent.h
++++ b/powerdevil/daemon/powerdevilpolicyagent.h
+@@ -27,6 +27,7 @@
+ #include <QtCore/QWeakPointer>
+
+ #include <QtDBus/QDBusContext>
++#include <QtDBus/QDBusUnixFileDescriptor>
+
+ #include <kdemacros.h>
+
+@@ -108,6 +109,7 @@
+ QString m_activeSessionPath;
+ QWeakPointer< QDBusInterface > m_sdSessionInterface;
+ QWeakPointer< QDBusInterface > m_sdSeatInterface;
++ QDBusUnixFileDescriptor m_systemdInhibitFd;
+
+ // ConsoleKit support
+ bool m_ckAvailable;
+
Copied: kdebase-workspace/repos/staging-i686/terminate-server.patch (from rev 168619, kdebase-workspace/trunk/terminate-server.patch)
===================================================================
--- staging-i686/terminate-server.patch (rev 0)
+++ staging-i686/terminate-server.patch 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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
Copied: kdebase-workspace/repos/staging-x86_64/PKGBUILD (from rev 168619, kdebase-workspace/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,95 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-workspace
+_pkgname=kde-workspace
+pkgver=4.9.2
+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'
+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' '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')
+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')
+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'
+ 'logind-support.patch')
+sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
+ '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
+ '660eae40a707d2711d8d7f32a93214865506b795'
+ 'b7980f2e199963caf8e92b499042d244ece2fca0'
+ '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
+ 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
+ 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
+ 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
+ 'd509dac592bd8b310df27991b208c95b6d907514'
+ 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
+ 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
+
+build() {
+ cd ${_pkgname}-${pkgver}
+
+ # 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
+
+ cd ../
+
+ 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 \
+ -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+ -DWITH_CkConnector=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ 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
+ install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
+ install -D -m644 "${srcdir}"/kdm.service \
+ "${pkgdir}"/usr/lib/systemd/system/kdm.service
+ install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
+}
Copied: kdebase-workspace/repos/staging-x86_64/fixpath.patch (from rev 168619, kdebase-workspace/trunk/fixpath.patch)
===================================================================
--- staging-x86_64/fixpath.patch (rev 0)
+++ staging-x86_64/fixpath.patch 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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/staging-x86_64/kde-np.pam (from rev 168619, kdebase-workspace/trunk/kde-np.pam)
===================================================================
--- staging-x86_64/kde-np.pam (rev 0)
+++ staging-x86_64/kde-np.pam 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,12 @@
+#%PAM-1.0
+auth required pam_tally.so onerr=succeed file=/var/log/faillog
+auth required pam_shells.so
+auth requisite pam_nologin.so
+auth required pam_env.so
+auth optional pam_permit.s
+
+account include system-login
+
+password include system-login
+
+session include system-login
Copied: kdebase-workspace/repos/staging-x86_64/kde.pam (from rev 168619, kdebase-workspace/trunk/kde.pam)
===================================================================
--- staging-x86_64/kde.pam (rev 0)
+++ staging-x86_64/kde.pam 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-login
+
+account include system-login
+
+password include system-login
+
+session include system-login
Copied: kdebase-workspace/repos/staging-x86_64/kdebase-workspace.install (from rev 168619, kdebase-workspace/trunk/kdebase-workspace.install)
===================================================================
--- staging-x86_64/kdebase-workspace.install (rev 0)
+++ staging-x86_64/kdebase-workspace.install 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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/staging-x86_64/kdm (from rev 168619, kdebase-workspace/trunk/kdm)
===================================================================
--- staging-x86_64/kdm (rev 0)
+++ staging-x86_64/kdm 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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/staging-x86_64/kdm-xinitrd.patch (from rev 168619, kdebase-workspace/trunk/kdm-xinitrd.patch)
===================================================================
--- staging-x86_64/kdm-xinitrd.patch (rev 0)
+++ staging-x86_64/kdm-xinitrd.patch 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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"
Copied: kdebase-workspace/repos/staging-x86_64/kdm.logrotate (from rev 168619, kdebase-workspace/trunk/kdm.logrotate)
===================================================================
--- staging-x86_64/kdm.logrotate (rev 0)
+++ staging-x86_64/kdm.logrotate 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,6 @@
+/var/log/kdm.log {
+ maxage 365
+ size=+1024k
+ notifempty
+ missingok
+}
Copied: kdebase-workspace/repos/staging-x86_64/kdm.service (from rev 168619, kdebase-workspace/trunk/kdm.service)
===================================================================
--- staging-x86_64/kdm.service (rev 0)
+++ staging-x86_64/kdm.service 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,9 @@
+[Unit]
+Description=K Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/kdm -nodaemon
+
+[Install]
+Alias=display-manager.service
Copied: kdebase-workspace/repos/staging-x86_64/kscreensaver.pam (from rev 168619, kdebase-workspace/trunk/kscreensaver.pam)
===================================================================
--- staging-x86_64/kscreensaver.pam (rev 0)
+++ staging-x86_64/kscreensaver.pam 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1 @@
+auth required pam_unix_auth.so
Copied: kdebase-workspace/repos/staging-x86_64/logind-support.patch (from rev 168619, kdebase-workspace/trunk/logind-support.patch)
===================================================================
--- staging-x86_64/logind-support.patch (rev 0)
+++ staging-x86_64/logind-support.patch 2012-10-13 14:47:43 UTC (rev 168620)
@@ -0,0 +1,66 @@
+From: Lukas Tinkl <lukas at kde.org>
+Date: Fri, 05 Oct 2012 09:57:13 +0000
+Subject: store the filedescriptor in a member variable
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1
+---
+store the filedescriptor in a member variable
+
+make systemd-inhibit work as intended, PowerDevil now handles
+power/sleep/lid buttons as intended
+
+BUG: 307412
+---
+
+
+--- a/powerdevil/daemon/powerdevilpolicyagent.cpp
++++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
+@@ -29,7 +29,6 @@
+ #include <QtDBus/QDBusPendingReply>
+ #include <QtDBus/QDBusConnectionInterface>
+ #include <QtDBus/QDBusServiceWatcher>
+-#include <QtDBus/QDBusUnixFileDescriptor>
+
+ #include <KGlobal>
+ #include <KDebug>
+@@ -225,6 +224,9 @@
+ onActiveSessionChanged(m_activeSessionPath);
+
+ // inhibit systemd handling of power/sleep/lid buttons
++ // http://www.freedesktop.org/wiki/Software/systemd/inhibit
++ kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
++
+ QVariantList args;
+ args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
+ args << "PowerDevil"; // who
+@@ -232,8 +234,9 @@
+ args << "block"; // mode
+ QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
+ desc.waitForFinished();
+- if (desc.isValid() && desc.value().isValid()) {
+- kDebug() << "systemd powersave events handling inhibited";
++ if (desc.isValid()) {
++ m_systemdInhibitFd = desc.value();
++ kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
+ }
+ else
+ kWarning() << "failed to inhibit systemd powersave handling";
+
+--- a/powerdevil/daemon/powerdevilpolicyagent.h
++++ b/powerdevil/daemon/powerdevilpolicyagent.h
+@@ -27,6 +27,7 @@
+ #include <QtCore/QWeakPointer>
+
+ #include <QtDBus/QDBusContext>
++#include <QtDBus/QDBusUnixFileDescriptor>
+
+ #include <kdemacros.h>
+
+@@ -108,6 +109,7 @@
+ QString m_activeSessionPath;
+ QWeakPointer< QDBusInterface > m_sdSessionInterface;
+ QWeakPointer< QDBusInterface > m_sdSeatInterface;
++ QDBusUnixFileDescriptor m_systemdInhibitFd;
+
+ // ConsoleKit support
+ bool m_ckAvailable;
+
Copied: kdebase-workspace/repos/staging-x86_64/terminate-server.patch (from rev 168619, kdebase-workspace/trunk/terminate-server.patch)
===================================================================
--- staging-x86_64/terminate-server.patch (rev 0)
+++ staging-x86_64/terminate-server.patch 2012-10-13 14:47:43 UTC (rev 168620)
@@ -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
More information about the arch-commits
mailing list