From 1a648f57e966d1434060f9b70c3cf69b0aa3cdb4 Mon Sep 17 00:00:00 2001 From: philm Date: Sun, 2 Jan 2011 21:50:48 +0100 Subject: [PATCH] update koffice to 2.3.0 - without kchart for the moment --- koffice-l10n/PKGBUILD | 82 +++++++++++++------------------------------ koffice/PKGBUILD | 24 +++++++------ 2 files changed, 39 insertions(+), 67 deletions(-) diff --git a/koffice-l10n/PKGBUILD b/koffice-l10n/PKGBUILD index 714cf70ad..93f215edd 100644 --- a/koffice-l10n/PKGBUILD +++ b/koffice-l10n/PKGBUILD @@ -24,17 +24,15 @@ pkgname=('koffice-l10n-ca' 'koffice-l10n-nb' 'koffice-l10n-nds' 'koffice-l10n-nl' - 'koffice-l10n-pl' 'koffice-l10n-pt' 'koffice-l10n-pt_br' 'koffice-l10n-ru' 'koffice-l10n-sv' 'koffice-l10n-tr' 'koffice-l10n-uk' - 'koffice-l10n-wa' 'koffice-l10n-zh_cn' 'koffice-l10n-zh_tw') -pkgver=2.2.2 +pkgver=2.3.0 pkgrel=1 arch=('any') url='http://www.koffice.org' @@ -58,43 +56,39 @@ source=("http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-nb-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-nds-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-nl-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-pl-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-pt-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-pt_BR-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-ru-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-sv-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-tr-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-uk-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-wa-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-zh_CN-${pkgver}.tar.bz2" "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-zh_TW-${pkgver}.tar.bz2") -md5sums=('142d0626eac29c19a1d2b66dfc0ded16' # koffice-l10n-ca-2.2.2.tar.bz2 - '636d71a0cf615287456ec5846e07db39' # koffice-l10n-ca@valencia-2.2.2.tar.bz2 - '0cd6ff9e2bddf4306c316150e015fc6f' # koffice-l10n-da-2.2.2.tar.bz2 - '15d340247b23fe6aad767ab94713b4a0' # koffice-l10n-de-2.2.2.tar.bz2 - 'c08c1066cef43ce670ac66e001b4ea18' # koffice-l10n-el-2.2.2.tar.bz2 - 'e989a0ed9b17d7e8dc1fd6dbc5c26835' # koffice-l10n-en_GB-2.2.2.tar.bz2 - '5a278bd75486c6c796d9ed4097ca371b' # koffice-l10n-es-2.2.2.tar.bz2 - '47ad097296ef143cc6a9ae0a538e01c4' # koffice-l10n-et-2.2.2.tar.bz2 - '25242975ae4d8575fec807665ee3da06' # koffice-l10n-fr-2.2.2.tar.bz2 - 'c948cd9b86a91ab97c5b2ce13133e582' # koffice-l10n-gl-2.2.2.tar.bz2 - 'b25740e9670b8156ca71a168721e3783' # koffice-l10n-it-2.2.2.tar.bz2 - '9aad40953bf537c8a9761163e630eca1' # koffice-l10n-ja-2.2.2.tar.bz2 - '6dd6e292fa51e122c7c32bef0d536c60' # koffice-l10n-kk-2.2.2.tar.bz2 - '72cb65e00a0aba8224cffffb9c73850c' # koffice-l10n-nb-2.2.2.tar.bz2 - 'abeda39cb2130e44c0b1efd4b9c8bf03' # koffice-l10n-nds-2.2.2.tar.bz2 - 'c7c693ce2101d22b9fbb35d844dbfef7' # koffice-l10n-nl-2.2.2.tar.bz2 - '04d3e186bfe74a7bbb2e96e4079435c5' # koffice-l10n-pl-2.2.2.tar.bz2 - '0dd7eb1b88030978c1e165cc713a72d3' # koffice-l10n-pt-2.2.2.tar.bz2 - '54817bbbea7f541f2983243a45ade2b1' # koffice-l10n-pt_BR-2.2.2.tar.bz2 - 'd9e07a3fb20c527b450177b81fc43269' # koffice-l10n-ru-2.2.2.tar.bz2 - '79c1cc4b5ddba4952c9f21c561978b51' # koffice-l10n-sv-2.2.2.tar.bz2 - 'd452c050e888f9590b73561f72bc4255' # koffice-l10n-tr-2.2.2.tar.bz2 - 'fd11c70ce44c9ba70bb19ab722fac4f1' # koffice-l10n-uk-2.2.2.tar.bz2 - '24bba80d7138d4b5d3f7464ac549c13e' # koffice-l10n-wa-2.2.2.tar.bz2 - '52a81ed273b4bf7d7d9fb71d4dc91b0d' # koffice-l10n-zh_CN-2.2.2.tar.bz2 - 'b548b78c30653d4efda8dfe842f48a24') # koffice-l10n-zh_TW-2.2.2.tar.bz2) +md5sums=('bdf2eb94055f51ebe4a59c58fb8fefc2' # koffice-l10n-ca-2.3.0.tar.bz2 + '22d62f8bae72dd0245421d8174545b85' # koffice-l10n-ca@valencia-2.3.0.tar.bz2 + 'ae6ae9ef63b0e52e0dc1813a87506890' # koffice-l10n-da-2.3.0.tar.bz2 + '3554bb5887af3af71166ce027637273e' # koffice-l10n-de-2.3.0.tar.bz2 + '4d7dc252a659a9fe3da59590fcb05ac8' # koffice-l10n-el-2.3.0.tar.bz2 + 'd08426e1591675831a338e2bd54be10b' # koffice-l10n-en_GB-2.3.0.tar.bz2 + 'f7ebe904ae522716dae85f117f5d08af' # koffice-l10n-es-2.3.0.tar.bz2 + '8b32e4620dc3f314dd9ca57c22856e6c' # koffice-l10n-et-2.3.0.tar.bz2 + 'f1df28bed38e9cdb5366e18e16f094f0' # koffice-l10n-fr-2.3.0.tar.bz2 + '7c5d43cf75eb2216bf124886d3f60d26' # koffice-l10n-gl-2.3.0.tar.bz2 + '4871c3c1fb2658f643f743daa6dfab81' # koffice-l10n-it-2.3.0.tar.bz2 + '21309edfc75a9be6500de31e40c36c36' # koffice-l10n-ja-2.3.0.tar.bz2 + '0c170c2c0c91eb329d153a297d8dd6e2' # koffice-l10n-kk-2.3.0.tar.bz2 + '876e81adaf70b8627b2aa0963bc85f61' # koffice-l10n-nb-2.3.0.tar.bz2 + '5d5654f8744df637f9c5defb477191d4' # koffice-l10n-nds-2.3.0.tar.bz2 + '631c3a748caa1bcf9eec72d96733e82f' # koffice-l10n-nl-2.3.0.tar.bz2 + '9ad09a3b7d07ec17071da57647cbd751' # koffice-l10n-pt-2.3.0.tar.bz2 + '0af6e5efaf7d8303ded3950e6c901d7d' # koffice-l10n-pt_BR-2.3.0.tar.bz2 + '339429f52277c7b16cb47a5fba2a0332' # koffice-l10n-ru-2.3.0.tar.bz2 + '86c409e03ef996ea533d5ab32bebda19' # koffice-l10n-sv-2.3.0.tar.bz2 + '6ef89202523607122e4679dd6c748296' # koffice-l10n-tr-2.3.0.tar.bz2 + '9e0b77d44a396a135366fc8a4938d6d6' # koffice-l10n-uk-2.3.0.tar.bz2 + '1ac692eea52fd74bc4f0761947b71770' # koffice-l10n-zh_CN-2.3.0.tar.bz2 + '47e58533f2ab1a4c4a674748087dd919') # koffice-l10n-zh_TW-2.3.0.tar.bz2 build() { cd $srcdir @@ -227,14 +221,6 @@ build() { make || return 1 cd ../.. - install -d build/pl - cd build/pl - cmake ${srcdir}/koffice-l10n-pl-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 - cd ../.. - install -d build/pt cd build/pt cmake ${srcdir}/koffice-l10n-pt-${pkgver} \ @@ -283,14 +269,6 @@ build() { make || return 1 cd ../.. - install -d build/wa - cd build/wa - cmake ${srcdir}/koffice-l10n-wa-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 - cd ../.. - install -d build/zh_CN cd build/zh_CN cmake ${srcdir}/koffice-l10n-zh_CN-${pkgver} \ @@ -391,11 +369,6 @@ package_koffice-l10n-nl() { cd $srcdir/build/nl make DESTDIR=$pkgdir install } -package_koffice-l10n-pl() { - pkgdesc=('Polish Localization for Koffice') - cd $srcdir/build/pl - make DESTDIR=$pkgdir install -} package_koffice-l10n-pt() { pkgdesc=('Portugese Localization for Koffice') cd $srcdir/build/pt @@ -426,11 +399,6 @@ package_koffice-l10n-uk() { cd $srcdir/build/uk make DESTDIR=$pkgdir install } -package_koffice-l10n-wa() { - pkgdesc=('Wallonian Localization for Koffice') - cd $srcdir/build/wa - make DESTDIR=$pkgdir install -} package_koffice-l10n-zh_cn() { pkgdesc=('Simplified Chinese Localization for Koffice') cd $srcdir/build/zh_CN diff --git a/koffice/PKGBUILD b/koffice/PKGBUILD index e80756895..97ffc6c23 100644 --- a/koffice/PKGBUILD +++ b/koffice/PKGBUILD @@ -15,27 +15,29 @@ pkgname=('koffice-common' 'koffice-kexi' 'koffice-kplato' 'koffice-kword' - 'koffice-kchart' +# 'koffice-kchart' hopefully fixed in 2.3.1 'koffice-kformula' 'koffice-kpresenter' 'koffice-krita' 'koffice-doc') -pkgver=2.2.2 +pkgver=2.3.0 pkgrel=1 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') depends=('fftw') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen' \ - 'kdelibs' 'gsl' 'qca' 'lcms' 'glew' 'qimageblitz' 'libgsf' \ - 'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'openexr' 'kdegraphics-common' 'sqlite3') # 'opengtl' +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen' 'lcms' \ + 'kdelibs' 'gsl' 'qca' 'glew' 'qimageblitz' 'libgsf' 'libspnav' \ + 'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'libwpg' 'openexr' \ + 'kdegraphics-common' 'sqlite3' 'libpqxx' 'create-resources' 'freetds') # 'opengtl' groups=('koffice') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('f987ef488888311db04f313ef2c1ed74') +md5sums=('4f99a44b004e4a237890e0834a09964b') build() { cd ${srcdir} + mkdir -p build cd build cmake ../${pkgbase}-${pkgver} \ @@ -47,7 +49,8 @@ build() { package_koffice-common(){ pkgdesc="Common files for the KDE office suite" - depends=('kdelibs' 'kdepimlibs' 'qca' 'lcms' 'libgsf') + depends=('kdelibs' 'kdepimlibs' 'qca' 'libgsf' 'create-resources' 'libspnav' \ + 'libwpd' 'libwpg' 'lcms') groups=("kde-complete" "${pkgbase}" "kde-uninstall") splitdirs="interfaces plugins servicetypes libs templates filters pics tools" @@ -64,7 +67,7 @@ package_koffice-doc() conflicts=("kdemod-${pkgbase}-doc") groups=("kde-complete" "${pkgbase}" "kde-doc" "kde-uninstall") - splitdirs="karbon kchart kexi kformula koffice kpresenter kspread thesaurus" + splitdirs="karbon kexi kformula koffice kpresenter kspread thesaurus" # kchart for i in ${splitdirs} ; do cd ${srcdir}/build/doc/${i} make DESTDIR=${pkgdir} install || return 1 @@ -73,7 +76,8 @@ package_koffice-doc() package_koffice-kexi(){ pkgdesc="Integrated data management application for the KDE office suite" - depends=('kdelibs' 'koffice-common' 'koffice-kspread' 'sqlite3') + depends=('kdelibs' 'koffice-common' 'koffice-kspread' 'sqlite3' 'libpqxx' \ + 'freetds') cd ${srcdir}/build/kexi make DESTDIR=${pkgdir} install } @@ -88,7 +92,7 @@ package_koffice-kounavail(){ package_koffice-kspread(){ pkgdesc="Spreadsheet application for KDE" - depends=('hicolor-icon-theme' 'gsl' 'koffice-common' 'koffice-kchart') + depends=('hicolor-icon-theme' 'gsl' 'koffice-common') # 'koffice-kchart' groups=("kde-complete" "${pkgbase}" "kde-uninstall") install=koffice.install cd ${srcdir}/build/kspread