From 9d04d9512f3df15897d95a0cbc733c824f870def Mon Sep 17 00:00:00 2001 From: phil Date: Mon, 19 Jul 2010 10:43:16 +0000 Subject: [PATCH] update koffice and networkmanagement --- build.sh | 0 koffice-l10n/PKGBUILD | 166 +++++++++++++-------------- koffice/PKGBUILD | 12 +- tools-pkg-networkmanagement/PKGBUILD | 2 +- 4 files changed, 87 insertions(+), 93 deletions(-) mode change 100644 => 100755 build.sh diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/koffice-l10n/PKGBUILD b/koffice-l10n/PKGBUILD index 26566eaf4..42f25ff1b 100644 --- a/koffice-l10n/PKGBUILD +++ b/koffice-l10n/PKGBUILD @@ -9,30 +9,30 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgbase=koffice-l10n pkgname=('koffice-l10n-ca' - 'koffice-l10n-ca@valencia' - 'koffice-l10n-da' - 'koffice-l10n-de' - 'koffice-l10n-el' - 'koffice-l10n-en_gb' - 'koffice-l10n-es' - 'koffice-l10n-et' -# 'koffice-l10n-fr' # TODO: broken, needs compilation fix - 'koffice-l10n-gl' - 'koffice-l10n-it' - 'koffice-l10n-ja' - 'koffice-l10n-kk' - 'koffice-l10n-nb' - 'koffice-l10n-nds' - 'koffice-l10n-nl' - 'koffice-l10n-pl' - 'koffice-l10n-pt' - 'koffice-l10n-pt_br' - 'koffice-l10n-sv' - 'koffice-l10n-tr' - 'koffice-l10n-uk' - 'koffice-l10n-zh_cn' - 'koffice-l10n-zh_tw') -pkgver=2.2.0 + 'koffice-l10n-ca@valencia' + 'koffice-l10n-da' + 'koffice-l10n-de' + 'koffice-l10n-el' + 'koffice-l10n-en_gb' + 'koffice-l10n-es' + 'koffice-l10n-et' + 'koffice-l10n-fr' + 'koffice-l10n-gl' + 'koffice-l10n-it' + 'koffice-l10n-ja' + 'koffice-l10n-kk' + 'koffice-l10n-nb' + 'koffice-l10n-nds' + 'koffice-l10n-nl' + 'koffice-l10n-pl' + 'koffice-l10n-pt' + 'koffice-l10n-pt_br' + 'koffice-l10n-sv' + 'koffice-l10n-tr' + 'koffice-l10n-uk' + 'koffice-l10n-zh_cn' + 'koffice-l10n-zh_tw') +pkgver=2.2.1 pkgrel=1 arch=('any') url='http://www.koffice.org' @@ -41,53 +41,53 @@ groups=('koffice-l10n') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs') options=('docs') source=("http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-ca-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-ca@valencia-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-da-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-de-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-el-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-en_GB-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-es-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-et-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-fr-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-gl-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-it-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-ja-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-kk-${pkgver}.tar.bz2" - "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}-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}-zh_CN-${pkgver}.tar.bz2" - "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-zh_TW-${pkgver}.tar.bz2") -sha1sums=('bb9e4bf10f6331bb80eb61ad03129fa52370af5b' - '3a9a4e4044452e6d90a9e383c3111b566ff7626c' - '4828daa8e1b1e16a47223ead6e18a4d2ec4ed22a' - 'eb81ff9c17f4ea2a622ad68700f2e8cff77480f8' - 'fab553e0abd32ccafdb3fc690352b10b40839e5f' - '7d378651978ede8a31556801f4ab1c385cd626ec' - 'b81baedb23eb734a3a057ddd85f1a1285ca2f101' - '9c8c0c935c0655ca2951dbe197e1144e42cf360e' - '1325233711e9b06363e6e6d80af2a0a99b8be747' - 'db40e4eebf6e5c6965d018f068ffa38e661ad3cd' - 'c29617af8f742c1e72438ce32bebfeda3c25b4fd' - '90dc239cd27a1eaec79eb285e5dc7b44c5df15f7' - '9c5db0b2a9fd674deb25dbdec38498e725b2e4c7' - 'd01d06f9e2188cc50c7a1d8e40892d738ce85dd1' - '5e46dad0d52382fba363904a61cb9f97d3b48ac6' - '9958b86722bcd223c86d7bb661d37395ca557704' - '3e1890aac13519c5d20c251f8460fdb81c677241' - '4c17b7a62cdd53bf937b88f2ce04487db50b5842' - '96ac17c57ea3946bc6c01aeb2f91b2e2f98f5c98' - 'e585846e54e51f7a9b9e5545f087cf929405d112' - '7b3018c3797086a01eac9f81d7f996d0c7b8afc6' - 'c39c02cb01197350e4006eef3b2ff25b19c8645e' - 'ae5715105c37918ac17cec90fd63f89f9789b594' - '648b250132d52966f8143beecd7cdbf525986f4d') + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-ca@valencia-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-da-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-de-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-el-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-en_GB-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-es-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-et-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-fr-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-gl-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-it-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-ja-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-kk-${pkgver}.tar.bz2" + "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}-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}-zh_CN-${pkgver}.tar.bz2" + "http://download.kde.org/stable/koffice-${pkgver}/koffice-l10n/${pkgbase}-zh_TW-${pkgver}.tar.bz2") +sha1sums=('d58d4f62f8d84527eea960f15b38e86afe9d877b' + '54f10a15cdbd59ccb8f1bc21236248012f142ab3' + '11b9d60b515d122148246fe6b98371ccd9cedb56' + 'f73286a52c76ed9dc4e2876a0b8f356bea94f43e' + '80d762adfd5d8dfe494372df74f144dc405ac116' + '41503b00e5dffc66f8f62b06b5f3eeeb78889c75' + 'b05f102caf11fb114a072cdcf3bc5a8554525c92' + '9df08ccf55d25627c26be32aa5eb55a03bbfb5d9' + 'f32783826fe5b1e42ab13dbaf8a6604901b4dd87' + 'c9dd80dc1ad46fa86916319e15a373aa9bfe48be' + '17604ad98ca1b93bb55cf1ff25cb1fe0dafc3aff' + '7b6da800f719add7bf4d1f35b1e2964f4ee1586a' + 'b8d6a55bf1931e079a923114e637f0e12a80fb43' + 'bd95eb44179090cd8fa4c3b467149a41f9ee5ec0' + '3aa551022a6d1900e128dada2cb7bc6fb945893a' + '189e4a4574df6e8ee794812ea7582a94293b7bce' + 'b4bede6b6ccde8a17280a0c035c52f0f07ea3014' + 'a4a7390c8e15720f449341bbc9aafa1e9383bdf4' + '79b40692d2c1fe336c1738562198f16971a2b560' + '401ed4a5c5a34ef145f9e8a7d608ab25a9d46c32' + '0c7e8be03d9c512da0773f8093ce7e03815c7168' + 'c930c5cbbbc25dcc835f36fc5535a853db9f1eba' + '69b317db025fea5c69129694533338e44dd19cc6' + '3fa80fa606dac4d01024b4fe2665f236ee1bba8d') build() { cd $srcdir @@ -156,13 +156,13 @@ build() { make || return 1 cd ../.. -# install -d build/fr -# cd build/fr -# cmake ${srcdir}/koffice-l10n-fr-${pkgver} \ -# -DCMAKE_BUILD_TYPE=Release \ -# -DCMAKE_INSTALL_PREFIX=/usr -# make || return 1 -# cd ../.. + install -d build/fr + cd build/fr + cmake ${srcdir}/koffice-l10n-fr-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make || return 1 + cd ../.. install -d build/gl cd build/gl @@ -328,11 +328,11 @@ package_koffice-l10n-et() { cd $srcdir/build/et make DESTDIR=$pkgdir install } -#package_koffice-l10n-fr() { -# pkgdesc=('French Localization for Koffice') -# cd $srcdir/build/fr -# make DESTDIR=$pkgdir install -#} +package_koffice-l10n-fr() { + pkgdesc=('French Localization for Koffice') + cd $srcdir/build/fr + make DESTDIR=$pkgdir install +} package_koffice-l10n-gl() { pkgdesc=('Galician Localization for Koffice') cd $srcdir/build/gl diff --git a/koffice/PKGBUILD b/koffice/PKGBUILD index db83a53a8..36337d2b6 100644 --- a/koffice/PKGBUILD +++ b/koffice/PKGBUILD @@ -21,8 +21,8 @@ pkgname=('koffice-common' 'koffice-krita' 'koffice-doc') -pkgver=2.2.0 -pkgrel=3 +pkgver=2.2.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -32,15 +32,9 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen' \ 'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'openexr' 'kdegraphics-common' 'sqlite3') # 'opengtl' groups=('koffice') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('274623699eb666730a0c8d92f81fb99680217345') +sha1sums=('294c9828cb5eb87392aa87e56e2b0f2700b8b66d') build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - # buildtime patch -# patch -Np0 -i ${srcdir}/libpng14.patch || return 1 -# patch -Np0 -i ${srcdir}/koffice-gcc45.patch || return 1 - cd ${srcdir} mkdir build cd build diff --git a/tools-pkg-networkmanagement/PKGBUILD b/tools-pkg-networkmanagement/PKGBUILD index 0aab10c52..672ec002b 100644 --- a/tools-pkg-networkmanagement/PKGBUILD +++ b/tools-pkg-networkmanagement/PKGBUILD @@ -14,7 +14,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=('networkmanagement') arch=('i686' 'x86_64') -pkgver=1137272 +pkgver=1151385 #pkgver=1030904 # stable snapshot pkgrel=1