added a ld.so.conf page for libqt-mt.so. added ruby depend for amarok. added konversation base PKGBUILD

3 files changed, 61 insertions, 5 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
index ca7954484..fcf35d65c 100644
--- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Calvin Morrison <MutantTurkey@gmail.com>
 pkgname=trinity-qt3
 pkgver=3884
-pkgrel=1
+pkgrel=2
 pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
 _prefix="/opt/qt"
 arch=('i686' 'x86_64')
@@ -51,7 +51,14 @@ fi
 }
 
 package() {
- cd "$srcdir/qt3"
+  
+  cd "$srcdir/qt3"
+
+  # Build ld.so.conf file
+  echo "/${_prefix}" > ${srcdir}/libqt-mt.conf
+  echo "/opt/trinity/lib" >> ${srcdir}/libqt-mt.conf
+  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+  install -D -m755 ${srcdir}/libqt-mt.conf  ${pkgdir}/etc/ld.so.conf.d/libqt-mt.conf
 
   # Build and install qt.profile
   echo "export QTDIR=/${_prefix}" > ${srcdir}/qt.profile
@@ -60,8 +67,6 @@ package() {
   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
 
diff --git a/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD
index 2f4432a05..072124e64 100644
--- a/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-amarok/PKGBUILD
@@ -8,7 +8,7 @@ url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-extras')
 pkgdesc="Trinity - Amarok music player "
-depends=('trinity-kdebase' 'libifp' 'libmtp' 'libnjb' 'python-daap')
+depends=('trinity-kdebase' 'libifp' 'libmtp' 'libnjb' 'python-daap' 'ruby')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/amarok-3.5.13.tar.gz)
diff --git a/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
new file mode 100644
index 000000000..e4e63422a
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgname=trinity-konversation
+pkgver=3513
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - Konversation IRC client"
+depends=('trinity-kdebase')
+makedepends=('pkgconfig' 'cmake' 'imake')
+options=('libtool' '!strip')
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/konversation-3.5.13.tar.gz)
+md5sums=('0f0e0415dad4c19bc885c9addadf4026')
+
+build() {
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+  trinity_prefix="/opt/trinity"
+  
+  msg "Starting cmake..."
+  
+  cd "$srcdir/applications/konversation"
+  make -f admin/Makefile.common
+  ./configure --with-qt-dir=/opt/qt/ --prefix=/opt/trinity
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}