Thu Sep 1 23:14:36 UTC 2011

2 files changed, 84 insertions, 88 deletions

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index ebcbdab57..9898d443e 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 134623 2011-08-06 17:29:22Z andyrtr $
+# $Id: PKGBUILD 136687 2011-08-31 14:13:29Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -35,9 +35,9 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.2.3
-pkgver=3.4.2
-pkgrel=2
+_LOver=3.4.3.2
+pkgver=3.4.3
+pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -58,6 +58,7 @@ makedepends=( # makedepends
 	     # translate-toolkit - todo move them to extra to allow --with-system-foo builds
 # 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"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
@@ -91,9 +92,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz
+	http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-	http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
@@ -144,70 +145,68 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz)
-
-md5sums=('1600ebf998ec7075bd0e96e7a49513dc' #libreoffice-artwork-3.4.2.3.tar.bz2
-         '0e12b4a03d14645dac1f073eb2f67423' #libreoffice-base-3.4.2.3.tar.bz2
-         'f106511220a2a0b2a45571cf7605953a' #libreoffice-bootstrap-3.4.2.3.tar.bz2
-         '20854b5961b8b0b38219376a93ecf362' #libreoffice-calc-3.4.2.3.tar.bz2
-         '5799be1571289b7c17bd8fd2020c00f6' #libreoffice-components-3.4.2.3.tar.bz2
-         '75ca9da214abe072e37fb4d19fc2c34f' #libreoffice-extensions-3.4.2.3.tar.bz2
-         '73aa766053ea8f4c84dd0a76c0888f18' #libreoffice-extras-3.4.2.3.tar.bz2
-         '4416cc18cfa84f61eae905ff441a18d0' #libreoffice-filters-3.4.2.3.tar.bz2
-         'ecfd57a3dfd0ce230e5837b5099a0d5a' #libreoffice-help-3.4.2.3.tar.bz2
-         '40e23531e95617c7fe91e7025f007a91' #libreoffice-impress-3.4.2.3.tar.bz2
-         'bd2027fc2160798728e49d0fd331d163' #libreoffice-libs-core-3.4.2.3.tar.bz2
-         '9a948012496fcd27c31f755314ff98e3' #libreoffice-libs-extern-3.4.2.3.tar.bz2
-         'a5a8d9080492968eef001314093cd82d' #libreoffice-libs-extern-sys-3.4.2.3.tar.bz2
-         '810aa9e69b96af0f4de2e6d74b7b1847' #libreoffice-libs-gui-3.4.2.3.tar.bz2
-         '45de04dcbb6f6ff7474110ee982da7b8' #libreoffice-postprocess-3.4.2.3.tar.bz2
-         '545d65e92b674d354dd6511ee552d23f' #libreoffice-sdk-3.4.2.3.tar.bz2
-         '99e306957e38ce5e68deed9568874be6' #libreoffice-testing-3.4.2.3.tar.bz2
-         '2e7277588ef610b7a06953c59dc77c9b' #libreoffice-ure-3.4.2.3.tar.bz2
-         '281973e517d3b5626f5eedd746378fcc' #libreoffice-writer-3.4.2.3.tar.bz2
-         '1f24ab1d39f4a51faf22244c94a6203f' #1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-         '35c94d2df8893241173de1d16b6034c0' #35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-         '798b2ffdc8bcfe7bca2cf92b62caf685' #798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab' #fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-         'ada24d37d8d638b3d8a9985e80bc2978' #ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-         '2a177023f9ea8ec8bd00837605c5df1b' #2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-         'a7983f859eafb2677d7ff386a023bc40' #a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-         '3c219630e4302863a9a83d0efde889db' #3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-         '2ae988b339daec234019a7066f96733e' #2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-         '2c9b0f83ed5890af02c0df1c1776f39b' #2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-         'af3c3acf618de6108d65fcdc92b492e1' #af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-         'eeb2c7ddf0d302fba4bfc6e97eac9624' #eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-         '39bb3fcea1514f1369fcfc87542390fd' #39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-         '3404ab6b1792ae5f16bbd603bd1e1d03' #3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-         '97b2d4dba862397f446b217e2b623e71' #97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-         'f94d9870737518e3b597f9265f4e9803' #f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-         '8ce2fcd72becf06c41f7201d15373ed9' #8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-         'd8bd5eed178db6e2b18eeed243f85aa8' #d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-         '3bdf40c0d199af31923e900d082ca2dd' #3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-         'ace6ab49184e329db254e454a010f56d' #ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-         'db60e4fde8dd6d6807523deb71ee34dc' #db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-         'ba2930200c9f019c2d93a8c88c651a0f' #ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-         '18f577b374d60b3c760a3a3350407632' #18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-         '0ff7d225d087793c8c2c680d77aac3e7' #0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-         '185d60944ea767075d27247c3162b3bc' #185d60944ea767075d27247c3162b3bc-unowinreg.dll
-         'b4cae0700aa1c2aef7eb7f345365e6f1' #b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
-         '90401bca927835b6fbae4a707ed187c8' #90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
-         'f02578f5218f217a9f20e9c30e119c6a' #f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-         '0625a7d661f899a8ce263fc8a9879108' #0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz 
-         '7e7efc5d4a03126bb9ae3ae9aa2c4e87' #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-         '41c9b65ad60af4b3255bbecdfef11736' #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-         '451ccf439a36a568653b024534669971' #451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt
-         'bbdd5639ada63e3130761daaecae1a10' #bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-         '23bd75552206dfcd8fd4e29137dcac84' #23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-         'b8cbca7b3363e6ca2d02bc0ba2b63904' #b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-         'b632bdd25649cc4067bcb410bae23d2b' #b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-         '9d60b6cfa3ef1926848710bbcd11115b' #9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-         'dbaafd21de055e582d92d7d32fe9da13' #dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-         'b7b2d0e04e142f26dd96119c80757d1f' #b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-         'bc228237108cab7745897a9f466b6d39' #buildfix_boost.diff
-         'eee273f501ff45dc5f1365e78c6d57c0' #buildfix_ct2n.diff
-         '43b145db28e6c0d73578ae6fd35e510d' #vbahelper.visibility.patch
-         '37638431e7e40baf2e47966ebb9bc0e9' #scp2-more-reasonable-file-access-rights.diff
-         )
+md5sums=('7c2e73f1197d169519f86efe422e5df9'
+         '823956297a7e0b7603c585c49bd9fd4e'
+         '465b3be0e30f88e1139c45d2e2217927'
+         'a1d5af5be5eb522c8a24feacbb0161fa'
+         '8b972e130dfe62eb41d1d71d72de4b76'
+         'a6b22494e3a65a3b242ecb896aa7ab48'
+         'b7d86f8baee5b31af210cc81785e5676'
+         'de6c062d334daab99cf0592aa3568215'
+         'df46914d540ef0126cd746d09c68ca2a'
+         '8f308250c397ddc6fdb1aae13e102927'
+         '1fd00a0fcfd4a5d1956c3f6a0990d1ce'
+         '86914ac8bc30ea721b708b2f2faa3111'
+         '1452229e57ac3c4191e798eac4c0a7e0'
+         'bb46bdb682689629d432cdbf5f3f42c2'
+         'bec7f633562762debdf810690002e688'
+         '87061613efece1c253906a90cd4dc01f'
+         '308284d7d1d1bd6860d128b26e24390b'
+         'fa8b36365a2b2fb110c44886d7069774'
+         'da8a40cac4bd9d4f6f326e0e3b1b7e2a'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
+         'ada24d37d8d638b3d8a9985e80bc2978'
+         '2a177023f9ea8ec8bd00837605c5df1b'
+         'a7983f859eafb2677d7ff386a023bc40'
+         '3c219630e4302863a9a83d0efde889db'
+         '2ae988b339daec234019a7066f96733e'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         'af3c3acf618de6108d65fcdc92b492e1'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         '18f577b374d60b3c760a3a3350407632'
+         '0ff7d225d087793c8c2c680d77aac3e7'
+         '185d60944ea767075d27247c3162b3bc'
+         'b4cae0700aa1c2aef7eb7f345365e6f1'
+         '90401bca927835b6fbae4a707ed187c8'
+         'f02578f5218f217a9f20e9c30e119c6a'
+         '0625a7d661f899a8ce263fc8a9879108'
+         '451ccf439a36a568653b024534669971'
+         '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
+         '41c9b65ad60af4b3255bbecdfef11736'
+         'bbdd5639ada63e3130761daaecae1a10'
+         '23bd75552206dfcd8fd4e29137dcac84'
+         'b8cbca7b3363e6ca2d02bc0ba2b63904'
+         'b632bdd25649cc4067bcb410bae23d2b'
+         '9d60b6cfa3ef1926848710bbcd11115b'
+         'dbaafd21de055e582d92d7d32fe9da13'
+         'b7b2d0e04e142f26dd96119c80757d1f'
+         'bc228237108cab7745897a9f466b6d39'
+         'eee273f501ff45dc5f1365e78c6d57c0'
+         '43b145db28e6c0d73578ae6fd35e510d'
+         '37638431e7e40baf2e47966ebb9bc0e9')
 
 build() {
 
@@ -238,9 +237,6 @@ build() {
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
 	patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
 	
-	# Temporary workaround to avoid build failure in ct2n
-	mv ${srcdir}/451ccf439a36a568653b024534669971-ConvertTextToNumber{_,-}1.3.2.oxt
-
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
 #	unset CFLAGS
@@ -443,7 +439,7 @@ package_libreoffice-common() {
 }
 
 package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -465,7 +461,7 @@ package_libreoffice-base() {
 }
 
 package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
+ pkgdesc="Spreadsheet application for LibreOffice."
  depends=('libreoffice-common' 'lpsolve' )
  optdepends=()
  backup=()
@@ -487,7 +483,7 @@ package_libreoffice-calc() {
 }
 
 package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
+ pkgdesc="Drawing Application for LibreOffice."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -509,7 +505,7 @@ package_libreoffice-draw() {
 }
 
 package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
  depends=('libreoffice-common' 'dbus-glib')
  optdepends=()
  backup=()
@@ -530,7 +526,7 @@ package_libreoffice-gnome() {
 }
 
 package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
+ pkgdesc="Presentation Application for LibreOffice."
  depends=('libreoffice-common')
  optdepends=('mesa:             for the OGLTrans extension')
  backup=()
@@ -552,7 +548,7 @@ package_libreoffice-impress() {
 }
 
 package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
  depends=('libreoffice-common' 'kdelibs')
  optdepends=()
  backup=()
@@ -573,7 +569,7 @@ package_libreoffice-kde4() {
 }
 
 package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
+ pkgdesc="Equation Editor Applicationfor LibreOffice."
  depends=('libreoffice-common')
  optdepends=()
  backup=()
@@ -595,7 +591,7 @@ package_libreoffice-math() {
 }
 
 package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
+ pkgdesc="Software Development Kit for LibreOffice."
  depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
  optdepends=()
  backup=()
@@ -630,7 +626,7 @@ package_libreoffice-sdk() {
 }
 
 package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
+ pkgdesc="Software Development Kit documentation for LibreOffice"
  depends=('libreoffice-common' 'libreoffice-sdk')
  optdepends=()
  backup=()
@@ -654,7 +650,7 @@ package_libreoffice-sdk-doc() {
 }
 
 package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
+ pkgdesc="Word Processor Applicationfor LibreOffice."
  depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
  optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
  backup=()
diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install
index 0bccb81f3..809472f89 100644
--- a/extra/libreoffice/libreoffice.install
+++ b/extra/libreoffice/libreoffice.install
@@ -10,9 +10,9 @@ echo "LibreOffice has been split into several packages:"
 echo "- libreoffice-common"
 echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
 echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
+echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+echo "                              the LibreOffice APIs and for creating"
+echo "                              extensions (UNO components)."
 echo "-------------------------------------------------------------------"
 echo " * you need to install at least one libreoffice-langpack"
 echo " * you may want to pacman -Ss libreoffice-extensions"
@@ -33,9 +33,9 @@ update-mime-database usr/share/mime > /dev/null 2>&1
     echo "- libreoffice-common"
     echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
     echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
+    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
+    echo "                              the LibreOffice APIs and for creating"
+    echo "                              extensions (UNO components)."
     echo "Now you need to install at least one libreoffice-langpack!"
   fi
 }