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

[Andreas Radke]

    Date: Friday, April 18, 2014 @ 19:35:54
  Author: andyrtr
Revision: 211324

prepare next build, use more system libs

Modified:
  libreoffice/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-18 17:32:52 UTC (rev 211323)
+++ PKGBUILD	2014-04-18 17:35:54 UTC (rev 211324)
@@ -18,9 +18,9 @@
 	'libreoffice-postgresql-connector'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.2.3.3
-pkgver=4.2.3
-pkgrel=3
+_LOver=4.2.4.1
+pkgver=4.2.4
+pkgrel=0.1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -36,7 +36,7 @@
 			 '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'
+			 '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
@@ -83,8 +83,6 @@
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/libcdr-0.0.14.tar.bz2
-	${_additional_source_url}/libmspub-0.0.6.tar.bz2
 	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
 	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
 	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
@@ -91,6 +89,7 @@
 	${_additional_source_url}/libatomic_ops-7_2d.zip
 	${_additional_source_url}/libe-book-0.0.3.tar.bz2
 	${_additional_source_url}/libabw-0.0.2.tar.bz2
+	${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2 
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
@@ -122,19 +121,18 @@
 	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	libcdr-0.0.14.tar.bz2
-	libmspub-0.0.6.tar.bz2
 	libmwaw-0.2.0.tar.bz2
 	libfreehand-0.0.0.tar.bz2
 	Firebird-2.5.2.26540-0.tar.bz2
 	libatomic_ops-7_2d.zip
 	libe-book-0.0.3.tar.bz2
-	libabw-0.0.2.tar.bz2)
-md5sums=('0347f2c919e809b3f3794ed509caa902'
+	libabw-0.0.2.tar.bz2
+	language-subtag-registry-2014-03-27.tar.bz2)
+md5sums=('421526597871b578c3a4c81ed1527f2a'
          'SKIP'
-         'fa82b4c4510c78fe22a3a56d53fb9752'
+         'f7616a86c66ddfc8385789b7254cb0e7'
          'SKIP'
-         '81759541de9ce626a02d652399cd1ffe'
+         'b7a5f08250f1b10388533d574fcc9b1e'
          'SKIP'
          '15cb8c0803064faef0c4ddf5bc5ca279'
          '9e96ed4c1d99c0d14ac03c140f9f346c'
@@ -165,8 +163,6 @@
          '0168229624cfac409e766913506961a8'
          '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
-         'd88f9b94df880d2c05be943b000ca112'
-         '1120705cd0f0d9bd5506360bf57b6c2e'
          'd794625f156a9fb1c53b3f8a8aa13b5e'
          '496dd00028afcc19f896b01394769043'
          '21154d2004e025c8a3666625b0357bb5'
@@ -173,6 +169,7 @@
          'c0b86562d5aa40761a87134f83e6adcf'
          '2f1ceaf2ac8752ed278e175447d9b978'
          '40fa48e03b1e28ae0325cc34b35bc46d'
+         '504af523f5d1a5590bbeb6a4b55e8a97'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
@@ -181,9 +178,6 @@
 
     cd libreoffice-$_LOver
 #return 1
-    # fix exttextcat build error
-    # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
-    unset CPPFLAGS
 
 	# move external sources into place
 	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
@@ -257,13 +251,12 @@
 		--enable-ext-nlpsolver \
 		--without-fonts\
 		--without-afms\
-		--without-system-libwps\
-		--without-system-libcdr \
+		--with-system-libcdr \
 		--without-system-mdds\
 		--without-myspell-dicts \
 		--with-system-libvisio \
 		--without-system-libcmis \
-		--without-system-libmspub \
+		--with-system-libmspub \
 		--without-system-libexttextcat \
 		--without-system-orcus \
 		--without-system-liblangtag \
@@ -327,6 +320,7 @@
 		  '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'
+          'libmspub' 'libcdr'
 		  'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'