diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD index f6f7d69c6..8ab915341 100644 --- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -28,7 +28,7 @@ source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tq md5sums=('d54cc9fd0b35555298efd17c32471a2b') _qtdir=/opt/qt -_prefix=/opt/trinity +_prefix=/usr build() { diff --git a/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD index e4e63422a..925f2e4fd 100644 --- a/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD @@ -1,5 +1,5 @@ # $Id$ -# Maintainer: David C. Rankin +# Maintainer: Calvin Morrison # # All modifications and uses of this file are licensed under # the software for which this file was made for, should the software @@ -12,12 +12,12 @@ pkgname=trinity-konversation pkgver=3513 pkgrel=1 arch=('i686' 'x86_64') -url='http://www.kde.org' +url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity') pkgdesc="Trinity - Konversation IRC client" -depends=('trinity-kdebase') -makedepends=('pkgconfig' 'cmake' 'imake') +depends=('trinity-kdelibs' 'trinity-qt3' 'trinity-tqtinterface') +makedepends=('pkgconfig' 'autoconf' 'automake') options=('libtool' '!strip') source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/konversation-3.5.13.tar.gz) md5sums=('0f0e0415dad4c19bc885c9addadf4026') @@ -30,6 +30,9 @@ build() { 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 + export CFLAGS=-I/opt/triniy/include/tqt + export CXXFLAGS=-I/opt/trinity/include/tqt + trinity_prefix="/opt/trinity" msg "Starting cmake..." diff --git a/arch/3.5.13_broken/trinity-lipstik/PKGBUILD b/arch/3.5.13_broken/trinity-lipstik/PKGBUILD index d8998afa6..63328f858 100644 --- a/arch/3.5.13_broken/trinity-lipstik/PKGBUILD +++ b/arch/3.5.13_broken/trinity-lipstik/PKGBUILD @@ -23,9 +23,15 @@ build() { export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig + + export CFLAGS=-I/opt/trinity/include/tqt + export CXXFLAGS=-I/opt/trinity/include/tqt trinity_prefix="/opt/trinity" + cd $srcdir/${_svnmod} + make -f admin/Makefile.common + cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p build