From bfc80f27b62e8b710129dfe1f68e6a2b4fd5e4a0 Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Sun, 20 Nov 2011 21:30:55 -0500 Subject: [PATCH 1/2] Thanks to Pawel for the qt loading error patch --- arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index cd9385df2..ca7954484 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -59,7 +59,10 @@ package() { echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh - + + install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ + echo "${QTDIR}/lib" > ${pkgdir}/etc/ld-so.conf.d/${pkgname}.conf + make INSTALL_ROOT="$pkgdir/" install } From 9579bdf72b941f3f838700b993c4bec8435b5deb Mon Sep 17 00:00:00 2001 From: Calvin Morrison Date: Sun, 20 Nov 2011 21:51:24 -0500 Subject: [PATCH 2/2] kdm-trinity rc.d script, thanks to Pawel, converted from an old hal script. --- .../trinity-base/trinity-kdebase/PKGBUILD | 7 ++-- .../trinity-base/trinity-kdebase/kdm-trinity | 38 +++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index ac253174b..053c22903 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -14,9 +14,10 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop 'pciutils: PCI bus configuration space access library and tools' 'xscreensaver: Screen saver and locker for the X Window System') options=('libtool' '!strip') -source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff') +source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff' 'kdm-trinity') md5sums=('d1f7e1f94eeb46b981fe1ba144179840' - 'c9ce810c281002440a6de8cfd8735d07') + 'c9ce810c281002440a6de8cfd8735d07' + '523838d16b38fc62445863ca762c17f8') _qtdir=/opt/qt _prefix="/opt/trinity" @@ -118,6 +119,6 @@ package() { ln -sf /opt/trinity/bin/startkde starttrinity cd ${startdir} + install -D -m755 ./kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity -# rm -r ${srcdir}/${_svnmod} } diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity new file mode 100644 index 000000000..48f290355 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/kdm-trinity @@ -0,0 +1,38 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + #Check for running kdm, start when not running + stat_busy "Starting KDM" + /opt/trinity/bin/kdm + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon kdm + stat_done + fi + ;; + stop) + stat_busy "Stopping KDM" + [ -f /var/run/kdm.pid ] && kill `cat /var/run/kdm.pid` &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kdm + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 \ No newline at end of file