kdelibs: removed profile.d file installation, minor fixes

pull/3/head
Pawel "l0ner" Soltys 13 years ago
parent cfe088850f
commit 38c332ae5f

@ -9,11 +9,9 @@ url='http://www.trinitydesktop.org'
license=('GPL') license=('GPL')
groups=('trinity-base') groups=('trinity-base')
pkgdesc="Trinity DE core libraries" pkgdesc="Trinity DE core libraries"
depends=('trinity-arts' 'trinity-tqtinterface' depends=('trinity-arts'
'libxslt' 'libidn' 'libxslt' 'libidn' 'libart-lgpl' 'jasper'
'libxcomposite' 'libcups' 'libxcomposite' 'libcups'
'libart-lgpl'
'jasper'
'openexr' 'aspell' 'hspell') 'openexr' 'aspell' 'hspell')
# taglib # taglib
# libical # libical
@ -22,6 +20,7 @@ depends=('trinity-arts' 'trinity-tqtinterface'
# avahi # avahi
# libtiff # libtiff
# openssl # openssl
# libutempter - needs to be installed from aur
makedepends=('pkgconfig' 'cmake') makedepends=('pkgconfig' 'cmake')
provides=('kdelibs3') provides=('kdelibs3')
conflicts=('kdemod3-kdelibs' 'kdelibs3') conflicts=('kdemod3-kdelibs' 'kdelibs3')
@ -38,8 +37,10 @@ _prefix="/opt/trinity"
build() { build() {
msg "Setting PATH, CMAKE and Trinity Environment variables" msg "Setting PATH, CMAKE and Trinity Environment variables"
. /etc/profile.d/qt3.sh . /etc/profile.d/qt3.sh
. /etc/profile.d/trinity.sh
# compiles without exporting this, since we have profiles
#export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
#export PATH=$PATH:${_prefix}/bin #export PATH=$PATH:${_prefix}/bin
#export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/bin #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/bin
@ -81,11 +82,12 @@ package() {
cd ${srcdir}/build cd ${srcdir}/build
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
# we do this in arts package
#install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
#echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ #install -d -m755 ${pkgdir}/etc/profile.d/
echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf #install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/
install -d -m755 ${pkgdir}/etc/profile.d/
install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/
} }

Loading…
Cancel
Save