Fri Jun 24 23:06:35 UTC 2011

2 files changed, 61 insertions, 27 deletions

diff --git a/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch b/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch
new file mode 100644
index 000000000..31ad95d36
--- /dev/null
+++ b/testing/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch
@@ -0,0 +1,31 @@
+From 900baff9ff400a6eba034089ed69362c2c2d61e4 Mon Sep 17 00:00:00 2001
+From: Petr Mladek <pmladek@suse.cz>
+Date: Wed, 22 Jun 2011 12:05:19 +0200
+Subject: [PATCH] fix configure without the optional translations module
+
+---
+ set_soenv.in |    8 +++++---
+ 1 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/set_soenv.in b/set_soenv.in
+index f015bab..8e39314 100755
+--- a/set_soenv.in
++++ b/set_soenv.in
+@@ -1068,9 +1068,11 @@ $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
+ $L10N_MODULE = PathFormat($SRC_ROOT."/translations");
+ 
+ # Check for poor help localizations, i.e. no help translation at all...
+-opendir(DIR,$L10N_MODULE . "/source");
+-@languages = readdir(DIR);
+-closedir(DIR);
++@languages=();
++if (opendir(DIR,$L10N_MODULE . "/source"))
++{  @languages = readdir(DIR);
++   closedir(DIR);
++}
+ $WITH_POOR_HELP_LOCALIZATIONS = "";
+ 
+ foreach $language (@languages)
+-- 
+1.7.3.4
+
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
index 7ffa3b42e..646192a73 100644
--- a/testing/libreoffice/PKGBUILD
+++ b/testing/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127521 2011-06-15 18:45:39Z andyrtr $
+# $Id: PKGBUILD 128395 2011-06-23 18:37:12Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -24,8 +24,8 @@ pkgname=('libreoffice' 'libreoffice-sdk'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.1.1
-pkgver=3.4.1rc1
+_LOver=3.4.1.2
+pkgver=3.4.1rc2
 pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
@@ -47,8 +47,8 @@ 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"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src/"
+#_mirror="http://download.documentfoundation.org/libreoffice/src"
+_mirror="http://dev-builds.libreoffice.org/pre-releases/src/"
 _additional_source_url="http://hg.services.openoffice.org/binaries"
 source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
@@ -92,7 +92,8 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	buildfix_boost.diff
 	buildfix_ct2n.diff
-	vbahelper.visibility.patch)
+	vbahelper.visibility.patch
+	0001-fix-configure-without-the-optional-translations-modu.patch)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
@@ -131,25 +132,25 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
 	90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
 	f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2)
-md5sums=('a21bbbc0cf9b482a78357b7b6132e799'
-         'd9ccdb2b53de8e16d7bb3215b9e97d7a'
-         'd3aa4a8e05f8b5c3ccf4f945b82b32a2'
-         'eb03b6627f2a2240eca089c925692259'
-         '190c9b25a7193b7ca98d6f6d09cd20d2'
-         '45b632fb71b123b699c9e89f9db6632a'
-         '19b3e65676e8e8839a4dd884a74e83e4'
-         '79a955fd38d0eedca7db146c5a985041'
-         '9b9b80ff14a3c6f430cc1fee4551c53e'
-         'c592798d08cccfb14f6cda95eb542d7b'
-         '1f98cbec964a9563b72962c943af3545'
-         '01aa850fa07e4440706dcea0def5c27a'
-         '9765abf75b58c5dbdf82a953af8c6de4'
-         '1f07e271d64606116c84c7adbc90a324'
-         '877cf0733c202936f8b918b9ad423f0d'
-         '231f5a392ab78167a5a7ab7bc922a421'
-         '9452301d1eee5fc3bb4758e003829075'
-         '1bc390b972bbe27f513956af37e60538'
-         '974b73ed0add1d6e325b9da4e3ca5c5d'
+md5sums=('f38317f991b1c253c416c67be7c3754d'
+         'aa0d333b2eeca843c55cd4fafb77cda4'
+         '571a1d550c7d2d0ae80d712611447f71'
+         '30794ddc83d1c2e79564f0788f09186a'
+         '6887bf7d9badf0f0822a0c85261b4679'
+         '5b9891c11e79a6131763c0131a5c442e'
+         '3b91cbeaa68f22b5c017cd5f3919c070'
+         '5578f0dc49d092c57285e3bf3a311702'
+         '117fc2edb8c0765d0d39dba2ed910ea7'
+         '6e7b4efe196c44519d0d438c5a65bd92'
+         '44eddc7cd60a61a347694aa9a1988c28'
+         '361d32db4b08954fd210219e2fcc45d8'
+         '793ceaf4c7af5bbcfd0b8feb369d1f54'
+         '58177e2ff875c494f08490b061171669'
+         '43d7f4910b01a826ea97f63af4bdb36c'
+         '852c34e284cddf499d80957e7c994da5'
+         '281fe1792a84129e33853ba3fea4d378'
+         'cc2553bf6be74f818f2e9ad7178bef92'
+         'fe8fb18f2d4e4a37a4c23bc59f7a730c'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -191,7 +192,8 @@ md5sums=('a21bbbc0cf9b482a78357b7b6132e799'
          'b7b2d0e04e142f26dd96119c80757d1f'
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d')
+         '43b145db28e6c0d73578ae6fd35e510d'
+         'f8a8fdcc58f50560fbc266e28efdbbfe')
 
 build() {
 
@@ -218,6 +220,7 @@ build() {
 	patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
+	patch -Np1 -i ${srcdir}/0001-fix-configure-without-the-optional-translations-modu.patch
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -467,7 +470,7 @@ package_libreoffice-sdk() {
         sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
               -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
               -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
-              -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \
+              -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
               -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
               -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
               -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \