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

[Andreas Radke]

    Date: Tuesday, May 26, 2015 @ 20:36:11
  Author: andyrtr
Revision: 239802

upgpkg: libreoffice-fresh 4.4.3-2

poppler 0.33.0 rebuild; temporary disable system libwps until FTBS failures have been sorted out

Modified:
  libreoffice-fresh/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-26 17:10:21 UTC (rev 239801)
+++ PKGBUILD	2015-05-26 18:36:11 UTC (rev 239802)
@@ -6,11 +6,11 @@
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
 _LOver=4.4.3.2
 pkgver=4.4.3
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
-makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'libwps'
+makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' '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'
 	'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
@@ -60,6 +60,7 @@
 	${_additional_source_url}/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
 	${_additional_source_url}/libfreehand-0.1.0.tar.bz2
 	${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
+	${_additional_source_url}/libwps-0.3.1.tar.bz2
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-fresh.sh libreoffice-fresh.csh)
@@ -95,6 +96,7 @@
 	5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz
 	libfreehand-0.1.0.tar.bz2
 	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
+	libwps-0.3.1.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll)
 md5sums=('427075aba3e1d32197954b7d6a2d0566'
          'SKIP'
@@ -134,6 +136,7 @@
          '5821b806a98e6c38370970e682ce76e8'
          '5f029fef73e42a2c2ae4524a7513f97d'
          '36271d3fa0d9dec1632029b6d7aac925'
+         'a111d9ef5a0dab564e9aec0f2cf8d218'
          '185d60944ea767075d27247c3162b3bc'
          'dcb5ad3e5f7139227677ea064b075422'
          '4195735a80876ae812fca5736b50192a'
@@ -247,7 +250,7 @@
 		--with-system-glew \
 		--with-system-glm \
 		--with-system-libwpg \
-		--with-system-libwps \
+		--without-system-libwps \
 		--with-system-redland\
 		--with-system-serf \
 		--without-system-npapi-headers \
@@ -305,7 +308,7 @@
 
 package_libreoffice-fresh() {
 	pkgdesc="LibreOffice branch which contains new features and program enhancements"
-	depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'libwps'
+	depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' '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'
 		'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'