diff options
| author | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2012-01-04 22:25:28 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2012-01-04 22:25:28 +0100 |
| commit | 91f94182d5d99eb94d13b5fd592246a615d81f36 (patch) | |
| tree | e6c4f082209932fba8d942f230a199b051b2d3d7 | |
| parent | f072282cda74c0e4e5e4432499427e6f76b53f92 (diff) | |
| download | tde-packaging-91f94182.tar.gz tde-packaging-91f94182.zip | |
kdelibs, qt3: dependency fixes
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 24 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 10 |
2 files changed, 25 insertions, 9 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index f14011629..acafc86b2 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -1,15 +1,16 @@ # Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com> pkgname=trinity-kdelibs pkgver=3513 -pkgrel=3 +pkgrel=4 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' 'jre7-openjdk') -makedepends=('pkgconfig' 'cmake' 'autoconf' ) +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') +makedepends=('pkgconfig' 'cmake') provides=('trinity-kdelibs' 'kdelibs3') conflicts=('trinity-kdelibs' 'kdelibs3') replaces=('trinity-kdelibs') @@ -46,7 +47,22 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdelibs \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DCMAKE_VERBOSE_MAKEFILE=OFF + -DCMAKE_VERBOSE_MAKEFILE=OFF \ + -DWITH_ARTS=ON \ + -DWITH_ALSA=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBIDN=ON \ + -DWITH_SSL=ON \ + -DWITH_CUPS=ON \ + -DWITH_LUA=OFF \ + -DWITH_TIFF=ON \ + -DWITH_JASPER=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_UTEMPTER=OFF \ + -DWITH_AVAHI=ON \ + -DWITH_ASPELL=ON \ + -DWITH_HSPELL=ON + # Not needed, CMake returns that those were not used # -DQT_VERSION=3 \ # -DWITH_QT3=ON \ diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index 74bf99169..0f803979d 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -2,15 +2,14 @@ pkgname=trinity-qt3 pkgver=3884 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://trinitydesktop.org" license=('GPL') groups=('trinity-base') pkgdesc="The Qt3 gui toolkit - with Trinity upstream" -depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu' 'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs' 'unixodbc') +depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu' 'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs') makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3') -# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') provides=('trinity-qt3' 'qt3') conflicts=('qt3' 'qt3-enhanced') replaces=('trinity-qt3') @@ -38,16 +37,17 @@ build() { rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} + # auto license acceptance + sed -i "s|read acceptance|acceptance=yes|" configure + msg "Starting configure..." #make -C qmake || return 1 ./configure \ -prefix ${_prefix} \ - -fast \ -sysconfdir /etc/qt \ -thread \ -shared \ -system-zlib \ - -platform linux-g++$ARCH \ -system-lib{png,jpeg,mng} \ -qt-gif \ -cups |