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

[Andreas Radke]

    Date: Friday, April 18, 2014 @ 14:20:20
  Author: andyrtr
Revision: 211260

upgpkg: libreoffice 4.2.3-3

pkg won't build with icu 53.1 - rebuild it with internal older icu

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-18 11:54:05 UTC (rev 211259)
+++ PKGBUILD	2014-04-18 12:20:20 UTC (rev 211260)
@@ -20,7 +20,7 @@
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.2.3.3
 pkgver=4.2.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -33,9 +33,10 @@
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
 			 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
-			 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" 'redland'
+			 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' #"icu>=52.1" 
 			 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite'
 			 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
+			 #'libcdr' 'libmspub'
 			 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
 			 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib'
 			 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests
@@ -54,6 +55,7 @@
 _additional_source_url2="http://dev-www.libreoffice.org/extern"
 source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
+	${_additional_source_url}/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
 	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
 	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -92,6 +94,7 @@
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
+	9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
 	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -134,6 +137,7 @@
          '81759541de9ce626a02d652399cd1ffe'
          'SKIP'
          '15cb8c0803064faef0c4ddf5bc5ca279'
+         '9e96ed4c1d99c0d14ac03c140f9f346c'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
          '798b2ffdc8bcfe7bca2cf92b62caf685'
@@ -286,6 +290,7 @@
 		--without-system-npapi-headers \
 		--with-ant-home="/usr/share/apache-ant"\
 		--without-system-boost\
+		--without-system-icu \
 		--with-system-cairo\
 		--with-system-libs\
 		--with-system-mythes\
@@ -319,7 +324,7 @@
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
 		  'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen'
-		  'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0"
+		  'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" #"icu>=52.1"
 		  #'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
           'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
 		  'desktop-file-utils' 'shared-mime-info' 'xdg-utils')