diff options
Diffstat (limited to 'arch/3.5.13/trinity-base/trinity-kdelibs')
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 46 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch | 36 |
2 files changed, 69 insertions, 13 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index ffb2108b0..acafc86b2 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -1,23 +1,24 @@ # Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com> pkgname=trinity-kdelibs pkgver=3513 -pkgrel=2 +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') -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') options=('libtool' '!strip' '!makeflags') -#source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'trinity.sh') -source=('http://anduin.linuxfromscratch.org/sources/trinity/kdelibs-3.5.13.tar.gz' 'trinity.sh') +source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'trinity.sh' 'docpath.patch') md5sums=('f62eefb63b4ba2141b4c576f859806dd' - '2de1886d632c8bc288befada5e1bc3b5') + '2de1886d632c8bc288befada5e1bc3b5' + 'd20badec5a1a7f01f0c957db8b9b8def') _builddir=build _prefix="/opt/trinity" @@ -35,6 +36,9 @@ build() { 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 + msg "Patching..." + patch -N -d ${srcdir} -p0 < ${srcdir}/docpath.patch + cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/${_builddir}" mkdir -p ${_builddir} @@ -44,12 +48,28 @@ build() { cmake ${srcdir}/kdelibs \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=OFF \ - -DQT_VERSION=3 \ - -DWITH_QT3=ON \ - -DQTDIR=${QTDIR} \ - -DQT_LIBRARY_DIRS=${QTDIR}/lib \ - -DWITH_PAM=ON \ - -DBUILD_ALL=ON + -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 \ +# -DQTDIR=${QTDIR} \ +# -DQT_LIBRARY_DIRS=${QTDIR}/lib \ +# -DWITH_PAM=ON \ +# -DBUILD_ALL=ON msg "Building - $pkgname..." make @@ -65,7 +85,7 @@ package() { echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf install -d -m755 ${pkgdir}/etc/profile.d/ - install -m644 ${startdir}/trinity.sh ${pkgdir}/etc/profile.d/ + install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/ # rm -r ${srcdir}/${_svnmod} } diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch b/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch new file mode 100644 index 000000000..aeb5e95f1 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch @@ -0,0 +1,36 @@ +diff -r -u kdelibs/admin/debianrules src/kdelibs/admin/debianrules +--- kdelibs/admin/debianrules 2011-08-21 06:15:36.000000000 +0200 ++++ src/kdelibs/admin/debianrules 2012-01-04 15:28:20.000000000 +0100 +@@ -16,7 +16,7 @@ + + $kde_cgidir = "$kde_prefix/lib/cgi-bin"; + $kde_confdir = "$sysconfdir/trinity"; +-$kde_htmldir = "$kde_prefix/share/doc/kde/HTML"; ++$kde_htmldir = "$kde_prefix/share/doc/HTML"; + + if (defined $ENV{DEB_BUILD_OPTIONS} && + $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) { +diff -r -u kdelibs/cmake/modules/TDESetupPaths.cmake src/kdelibs/cmake/modules/TDESetupPaths.cmake +--- kdelibs/cmake/modules/TDESetupPaths.cmake 2011-08-21 06:15:37.000000000 +0200 ++++ src/kdelibs/cmake/modules/TDESetupPaths.cmake 2012-01-04 15:28:49.000000000 +0100 +@@ -41,7 +41,7 @@ + _tde_internal_setup_path( PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity" "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" ) + _tde_internal_setup_path( CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" "The config file install dir" ) + _tde_internal_setup_path( DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" "The parent directory where applications can install their data" ) +- _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/kde/HTML" "The HTML install dir for documentation" ) ++ _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML" "The HTML install dir for documentation" ) + _tde_internal_setup_path( ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" ) + _tde_internal_setup_path( KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for kconfig files" ) + _tde_internal_setup_path( LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "The install dir for translations" ) +diff -r -u kdelibs/kdecore/kstandarddirs.cpp src/kdelibs/kdecore/kstandarddirs.cpp +--- kdelibs/kdecore/kstandarddirs.cpp 2011-08-21 06:15:32.000000000 +0200 ++++ src/kdelibs/kdecore/kstandarddirs.cpp 2012-01-04 15:30:24.000000000 +0100 +@@ -1030,7 +1030,7 @@ + if (!strcmp(type, "html-bundle")) + return "share/doc-bundle/HTML/"; + if (!strcmp(type, "html")) +- return "share/doc/kde/HTML/"; ++ return "share/doc/HTML/"; + if (!strcmp(type, "icon")) + return "share/icons/"; + if (!strcmp(type, "config")) |