From e14b0343883708718437df55c6f8e7ad3c6318ce Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 14 Jun 2014 20:00:59 +0000
Subject: [PATCH] extra/libreoffice to 2.4.2-2

---
 extra/libreoffice/PKGBUILD | 62 +++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 21 deletions(-)

diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 60da6f92f..9091b133d 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -25,23 +25,23 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.2.4.2
 pkgver=4.2.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
 			 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
-			 'clucene' 'junit' 'libmythes' 'libwpg'  'mesa' 'clucene'
+			 'clucene' 'junit' 'libmythes' 'mesa' 'clucene'
 			 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
 			 'gdb' 'doxygen'  'libatomic_ops' 'mdds'
              # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
+             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4"
+			 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
 			 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
 			 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' 'icu'
 			 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite'
-			 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
-			 'libcdr' 'libmspub'
+			 'lcms2' 'poppler>=0.24.0'
 			 '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
@@ -87,6 +87,14 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
+	${_additional_source_url}/libcdr-0.0.15.tar.bz2
+	${_additional_source_url}/libetonyek-0.0.4.tar.bz2
+	${_additional_source_url}/libmspub-0.0.6.tar.bz2
+	${_additional_source_url}/libodfgen-0.0.4.tar.bz2
+	${_additional_source_url}/libvisio-0.0.31.tar.bz2
+	${_additional_source_url}/a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
+	${_additional_source_url}/b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
+	${_additional_source_url}/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
 	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
 	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
 	${_additional_source_url}/libe-book-0.0.3.tar.bz2
@@ -126,6 +134,14 @@ noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	libmwaw-0.2.0.tar.bz2
+	libcdr-0.0.15.tar.bz2
+	libetonyek-0.0.4.tar.bz2
+	libmspub-0.0.6.tar.bz2
+	libodfgen-0.0.4.tar.bz2
+	libvisio-0.0.31.tar.bz2
+	a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
+	b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
+	46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
 	libfreehand-0.0.0.tar.bz2
 	Firebird-2.5.2.26540-0.tar.bz2
 	libe-book-0.0.3.tar.bz2
@@ -165,6 +181,14 @@ md5sums=('698a482f0cacd8b5eba9865fdd8a5403'
          '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
          'd794625f156a9fb1c53b3f8a8aa13b5e'
+         'fbcd8619fc6646f41d527c1329102998'
+         '3c50bc60394d1f2675fbf9bd22581363'
+         '1120705cd0f0d9bd5506360bf57b6c2e'
+         'e5483d1f0b71e64c367c1194b54b0f53'
+         '82628333418f101a20cd21f980cf9f40'
+         'a3dcac551fae5ebbec16e844810828c4'
+         'b85436266b2ac91d351ab5684b181151'
+         '46eb0e7f213ad61bd5dee0c494132cb0'
          '496dd00028afcc19f896b01394769043'
          '21154d2004e025c8a3666625b0357bb5'
          '2f1ceaf2ac8752ed278e175447d9b978'
@@ -266,20 +290,20 @@ build() {
 		--enable-ext-nlpsolver \
 		--without-fonts\
 		--without-afms\
-		--with-system-libcdr \
+		--without-system-libcdr \
 		--with-system-mdds\
 		--without-myspell-dicts \
-		--with-system-libvisio \
+		--without-system-libvisio \
 		--without-system-libcmis \
-		--with-system-libmspub \
+		--without-system-libmspub \
 		--without-system-libexttextcat \
 		--without-system-orcus \
 		--without-system-liblangtag \
 		--without-system-jfreereport \
 		--without-system-apache-commons \
-		--with-system-libodfgen \
+		--without-system-libodfgen \
 		--without-system-libmwaw \
-		--with-system-libetonyek \
+		--without-system-libetonyek \
 		--without-system-libfreehand \
 		--without-system-firebird \
 		--with-system-libatomic-ops \
@@ -292,8 +316,9 @@ build() {
 		--with-system-beanshell \
 		--with-system-cppunit\
 		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
+		--without-system-libwpd \
+		--without-system-libwpg \
+		--without-system-libwps \
 		--with-system-redland\
 		--without-system-npapi-headers \
 		--with-ant-home="/usr/share/apache-ant"\
@@ -316,7 +341,7 @@ build() {
 
 	touch src.downloaded
 	#./download
-	make
+	make build
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
@@ -333,9 +358,7 @@ package_libreoffice-common() {
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
 		  'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen'
 		  'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" 'icu'
-		  #'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
-          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
-          'libmspub' 'libcdr'
+          'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
 		  'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
@@ -344,7 +367,6 @@ package_libreoffice-common() {
              'beanshell2:       interactive java -- good for prototyping/macros'
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
              'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
@@ -538,7 +560,7 @@ package_libreoffice-gnome() {
 package_libreoffice-impress() {
  pkgdesc="Presentation Application for LibreOffice."
  install=libreoffice-impress.install
- depends=('libreoffice-common' 'libetonyek')
+ depends=('libreoffice-common')
  groups=('libreoffice')
  replaces=('libreoffice')
 
@@ -659,8 +681,7 @@ package_libreoffice-sdk-doc() {
 package_libreoffice-writer() {
  pkgdesc="Word Processor Application for LibreOffice."
  install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
+ depends=('libreoffice-common' 'libxml2')
  groups=('libreoffice')
  replaces=('libreoffice')
 
@@ -683,7 +704,6 @@ package_libreoffice-writer() {
 
 package_libreoffice-en-US() {
   pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
   provides=('openoffice-en-US' 'libreoffice-langpack')
   replaces=(openoffice-en-US)
   conflicts=(openoffice-en-US)