diff options
Diffstat (limited to 'arch/3.5.13/trinity-base')
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 19 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity | 16 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 14 |
3 files changed, 34 insertions, 15 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index b157fd417..a03c45027 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -8,7 +8,24 @@ url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity - kdebase" -depends=('hal' 'libltdl' 'trinity-dbus-1-qt3' 'trinity-arts' 'trinity-qt3' 'trinity-pyqt3' 'trinity-dbus-tqt-1' 'trinity-dbus-tqt' 'trinity-kdelibs' 'openexr') +depends=('hal' + 'trinity-dbus-1-qt3' + 'trinity-arts' + 'trinity-qt3' + 'trinity-pyqt3' + 'trinity-dbus-tqt-1' + 'trinity-dbus-tqt' + 'trinity-kdelibs' + 'openexr' + 'libxtst' + 'libxkbfile' + 'xorg-server' + 'xorg-xset' + 'xorg-xsetroot' + 'xorg-xprop' + 'xorg-xmessage' + 'xorg-xinit' + 'xorg-iceauth') makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' 'pciutils: PCI bus configuration space access library and tools' diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity index 48f290355..03209b456 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity +++ b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity @@ -4,25 +4,27 @@ . /etc/rc.conf . /etc/rc.d/functions +PID=`pidof -o %PPID /opt/trinity/bin/kdm` case "$1" in start) #Check for running kdm, start when not running - stat_busy "Starting KDM" - /opt/trinity/bin/kdm + stat_busy "Starting TDM Desktop Manager" + [ -z "$PID" ] && /opt/trinity/bin/kdm &> /dev/null if [ $? -gt 0 ]; then stat_fail else - add_daemon kdm + echo $PID > /var/run/kdm.pid + add_daemon kdm-trinity stat_done fi ;; stop) - stat_busy "Stopping KDM" - [ -f /var/run/kdm.pid ] && kill `cat /var/run/kdm.pid` &> /dev/null + stat_busy "Stopping TDM Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon kdm + rm_daemon kdm-trinity stat_done fi ;; @@ -35,4 +37,4 @@ case "$1" in echo "usage: $0 {start|stop|restart}" ;; esac -exit 0
\ No newline at end of file +exit 0 diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index 24f0534d3..8a9a6f194 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -9,13 +9,13 @@ license=('GPL') groups=('trinity-base') pkgdesc="Trinity - kdelibs, core libraries" depends=('libical' - 'libxslt' - 'libltdl' - 'avahi' - 'pam-krb5' - 'taglib' - 'libxcomposite' - 'trinity-arts') + 'libxslt' + 'libltdl' + 'avahi' + 'pam-krb5' + 'taglib' + 'libxcomposite' + 'trinity-arts') makedepends=('pkgconfig' 'cmake' 'autoconf' ) provides=('trinity-kdelibs' 'kdelibs3') conflicts=('trinity-kdelibs' 'kdelibs3') |