From 791dde5091677cd6370690f9df9fb7cbdcfe0968 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 18 Oct 2011 23:14:49 +0000 Subject: Tue Oct 18 23:14:48 UTC 2011 --- extra/koffice/PKGBUILD | 50 +++++++++++++++++++++++-------------------- extra/koffice/koffice.install | 1 + extra/koffice/krita.install | 3 ++- 3 files changed, 30 insertions(+), 24 deletions(-) (limited to 'extra/koffice') diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index e901013ce..2425f5077 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139889 2011-10-05 19:06:53Z andrea $ +# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,13 +37,13 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'libkdcraw') + 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons') groups=('koffice') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" 'kde4-koffice-libwpg02.patch' 'gcc46.patch') @@ -55,7 +55,7 @@ build() { cd "${srcdir}/${pkgbase}-${pkgver}" patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" - patch -p1 -i "${srcdir}"/gcc46.patch + patch -p1 -i "${srcdir}"/gcc46.patch cd "${srcdir}" mkdir build @@ -71,9 +71,12 @@ build() { package_koffice-filters(){ pkgdesc="Filters for the KDE office suite" - optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' - 'libkdcraw: support for raw images') + depends=('shared-mime-info') + optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' + 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' + 'libkdcraw: support for raw images' 'poppler: support for pdf' + 'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters' + 'koffice-kplato: Kplato filters') install=filters.install cd "${srcdir}/build/filters" make DESTDIR="${pkgdir}" install @@ -81,14 +84,14 @@ package_koffice-filters(){ package_koffice-interfaces(){ pkgdesc="Interfaces for the KDE office suite" - depends=('kdelibs' 'koffice-libs') + depends=('koffice-libs') cd "${srcdir}/build/interfaces" make DESTDIR="${pkgdir}" install } package_koffice-libs(){ pkgdesc="Libs for the KDE office suite" - depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes') + depends=('kdepimlibs' 'lcms' 'koffice-servicetypes') cd "${srcdir}/build/libs" make DESTDIR="${pkgdir}" install } @@ -104,6 +107,7 @@ package_koffice-plugins(){ package_koffice-pics(){ pkgdesc="Icons for the KDE office suite" + depends=('desktop-file-utils' 'xdg-utils') install=koffice.install cd "${srcdir}/build/pics" make DESTDIR="${pkgdir}" install @@ -123,7 +127,7 @@ package_koffice-templates(){ package_koffice-tools(){ pkgdesc="Tools for the KDE office suite" - depends=('koffice-libs') + depends=('koffice-libs' 'oxygen-icons') cd "${srcdir}/build/tools" make DESTDIR="${pkgdir}" install } @@ -134,7 +138,7 @@ package_koffice-tools(){ package_koffice-karbon(){ pkgdesc="Vector drawing application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') + depends=('koffice-libs' 'koffice-templates' 'oxygen-icons') optdepends=('koffice-filters: import/export filters') install=koffice.install cd "${srcdir}/build/karbon" @@ -149,7 +153,8 @@ package_koffice-karbon-doc(){ package_koffice-kexi(){ pkgdesc="Integrated data management application for the KDE office suite" - depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3') + depends=('koffice-kspread' 'oxygen-icons') + install=koffice.install cd "${srcdir}/build/kexi" make DESTDIR="${pkgdir}" install } @@ -162,7 +167,8 @@ package_koffice-kexi-doc(){ package_koffice-kformula(){ pkgdesc="Formula editor for the KDE office suite" - depends=('kdelibs' 'koffice-libs') + depends=('koffice-libs') + install=koffice.install cd "${srcdir}/build/kformula" make DESTDIR="${pkgdir}" install } @@ -176,15 +182,14 @@ package_koffice-kformula-doc() { package_koffice-kounavail(){ pkgdesc="Kounavail for the KDE office suite" - depends=('kdelibs' 'koffice-libs') + depends=('koffice-libs') cd "${srcdir}/build/kounavail" make DESTDIR="${pkgdir}" install } package_koffice-kplato(){ pkgdesc="Project management application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \ - 'koffice-plugins' 'koffice-kword') + depends=('koffice-kword' 'oxygen-icons') install=koffice.install cd "${srcdir}/build/kplato" make DESTDIR="${pkgdir}" install @@ -198,7 +203,7 @@ package_koffice-kplato(){ package_koffice-kpresenter(){ pkgdesc="Presentation tool for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') + depends=('koffice-libs' 'koffice-templates' 'oxygen-icons') optdepends=('koffice-filters: import/export filters') install=koffice.install cd "${srcdir}/build/kpresenter" @@ -213,10 +218,9 @@ package_koffice-kpresenter-doc(){ package_koffice-krita(){ pkgdesc="Graphics editor for KDE" - depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \ - 'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \ - 'openexr' 'opengtl') - optdepends=('koffice-filters: import/export filters') + depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \ + 'koffice-plugins' 'poppler-qt' 'opengtl') + optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images') install=krita.install cd "${srcdir}/build/krita" make DESTDIR="${pkgdir}" install @@ -231,7 +235,7 @@ package_koffice-krita(){ package_koffice-kspread(){ pkgdesc="Spreadsheet application for KDE" - depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins') + depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons') optdepends=('koffice-filters: import/export filters') install=koffice.install cd "${srcdir}/build/kspread" @@ -246,7 +250,7 @@ package_koffice-kspread-doc(){ package_koffice-kword(){ pkgdesc="Wordprocessor for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \ + depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \ 'koffice-kounavail' 'koffice-plugins') optdepends=('koffice-filters: import/export filters') install=koffice.install diff --git a/extra/koffice/koffice.install b/extra/koffice/koffice.install index e70c054ec..6c87527e2 100644 --- a/extra/koffice/koffice.install +++ b/extra/koffice/koffice.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/extra/koffice/krita.install b/extra/koffice/krita.install index ce5c32e1b..5d458de55 100644 --- a/extra/koffice/krita.install +++ b/extra/koffice/krita.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { @@ -9,4 +10,4 @@ post_upgrade() { post_remove() { post_install -} \ No newline at end of file +} -- cgit v1.2.3-54-g00ecf