diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD index 63759a641..165102585 100644 --- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD @@ -1,54 +1,41 @@ -# Maintainer: Calvin Morrison +# Maintainer: Pawel 'l0ner' Soltys +# Contributor: Calvin Morrison pkgname=trinity-dbus-tqt pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity TQt DBus wrapper" -depends=('trinity-tqtinterface') +depends=('trinity-tqtinterface' 'dbus-core') makedepends=('pkgconfig' 'cmake') -conflicts=('trinity-dbus-tqt') -replaces=('trinity-dbus-tqt') options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz) md5sums=('46ae165c068271485c827f6fc6687a9a') -_svnmod=dependencies/dbus-tqt -_builddir=build _prefix="/opt/trinity" build() { msg "Setting PATH, CMAKE and Trinity Environment variables" - #if [[ -r /etc/profile.d/qt3.sh ]]; then - . /etc/profile.d/qt3.sh - # [[ -n $QTDIR ]] && _qtdir=$QTDIR - #else - # [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH - #fi + . /etc/profile.d/qt3.sh + export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} - export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:\ - /usr/include/dbus-1.0:\ - ${_prefix}/include:\ - ${_prefix}/include/libkrandr + export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/include:${_prefix}/include/libkrandr export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig cd $srcdir - msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" - mkdir -p ${_builddir} - cd ${_builddir} + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build msg "Starting cmake..." - cmake ${srcdir}/${_svnmod} \ + cmake ${srcdir}/dependencies/dbus-tqt \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=ON -# -DWITH_QT3=ON \ -# -DQTDIR=/opt/qt \ -# -DQT_LIBRARY_DIRS=/opt/qt/lib \ msg "Building - $pkgname..." make @@ -56,7 +43,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" -# cd ${srcdir}/${_svnmod} - cd ${srcdir}/${_builddir} + cd ${srcdir}/build make DESTDIR="${pkgdir}" install }