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

[Andreas Radke]

    Date: Sunday, May 24, 2015 @ 22:34:41
  Author: andyrtr
Revision: 239730

prepare poppler rebuild, use internal libwps - new libwps isn't supported

Modified:
  libreoffice-still/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-24 18:52:40 UTC (rev 239729)
+++ PKGBUILD	2015-05-24 20:34:41 UTC (rev 239730)
@@ -6,11 +6,11 @@
 pkgname=('libreoffice-still-sdk' 'libreoffice-still')
 _LOver=4.3.7.2
 pkgver=4.3.7
-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'
 	'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'
@@ -55,6 +55,7 @@
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	${_additional_source_url}/libmwaw-0.3.1.tar.bz2
+	${_additional_source_url}/libwps-0.3.0.tar.bz2
 	${_additional_source_url}/libfreehand-0.1.0.tar.bz2
 	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
 	${_additional_source_url}/libe-book-0.1.1.tar.bz2
@@ -95,6 +96,7 @@
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	libmwaw-0.3.1.tar.bz2
+	libwps-0.3.0.tar.bz2
 	libfreehand-0.1.0.tar.bz2
 	Firebird-2.5.2.26540-0.tar.bz2
 	libe-book-0.1.1.tar.bz2
@@ -138,6 +140,7 @@
          '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
          '6f1ac4a0e24131c422e1e91f07718fb6'
+         'd4d77d08b9048bae3b8ec8df11f80efd'
          '5f029fef73e42a2c2ae4524a7513f97d'
          '21154d2004e025c8a3666625b0357bb5'
          'c25a881d21abc5b4da19205db513cc22'
@@ -263,7 +266,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 \
@@ -322,7 +325,7 @@
 
 package_libreoffice-still() {
 	pkgdesc="LibreOffice maintenance branch"
-	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'
 		'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'