Tue Aug 21 00:02:33 UTC 2012

2 files changed, 22 insertions, 22 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 099f64e0c..423774ecc 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163246 2012-07-11 20:12:36Z andyrtr $
+# $Id: PKGBUILD 165429 2012-08-19 07:58:11Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -24,15 +24,15 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
-_LOver=3.5.5.3
-pkgver=3.5.5
+_LOver=3.5.6.2
+pkgver=3.5.6
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' # 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.20.1' 'kdelibs' 'gconf' 'cppunit'
+             'apache-ant' 'gperf' 'poppler>=0.20.3' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs'
               #'saxon' - currently broken 
@@ -52,7 +52,7 @@ _additional_source_url="http://dev-www.libreoffice.org/src"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
+	${_additional_source_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -83,7 +83,7 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
 	fix_broken_hebrew_wordwrapping.diff
 	libreoffice-common.sh libreoffice-common.csh)
-noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
+noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -112,12 +112,12 @@ noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
 	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('ccb80344ae1ac546b3a6b6d85f3ae26a'
-         '09153713133bddc49af99bd76129e929'
-         'c2e66522b8adf0b3fb5789e295129ba9'
+md5sums=('f8bfdb449dd6748d99b1f23a5702e5a1'
+         'ecf485e13adfe8d5d4428b68787d390f'
+         '41696d482cb90db0acb6c45acd9047ea'
          '18f577b374d60b3c760a3a3350407632'
          'f02578f5218f217a9f20e9c30e119c6a'
-         'a9a1db27688bad49418667b434d29c1f'
+         '94e7f271e38c976462558b4278590178'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -508,7 +508,7 @@ package_libreoffice-kde4() {
 }
 
 package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
+ pkgdesc="Equation Editor Application for LibreOffice."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -579,7 +579,7 @@ package_libreoffice-sdk-doc() {
 }
 
 package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
+ pkgdesc="Word Processor Application for LibreOffice."
  install=libreoffice-writer.install
  depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
  optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
diff --git a/extra/libreoffice/PKGBUILD.36 b/extra/libreoffice/PKGBUILD.36
index b5dc0bee1..71ee72c1c 100644
--- a/extra/libreoffice/PKGBUILD.36
+++ b/extra/libreoffice/PKGBUILD.36
@@ -24,14 +24,14 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
-_LOver=3.6.0.0.beta3
-pkgver=3.6.0beta3
+_LOver=3.6.0.4
+pkgver=3.6.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
+             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost'
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
@@ -46,8 +46,8 @@ makedepends=( # makedepends
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
 
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
 _additional_source_url="http://dev-www.libreoffice.org/src"
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
@@ -113,9 +113,9 @@ noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('2f471473f405a373e8d9ca5870d3861d'
-         '0db44b0cc908fe4288d40d3869137d76'
-         '4b2f46f015c1112f9b65f9ed8ba409b6'
+md5sums=('67cf97e86c75363238a371f64ef5f606'
+         '8422b0c4c797abeefed3ee4490586dd2'
+         '6cc8fa86be8c657ba23434c6c8d99416'
          '18f577b374d60b3c760a3a3350407632'
          'f02578f5218f217a9f20e9c30e119c6a'
          'a9a1db27688bad49418667b434d29c1f'
@@ -505,7 +505,7 @@ package_libreoffice-kde4() {
 }
 
 package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
+ pkgdesc="Equation Editor Application for LibreOffice."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -576,7 +576,7 @@ package_libreoffice-sdk-doc() {
 }
 
 package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
+ pkgdesc="Word Processor Application for LibreOffice."
  install=libreoffice-writer.install
  depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
  optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')