summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPawel 'l0ner' Soltys <pwslts@gmail.com>2012-01-14 23:59:15 +0100
committerPawel 'l0ner' Soltys <pwslts@gmail.com>2012-01-14 23:59:15 +0100
commitc9e0d0770755b21f42fa5ce1c2014ef239bd45bc (patch)
tree4974685f6e3741d31107594613cbc2e4110493dd /arch
parent76c1d2202ef3c9140090fecd56bf608dc8c265de (diff)
downloadtde-packaging-c9e0d0770755b21f42fa5ce1c2014ef239bd45bc.tar.gz
tde-packaging-c9e0d0770755b21f42fa5ce1c2014ef239bd45bc.zip
dbus-tqt: changed maintainer
- Added Calvin as Contributor - Removed ${QTDIR}/include/tqt since it's int needed (tqt sits in /usr) - Removed unnecessary variables - added dbus-core dependency
Diffstat (limited to 'arch')
-rw-r--r--arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD38
1 files changed, 12 insertions, 26 deletions
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 <mutantturkey@gmail.com>
+# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
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
}