From 76c1d2202ef3c9140090fecd56bf608dc8c265de Mon Sep 17 00:00:00 2001 From: Pawel 'l0ner' Soltys Date: Sat, 14 Jan 2012 19:50:36 +0100 Subject: [PATCH] kdelibs: removed alsa-lib dep, since it's satisfied by arts - added conflicts (kdemod3-kdelibs) - switched maintainer and contributor - removed trinity-qt3 and triniy-tqtinterface deps, since they are satisfied already by trinity-arts - changed makeopts to !libtool (do not keep libtool files) and strip (strip symbols form binaries and libraries) - removed additional non-PKGBUILD variables - removed unnecessary CMAKE options - removed ${QTDIR}/include/tqt form CMAKE_INCLUDE_PATH, since tqt sits in /usr and is autodetected - removed dependencies reported by namcap as not needed [functionality check needed]: libtiff, openssl, taglib, pam-krb5, libltdl, libical, avahi. --- .../trinity-base/trinity-kdelibs/PKGBUILD | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index acafc86b2..00e0df6a6 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -1,48 +1,57 @@ -# Maintainer: Calvin Morrison -# Contributor: Pawel 'l0ner' Soltys +# Maintainer: Pawel 'l0ner' Soltys +# Contributor: Calvin Morrison pkgname=trinity-kdelibs pkgver=3513 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity DE core libraries" -depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite' 'libcups' 'alsa-lib' 'libart-lgpl' 'libidn' 'openssl' 'libtiff' 'jasper' 'openexr' 'aspell' 'hspell') +depends=('trinity-arts' + 'libxslt' 'libidn' + 'libxcomposite' 'libcups' + 'libart-lgpl' + 'jasper' + 'openexr' 'aspell' 'hspell') + # taglib + # libical + # pam-krb5 + # libltdl + # avahi + # libtiff + # openssl makedepends=('pkgconfig' 'cmake') -provides=('trinity-kdelibs' 'kdelibs3') -conflicts=('trinity-kdelibs' 'kdelibs3') +provides=('kdelibs3') +conflicts=('kdemod3-kdelibs' 'kdelibs3') replaces=('trinity-kdelibs') -options=('libtool' '!strip' '!makeflags') +options=('!libtool' '!makeflags') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'trinity.sh' 'docpath.patch') md5sums=('f62eefb63b4ba2141b4c576f859806dd' '2de1886d632c8bc288befada5e1bc3b5' 'd20badec5a1a7f01f0c957db8b9b8def') -_builddir=build +install='trinity-kdelibs.install' + _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 - export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} - export PATH=$PATH:${_prefix}/bin - export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/bin - export LD_LIBRARY_PATH=${_prefix}/lib:${QTDIR}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH + + #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} + #export PATH=$PATH:${_prefix}/bin + #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/bin + #export LD_LIBRARY_PATH=${_prefix}/lib:${QTDIR}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH msg "Patching..." patch -N -d ${srcdir} -p0 < ${srcdir}/docpath.patch cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" - mkdir -p ${_builddir} - cd ${_builddir} + mkdir -p build + cd build msg "Starting cmake..." cmake ${srcdir}/kdelibs \ @@ -63,14 +72,6 @@ build() { -DWITH_ASPELL=ON \ -DWITH_HSPELL=ON -# Not needed, CMake returns that those were not used -# -DQT_VERSION=3 \ -# -DWITH_QT3=ON \ -# -DQTDIR=${QTDIR} \ -# -DQT_LIBRARY_DIRS=${QTDIR}/lib \ -# -DWITH_PAM=ON \ -# -DBUILD_ALL=ON - msg "Building - $pkgname..." make } @@ -87,5 +88,4 @@ package() { install -d -m755 ${pkgdir}/etc/profile.d/ install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/ - # rm -r ${srcdir}/${_svnmod} }