Wed Jun 29 23:10:38 UTC 2011

2 files changed, 73 insertions, 32 deletions

diff --git a/extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch b/extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch
new file mode 100644
index 000000000..31ad95d36
--- /dev/null
+++ b/extra/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/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 4fd0cf1a8..4ec3d5b00 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126270 2011-06-03 14:47:40Z stephane $
+# $Id: PKGBUILD 129540 2011-06-28 18:38:58Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -24,9 +24,9 @@ pkgname=('libreoffice' 'libreoffice-sdk'
 	'libreoffice-extension-validator'
 	'libreoffice-extension-watch-window'
 	'libreoffice-extension-wiki-publisher')
-_LOver=3.4.0.2
-pkgver=3.4.0
-pkgrel=2
+_LOver=3.4.1.3
+pkgver=3.4.1
+pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
 _OFFICEUPD="340"
@@ -90,11 +90,10 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
 	http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-	buildfix_i116795.diff
 	buildfix_boost.diff
 	buildfix_ct2n.diff
 	vbahelper.visibility.patch
-	buildfix_bison25.diff)
+	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
@@ -133,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=('7427ddd5ae63b6ee7aa868201dfbccaa'
-         'a78a8e08731213da02c65060cedc5589'
-         '596da255e2728faccc8f2361171270ec'
-         '8ed9803a34d13da1764e7523d550d6b0'
-         '9be46d7c4bf3a60ee8dd0a5ef3638f82'
-         'b60db802866ab71c485de42e6382d1bb'
-         '09e374cf3bd8f07a043883393012d69b'
-         'af9f25aa04dc4ef7b797f7bcc743877c'
-         'ad29de786d76d67759f9d2dd574b29be'
-         'ff13a8ac0ea324122b75773fd80a9245'
-         '6eb8f53e01da7a945ee4cd42b7297732'
-         '90df27d4cbf490668ce4f03ff7dba521'
-         'c0ea197183564c49306a1c79ca571e51'
-         '91e69ed3c0be542fa7f69ca3da2d7808'
-         'a81c787b2e5469c2acc9f335b2c9e52f'
-         'ee1c78af6553657614b1a43adf4750ac'
-         'c970d6212618fc9b34526907eb030ce6'
-         '6d25488c81af09d87015bf487243042f'
-         '9a39234a49516b7035309e28dd4f0784'
+md5sums=('10b3212002688e7ce49a276c68352b50'
+         'c6547ec8f971284ea1e58bb39375c500'
+         '26328364a0804dedab94818c15e76871'
+         'd26c6ab53c9404e82e04ea366d4db261'
+         '132aa87f2f3e7fff62d7211a86b769f3'
+         '801c254c28402df0c5fb5e2615817a6d'
+         'b94208fdae537f0b026ee26cede9a946'
+         '096e3071949d1eedf73faa13a2cf7b7e'
+         'e27e715b08cc6a35988aaa6efab6cc7f'
+         'e94d7adb79f38d3fd8119b712b04cc6e'
+         '1d2e7ca24b9fffafeaf236817fc8cbe9'
+         '69a9af6536607340a57b54b5562077f7'
+         '3b4e819497ba695f5c64a0107c2aac8d'
+         '5a7370a79e563f649f6bf506bc71928c'
+         'c480ed571703e68d851fbbcd4aa520be'
+         '222cec135152c108068baa4e370a3f68'
+         '93524298efb472503b12ae47c95de399'
+         '5420c40473f8bf8e5b400dd8a1e54f02'
+         '1516196f023bb1ae55fd1773a8db9d16'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -191,11 +190,10 @@ md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa'
          '9d60b6cfa3ef1926848710bbcd11115b'
          'dbaafd21de055e582d92d7d32fe9da13'
          'b7b2d0e04e142f26dd96119c80757d1f'
-         '0520d63c946e272ed3bdfc863fbdc42e'
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
          '43b145db28e6c0d73578ae6fd35e510d'
-         '4fa96e04b41a6e86774e74a972024b3e')
+         'f8a8fdcc58f50560fbc266e28efdbbfe')
 
 build() {
 
@@ -219,11 +217,10 @@ build() {
 	cd ${srcdir}/build
 
 	# buildfixes & bugfixes
-	patch -Np1 -i ${srcdir}/buildfix_i116795.diff
 	patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-	patch -Np0 -i ${srcdir}/buildfix_bison25.diff
+	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
@@ -461,14 +458,27 @@ package_libreoffice() {
 package_libreoffice-sdk() {
 
  pkgdesc="Software development kit for LibreOffice"
- depends=('libreoffice' 'gcc-libs' 'sh')
+ depends=('libreoffice' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
 
 	cd ${srcdir}/sdk-install
 	cp -r * ${pkgdir}
 
 	cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk
-	mv setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix.sh
-	rm -f ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
+	cp setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix{,.sh}
+
+	# fix ArchLinux LIbreOffice installation paths	
+        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/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," \
+              -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
+              -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
+              -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
+              -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
+              -e "s,@SDK_AUTO_DEPLOYMENT@,NO," setsdkenv_unix.{csh,sh}.in
 	#fix permissions
 	find examples -type f -exec chmod -x {} \;
 }