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

[Andreas Radke]

    Date: Sunday, November 27, 2016 @ 19:00:53
  Author: andyrtr
Revision: 282137

fallback to internal icu, current 5.2 branch isn't ready for icu58

Modified:
  libreoffice-fresh/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-27 17:57:34 UTC (rev 282136)
+++ PKGBUILD	2016-11-27 19:00:53 UTC (rev 282137)
@@ -19,7 +19,7 @@
 url="http://www.libreoffice.org/"
 makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' 'libwps'
 	'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
-	'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
+	'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' #'icu' 
 	'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
 	'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
 	'desktop-file-utils' 'shared-mime-info' 'gtk2' 'gst-plugins-base-libs'
@@ -26,7 +26,7 @@
 	'glu' 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
 	'gperf' 'kdelibs' 'gtk3' 'cppunit' 'beanshell' 'clucene' #'vigra' 
 	'junit' 'libmythes' 'libwpg'  'java-environment' 'postgresql-libs' 'libgl'
-	'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew'
+	'bluez-libs' 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew'
 	'apr' 'serf' 'ttf-liberation' 'glm' 'libxinerama' 'libpagemaker'
 	'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liborcus' 'liblangtag'
 	'libexttextcat' 'libfbclient' 'libcmis' 'gobject-introspection')
@@ -60,6 +60,7 @@
 	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	${_additional_source_url}/libfreehand-0.1.1.tar.bz2
+	${_additional_source_url}/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-fresh.sh libreoffice-fresh.csh
@@ -89,6 +90,7 @@
 	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
 	libfreehand-0.1.1.tar.bz2
+	976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll)
 validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
 sha256sums=('a8f1365d166bf24ac4b97ed8466f46cca29cf72e7e992bb84d24c3dc8e1c32c1'
@@ -121,6 +123,7 @@
             '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
             '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
             '45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877'
+            'ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581'
             'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
             'ad028513c29691b3ec3a35de21af2f224b48015afe0fbcc6fb834fdf7f613165'
             '76f62957d0058092b11316357d9d716a62b48a53e5277426ffa87429ab5510e4'
@@ -234,7 +237,7 @@
 		--with-jdk-home="/usr/lib/jvm/default" \
 		--with-ant-home="/usr/share/apache-ant"\
 		--without-system-boost\
-		--with-system-icu \
+		--without-system-icu \
 		--with-system-cairo \
 		--with-system-libs \
 		--with-system-mythes \
@@ -291,7 +294,7 @@
 	pkgdesc="LibreOffice branch which contains new features and program enhancements"
 	depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.5' 'libwpd>=0.9.2' 'libwps'
 		'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
-		'libxslt' 'redland' 'icu' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite'
+		'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' #'icu' 
 		'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
 		'libmspub' 'harfbuzz-icu' 'glew' 'nss' 'clucene' 'hicolor-icon-theme'
 		'desktop-file-utils' 'shared-mime-info' 'glu' 'libpagemaker'