summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel "l0ner" Soltys <pwslts@gmail.com>2012-01-29 15:53:36 +0100
committerPawel "l0ner" Soltys <pwslts@gmail.com>2012-01-29 15:53:36 +0100
commit38c332ae5fea44df57acd61fe3685417febcee0c (patch)
tree14ab7476316993d56dda4bc4bdafeed1dbef9690
parentcfe088850f2739b74a5b3ab2968b46c123fa7f31 (diff)
downloadtde-packaging-38c332ae5fea44df57acd61fe3685417febcee0c.tar.gz
tde-packaging-38c332ae5fea44df57acd61fe3685417febcee0c.zip
kdelibs: removed profile.d file installation, minor fixes
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD22
1 files changed, 12 insertions, 10 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
index 052575fa5..f84063545 100644
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
@@ -9,11 +9,9 @@ url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity DE core libraries"
-depends=('trinity-arts' 'trinity-tqtinterface'
- 'libxslt' 'libidn'
+depends=('trinity-arts'
+ 'libxslt' 'libidn' 'libart-lgpl' 'jasper'
'libxcomposite' 'libcups'
- 'libart-lgpl'
- 'jasper'
'openexr' 'aspell' 'hspell')
# taglib
# libical
@@ -22,6 +20,7 @@ depends=('trinity-arts' 'trinity-tqtinterface'
# avahi
# libtiff
# openssl
+ # libutempter - needs to be installed from aur
makedepends=('pkgconfig' 'cmake')
provides=('kdelibs3')
conflicts=('kdemod3-kdelibs' 'kdelibs3')
@@ -38,8 +37,10 @@ _prefix="/opt/trinity"
build() {
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 PATH=$PATH:${_prefix}/bin
#export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/bin
@@ -81,11 +82,12 @@ package() {
cd ${srcdir}/build
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/
- echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-
- install -d -m755 ${pkgdir}/etc/profile.d/
- 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/
}