arts, dbus-tqt-1, dbus-tqt, pyqt3, tqtinterface: minor fixups

pull/3/head
Pawel "l0ner" Soltys 13 years ago
parent 5e76820619
commit f8de04b474

@ -3,7 +3,7 @@
pkgname=trinity-arts
pkgver=3513
pkgrel=3
pkgrel=4
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.com'
license=('GPL')
@ -15,21 +15,15 @@ depends=('trinity-tqtinterface'
makedepends=('pkgconfig' 'cmake')
conflicts=('kdemod3-arts' 'arts')
options=('libtool' '!emptydirs')
source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz'
'trinity.profile.sh' 'trinity.profile.csh')
md5sums=('109124dabb1aaa9d44eb32e43b549142'
'72c6c4fb492c1f4b4741fad1dd70d62f'
'915e14c6264a6b9c46a6a20b16cdcd06')
source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz')
md5sums=('109124dabb1aaa9d44eb32e43b549142')
install='trinity-arts.install'
_prefix="/opt/trinity"
build() {
# Do we need this?
msg "Setting PATH, CMAKE and Trinity Environment variables"
# Source the QT and KDE profile
[ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
[ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
@ -38,7 +32,7 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/dependencies/arts/ \
-DCMAKE_INSTALL_PREFIX=${_prefix}
-DCMAKE_INSTALL_PREFIX=${TDEDIR}
msg "Building $pkgname..."
make
@ -49,26 +43,6 @@ package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
make DESTDIR="$pkgdir" install
# since this is first package to provide
# binaries, include headers and libs from trinity
# it should contain sripts which would add
# their location into system variables
# this mean that this package should provide
# /etc/ld.so.conf.d/trinity.conf - lib locations for linker
# /etc/profile.d/trinity.sh - $PATH and other system variables for bash
# /etc/profile.d/trinity.csh - $PATH and other system variables for csh
# up until now it was done in the kdelibs PKGBUILD/package
# Create and install ld.so.conf.d file
install -d -m755 $pkgdir/etc/ld.so.conf.d/
echo $_prefix/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
echo $_prefix/lib/kde >> $pkgdir/etc/ld.so.conf.d/trinity.conf
# Install profiles
install -D -m644 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh
install -D -m644 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh
}

@ -16,40 +16,34 @@ options=('libtool' '!strip')
source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
md5sums=('a7ba1071f4bf7b5930f805b4036f8a97')
_prefix="/opt/trinity"
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
[ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
[ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.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 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 build
cd build
msg "Starting cmake..."
cmake ${srcdir}/dependencies/dbus-1-tqt \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-DCMAKE_VERBOSE_MAKEFILE=ON
msg "Building - $pkgname..."
make
msg "Setting PATH, CMAKE and Trinity Environment variables"
. /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 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 build
cd build
msg "Starting cmake..."
cmake ${srcdir}/dependencies/dbus-1-tqt \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON
msg "Building - $pkgname..."
make
# -DWITH_QT3=ON \
# -DQTDIR=/opt/qt \
# -DQT_LIBRARY_DIRS=/opt/qt/lib \
}
package() {
msg "Packaging - $pkgname-$pkgver"
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="${pkgdir}" install
cd ${srcdir}/build
make DESTDIR="${pkgdir}" install
}

@ -17,7 +17,6 @@ md5sums=('46ae165c068271485c827f6fc6687a9a')
install='trinity-dbus-tqt.install'
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
# Source the QT and TDE profile
[ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh

@ -1,9 +1,9 @@
post_install() {
ldconfig &> /dev/null
mkpamserv trinity
echo "Please remember that you can change your kdesu backend"
echo "from su to sudo by adding following lines to your"
echo "~/.trinity/share/kdesurc or to $TDEDIR/share/config/kdesurc:"
echo "Please remember that you can change your kdesu backend from su to sudo"
echo "by adding following lines to your ~/.trinity/share/kdesurc or to the"
echo "$TDEDIR/share/config/kdesurc:"
echo "[super-user-command]"
echo "super-user-command=sudo"
}

@ -22,12 +22,14 @@ md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
build() {
cd ${srcdir}/PyQt-x11-gpl-${pkgver}
[ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
[ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
msg "Starting configure..."
. /etc/profile.d/qt3.sh
export QMAKESPEC="/opt/qt/mkspecs/default"
echo yes | python2.7 configure.py -q /opt/qt/
echo yes | python2.7 configure.py -q ${QTDIR}
msg "Building ${pkgname}..."
make

@ -14,14 +14,13 @@ makedepends=('pkgconfig' 'cmake')
conflicts=('kdemod3-tqtinterface')
makeopts=('libtool' '!emptydirs')
source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz'
'tqtpc-location.patch')
'tqtpc-location.patch' 'trinity.profile.sh' 'trinity.profile.csh')
md5sums=('d54cc9fd0b35555298efd17c32471a2b'
'c15745c944d98cb7c4cb553f0ca421d4')
'c15745c944d98cb7c4cb553f0ca421d4'
'72c6c4fb492c1f4b4741fad1dd70d62f'
'915e14c6264a6b9c46a6a20b16cdcd06')
install='trinity-tqtinterface.install'
# istead of using prefix, we will use QTDIR from qt3 profile
_prefix=/opt/trinity
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
# Source the QT and KDE profile
@ -34,7 +33,7 @@ build() {
msg "Starting cmake..."
cmake "../dependencies/tqtinterface" \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DCMAKE_INSTALL_PREFIX=/opt/trinity \
-DQT_PREFIX_DIR=${QTDIR} \
-DQT_INCLUDE_DIR=${QTDIR}/include \
-DMOC_EXECUTABLE=${QTDIR}/bin/moc \
@ -56,4 +55,21 @@ package() {
#mkdir -p ${pkgdir}/usr/bin
#cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
# it should contain sripts which would add
# their location into system variables
# this mean that this package should provide
# /etc/ld.so.conf.d/trinity.conf - lib locations for linker
# /etc/profile.d/trinity.sh - $PATH and other system variables for bash
# /etc/profile.d/trinity.csh - $PATH and other system variables for csh
# up until now it was done in the kdelibs PKGBUILD/package
# Create and install ld.so.conf.d file
install -d -m755 $pkgdir/etc/ld.so.conf.d/
echo $TDEDIR/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
echo $TDEDIR/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
# Install profiles
install -D -m755 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh
install -D -m755 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh
}

Loading…
Cancel
Save