[arch-commits] Commit in libreoffice/trunk (3 files)

[andyrtr at archlinux.org]

    Date: Friday, March 30, 2012 @ 13:11:06
  Author: andyrtr
Revision: 154786

upgpkg: libreoffice 3.5.1-2

rebuild for icu49.1 - use internal old icu as temporary fix because no buildfix for 49.1 available; add PYTHONPATH - FS#27257; move bash-completion files

Added:
  libreoffice/trunk/libreoffice-common.csh
  libreoffice/trunk/libreoffice-common.sh
Modified:
  libreoffice/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   26 +++++++++++++++++++++-----
 libreoffice-common.csh |    1 +
 libreoffice-common.sh  |    1 +
 3 files changed, 23 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-30 17:01:20 UTC (rev 154785)
+++ PKGBUILD	2012-03-30 17:11:06 UTC (rev 154786)
@@ -21,7 +21,7 @@
 	'libreoffice-extension-report-builder')
 _LOver=3.5.1.2
 pkgver=3.5.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -33,7 +33,7 @@
               #'saxon' - currently broken 
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg'
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' #"icu>=49.1" 
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
@@ -46,6 +46,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}/314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
 	${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
@@ -75,9 +76,11 @@
 	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
 	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
-	buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a)
+	buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a
+	libreoffice-common.sh libreoffice-common.csh)
 noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
+	314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
 	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
@@ -108,6 +111,7 @@
          '607b544cd7b38f9e6db6fe7da25007a7'
          'a3fa7818bfab14a6cccec645193e9982'
          '18f577b374d60b3c760a3a3350407632'
+         '314e582264c36b3735466c522899aa07'
          'd28864eb2b59bb57b034c0d4662a3cee'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -137,7 +141,9 @@
          '185d60944ea767075d27247c3162b3bc'
          '60ce5dc9bd098f95c2e621a930c98dd9'
          '661a52a02a31b3afbe4b3b3146061afd'
-         '15fe8b5d79fbdc0b6bc2b454086671e7')
+         '15fe8b5d79fbdc0b6bc2b454086671e7'
+         '32fcd844935434807e68d7bd06b94f09'
+         '06a45184aefe078c4314e002ba666b52')
 
 build() {
 
@@ -214,6 +220,7 @@
 		--without-afms\
 		--without-ppds\
 		--without-system-libwps\
+		--without-system-icu \
 		--without-system-mdds\
 		--without-myspell-dicts \
 		--without-system-libvisio \
@@ -280,7 +287,7 @@
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=${pkgbase}.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite'
+          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' #"icu>=4.6" 
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
           #'saxon'
  optdepends=('libreoffice-langpack: additional language support'
@@ -335,6 +342,15 @@
  find ${pkgdir} -perm 444 -exec chmod 644 {} \;
  find ${pkgdir} -perm 555 -exec ls -lh {} \;
  find ${pkgdir} -perm 555 -exec chmod 755 {} \;
+ 
+ # set python-uno PYTHON path
+ install -dm755 ${pkgdir}/etc/profile.d
+ install -m644 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
+ 
+ # move bash-completion files to its new place
+ install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+ mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
+ rm -rf ${pkgdir}/etc/bash_completion.d
 }
 
 package_libreoffice-base() {

Added: libreoffice-common.csh
===================================================================
--- libreoffice-common.csh	                        (rev 0)
+++ libreoffice-common.csh	2012-03-30 17:11:06 UTC (rev 154786)
@@ -0,0 +1 @@
+setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program

Added: libreoffice-common.sh
===================================================================
--- libreoffice-common.sh	                        (rev 0)
+++ libreoffice-common.sh	2012-03-30 17:11:06 UTC (rev 154786)
@@ -0,0 +1 @@
+export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"