Update to 4.4.0

1 files changed, 160 insertions, 127 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index d9868ae2..56232628 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011, 2012, 2013, 2014  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -191,6 +191,8 @@
 #             * Update.
 # 4.3.5-1:    20/dec/2014 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 4.4.0-1:    30/jan/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -220,8 +222,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-4.3.5}
-SUBVER=".2"
+SRCVER=${SRCVER:-4.4.0}
+SUBVER=".3"
 PKG_SUBVER=""
 
 # How many tarballs does this release consist of:
@@ -275,6 +277,27 @@ PKG4=$TMP/package-$PRGNAM-$PRGNAM4
 PKG5=$TMP/package-$PRGNAM-$PRGNAM5
 OUTPUT=${OUTPUT:-/tmp}
 
+# This package is built with Alien's Google API keys for LibreOffice.
+# The keys are contained in the file "libreoffice_apikeys",
+# which is not distributed.
+# If you want to rebuild this package, you can use your own API keys, see:
+#   http://www.chromium.org/developers/how-tos/api-keys
+# Or else the package compiles without API keys.
+# This will disable the ability to directly edit and save Google Drive Docs.
+# The following variables must be set:
+#   _gdrive_client_id
+#   _gdrive_client_secret
+if [ -f ${HOME}/.libreoffice_apikeys ]; then
+  . ${HOME}/.libreoffice_apikeys
+elif [ -f ${SRCDIR}/libreoffice_apikeys ]; then
+  . ${SRCDIR}/libreoffice_apikeys
+fi
+if [ -n "$_gdrive_client_id" -a -n "$_gdrive_client_secret" ]; then
+  GDRIVEOPTS=" --with-gdrive-client-id=${_gdrive_client_id} --with-gdrive-client-secret=${_gdrive_client_secret}"
+else
+  GDRIVEOPTS=" "
+fi
+
 # Base resource locators for tarballs and snapshots
 # - if you are building from git snapshots, it is wise to point GITBASE to
 #   a local directory where you keep clones of the remote repositories:
@@ -317,29 +340,26 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
 # for FILE in `wget -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/ooo.lst.in?id=$(echo $PRGNAM-$VERSION$SUBVER)" |grep -v "^http://"` |grep -v "^@" ; do if [ ! -f sources/$FILE ]; then echo $FILE; fi ; done;
 #
 
-# Ugly hack which I hate...
-# These two I can not parse from the download.lst so they are checked by hand:
-
-SOURCE[6]="$SRCDIR/sources/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip"
-SRCURL[6]="http://dev-www.libreoffice.org/src/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip"
+# --- Start of section generated by gensrc.sh ---
+# External sources for libreoffice-4.4.0.3
 
-SOURCE[7]="$SRCDIR/sources/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz"
-SRCURL[7]="http://dev-www.libreoffice.org/src/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz"
+SOURCE[6]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+SRCURL[6]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 
-# --- Start of section generated by gensrc_lo43.sh ---
-# External sources for libreoffice-4.3.5.2
+SOURCE[7]="$SRCDIR/sources/libabw-0.1.1.tar.bz2"
+SRCURL[7]="http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"
 
-SOURCE[8]="$SRCDIR/sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
-SRCURL[8]="http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
+SOURCE[8]="$SRCDIR/sources/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip"
+SRCURL[8]="http://dev-www.libreoffice.org/src/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip"
 
-SOURCE[9]="$SRCDIR/sources/libabw-0.1.0.tar.bz2"
-SRCURL[9]="http://dev-www.libreoffice.org/src/libabw-0.1.0.tar.bz2"
+SOURCE[9]="$SRCDIR/sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz"
+SRCURL[9]="http://dev-www.libreoffice.org/src/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz"
 
-SOURCE[10]="$SRCDIR/sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz"
-SRCURL[10]="http://dev-www.libreoffice.org/src/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz"
+SOURCE[10]="$SRCDIR/sources/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz"
+SRCURL[10]="http://dev-www.libreoffice.org/src/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz"
 
-SOURCE[11]="$SRCDIR/sources/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz"
-SRCURL[11]="http://dev-www.libreoffice.org/src/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz"
+SOURCE[11]="$SRCDIR/sources/commons-logging-1.2-src.tar.gz"
+SRCURL[11]="http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"
 
 SOURCE[12]="$SRCDIR/sources/apr-1.4.8.tar.gz"
 SRCURL[12]="http://dev-www.libreoffice.org/src/apr-1.4.8.tar.gz"
@@ -356,14 +376,14 @@ SRCURL[15]="http://dev-www.libreoffice.org/src/ea570af93c284aa9e5621cd563f54f4d-
 SOURCE[16]="$SRCDIR/sources/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"
 SRCURL[16]="http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"
 
-SOURCE[17]="$SRCDIR/sources/libcdr-0.1.0.tar.bz2"
-SRCURL[17]="http://dev-www.libreoffice.org/src/libcdr-0.1.0.tar.bz2"
+SOURCE[17]="$SRCDIR/sources/libcdr-0.1.1.tar.bz2"
+SRCURL[17]="http://dev-www.libreoffice.org/src/libcdr-0.1.1.tar.bz2"
 
 SOURCE[18]="$SRCDIR/sources/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"
 SRCURL[18]="http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"
 
-SOURCE[19]="$SRCDIR/sources/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz"
-SRCURL[19]="http://dev-www.libreoffice.org/src/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz"
+SOURCE[19]="$SRCDIR/sources/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz"
+SRCURL[19]="http://dev-www.libreoffice.org/src/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz"
 
 SOURCE[20]="$SRCDIR/sources/CoinMP-1.7.6.tgz"
 SRCURL[20]="http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"
@@ -371,8 +391,8 @@ SRCURL[20]="http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"
 SOURCE[21]="$SRCDIR/sources/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"
 SRCURL[21]="http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"
 
-SOURCE[22]="$SRCDIR/sources/ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz"
-SRCURL[22]="http://dev-www.libreoffice.org/src/ac4781e01619be13461bb2d562b94a7b-cppunit-1.13.1.tar.gz"
+SOURCE[22]="$SRCDIR/sources/cppunit-1.13.2.tar.gz"
+SRCURL[22]="http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"
 
 SOURCE[23]="$SRCDIR/sources/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
 SRCURL[23]="http://dev-www.libreoffice.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
@@ -380,8 +400,8 @@ SRCURL[23]="http://dev-www.libreoffice.org/src/451ccf439a36a568653b024534669971-
 SOURCE[24]="$SRCDIR/sources/curl-7.36.0.tar.bz2"
 SRCURL[24]="http://dev-www.libreoffice.org/src/curl-7.36.0.tar.bz2"
 
-SOURCE[25]="$SRCDIR/sources/libe-book-0.1.1.tar.bz2"
-SRCURL[25]="http://dev-www.libreoffice.org/src/libe-book-0.1.1.tar.bz2"
+SOURCE[25]="$SRCDIR/sources/libe-book-0.1.2.tar.bz2"
+SRCURL[25]="http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"
 
 SOURCE[26]="$SRCDIR/sources/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
 SRCURL[26]="http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
@@ -455,8 +475,8 @@ SRCURL[48]="http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-
 SOURCE[49]="$SRCDIR/sources/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz"
 SRCURL[49]="http://dev-www.libreoffice.org/src/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz"
 
-SOURCE[50]="$SRCDIR/sources/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz"
-SRCURL[50]="http://dev-www.libreoffice.org/src/a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz"
+SOURCE[50]="$SRCDIR/sources/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"
+SRCURL[50]="http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"
 
 SOURCE[51]="$SRCDIR/sources/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz"
 SRCURL[51]="http://dev-www.libreoffice.org/src/b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz"
@@ -497,142 +517,148 @@ SRCURL[62]="http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-
 SOURCE[63]="$SRCDIR/sources/jpegsrc.v9a.tar.gz"
 SRCURL[63]="http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz"
 
-SOURCE[64]="$SRCDIR/sources/language-subtag-registry-2014-04-10.tar.bz2"
-SRCURL[64]="http://dev-www.libreoffice.org/src/language-subtag-registry-2014-04-10.tar.bz2"
+SOURCE[64]="$SRCDIR/sources/libjpeg-turbo-1.3.1.tar.gz"
+SRCURL[64]="http://dev-www.libreoffice.org/src/libjpeg-turbo-1.3.1.tar.gz"
+
+SOURCE[65]="$SRCDIR/sources/language-subtag-registry-2014-12-03.tar.bz2"
+SRCURL[65]="http://dev-www.libreoffice.org/src/language-subtag-registry-2014-12-03.tar.bz2"
+
+SOURCE[66]="$SRCDIR/sources/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"
+SRCURL[66]="http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"
 
-SOURCE[65]="$SRCDIR/sources/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"
-SRCURL[65]="http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"
+SOURCE[67]="$SRCDIR/sources/lcms2-2.6.tar.gz"
+SRCURL[67]="http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"
 
-SOURCE[66]="$SRCDIR/sources/lcms2-2.6.tar.gz"
-SRCURL[66]="http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"
+SOURCE[68]="$SRCDIR/sources/libatomic_ops-7_2d.zip"
+SRCURL[68]="http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"
 
-SOURCE[67]="$SRCDIR/sources/libatomic_ops-7_2d.zip"
-SRCURL[67]="http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"
+SOURCE[69]="$SRCDIR/sources/libeot-0.01.tar.bz2"
+SRCURL[69]="http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"
 
-SOURCE[68]="$SRCDIR/sources/libeot-0.01.tar.bz2"
-SRCURL[68]="http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"
+SOURCE[70]="$SRCDIR/sources/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"
+SRCURL[70]="http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"
 
-SOURCE[69]="$SRCDIR/sources/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2"
-SRCURL[69]="http://dev-www.libreoffice.org/src/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2"
+SOURCE[71]="$SRCDIR/sources/libgltf-0.0.2.tar.bz2"
+SRCURL[71]="http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"
 
-SOURCE[70]="$SRCDIR/sources/libgltf-0.0.2.tar.bz2"
-SRCURL[70]="http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"
+SOURCE[72]="$SRCDIR/sources/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2"
+SRCURL[72]="http://dev-www.libreoffice.org/src/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2"
 
-SOURCE[71]="$SRCDIR/sources/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2"
-SRCURL[71]="http://dev-www.libreoffice.org/src/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2"
+SOURCE[73]="$SRCDIR/sources/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+SRCURL[73]="http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
 
-SOURCE[72]="$SRCDIR/sources/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
-SRCURL[72]="http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
+SOURCE[74]="$SRCDIR/sources/9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz"
+SRCURL[74]="http://dev-www.libreoffice.org/src/9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz"
 
-SOURCE[73]="$SRCDIR/sources/9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz"
-SRCURL[73]="http://dev-www.libreoffice.org/src/9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz"
+SOURCE[75]="$SRCDIR/sources/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"
+SRCURL[75]="http://dev-www.libreoffice.org/src/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"
 
-SOURCE[74]="$SRCDIR/sources/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"
-SRCURL[74]="http://dev-www.libreoffice.org/src/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"
+SOURCE[76]="$SRCDIR/sources/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+SRCURL[76]="http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
 
-SOURCE[75]="$SRCDIR/sources/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
-SRCURL[75]="http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+SOURCE[77]="$SRCDIR/sources/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+SRCURL[77]="http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
 
-SOURCE[76]="$SRCDIR/sources/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2"
-SRCURL[76]="http://dev-www.libreoffice.org/src/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2"
+SOURCE[78]="$SRCDIR/sources/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2"
+SRCURL[78]="http://dev-www.libreoffice.org/src/cb4207cb913c7a5a8bfa5b91234618ee-mdds_0.11.2.tar.bz2"
 
-SOURCE[77]="$SRCDIR/sources/896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2"
-SRCURL[77]="http://dev-www.libreoffice.org/src/896272c1a9e396b871cb4dffbd694503-mdds_0.11.1.tar.bz2"
+SOURCE[79]="$SRCDIR/sources/libmspub-0.1.2.tar.bz2"
+SRCURL[79]="http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"
 
-SOURCE[78]="$SRCDIR/sources/libmspub-0.1.1.tar.bz2"
-SRCURL[78]="http://dev-www.libreoffice.org/src/libmspub-0.1.1.tar.bz2"
+SOURCE[80]="$SRCDIR/sources/libmwaw-0.3.4.tar.bz2"
+SRCURL[80]="http://dev-www.libreoffice.org/src/libmwaw-0.3.4.tar.bz2"
 
-SOURCE[79]="$SRCDIR/sources/libmwaw-0.3.1.tar.bz2"
-SRCURL[79]="http://dev-www.libreoffice.org/src/libmwaw-0.3.1.tar.bz2"
+SOURCE[81]="$SRCDIR/sources/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"
+SRCURL[81]="http://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"
 
-SOURCE[80]="$SRCDIR/sources/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz"
-SRCURL[80]="http://dev-www.libreoffice.org/src/0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz"
+SOURCE[82]="$SRCDIR/sources/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
+SRCURL[82]="http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
 
-SOURCE[81]="$SRCDIR/sources/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz"
-SRCURL[81]="http://dev-www.libreoffice.org/src/46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz"
+SOURCE[83]="$SRCDIR/sources/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz"
+SRCURL[83]="http://dev-www.libreoffice.org/src/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz"
 
-SOURCE[82]="$SRCDIR/sources/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz"
-SRCURL[82]="http://dev-www.libreoffice.org/src/ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz"
+SOURCE[84]="$SRCDIR/sources/b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz"
+SRCURL[84]="http://dev-www.libreoffice.org/src/b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz"
 
-SOURCE[83]="$SRCDIR/sources/b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz"
-SRCURL[83]="http://dev-www.libreoffice.org/src/b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz"
+SOURCE[85]="$SRCDIR/sources/libodfgen-0.1.3.tar.bz2"
+SRCURL[85]="http://dev-www.libreoffice.org/src/libodfgen-0.1.3.tar.bz2"
 
-SOURCE[84]="$SRCDIR/sources/libodfgen-0.1.1.tar.bz2"
-SRCURL[84]="http://dev-www.libreoffice.org/src/libodfgen-0.1.1.tar.bz2"
+SOURCE[86]="$SRCDIR/sources/OpenCOLLADA-master-6509aa13af.tar.bz2"
+SRCURL[86]="http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"
 
-SOURCE[85]="$SRCDIR/sources/OpenCOLLADA-master-6509aa13af.tar.bz2"
-SRCURL[85]="http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"
+SOURCE[87]="$SRCDIR/sources/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"
+SRCURL[87]="http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"
 
-SOURCE[86]="$SRCDIR/sources/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"
-SRCURL[86]="http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"
+SOURCE[88]="$SRCDIR/sources/openssl-1.0.1j.tar.gz"
+SRCURL[88]="http://dev-www.libreoffice.org/src/openssl-1.0.1j.tar.gz"
 
-SOURCE[87]="$SRCDIR/sources/openssl-1.0.1j.tar.gz"
-SRCURL[87]="http://dev-www.libreoffice.org/src/openssl-1.0.1j.tar.gz"
+SOURCE[89]="$SRCDIR/sources/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2"
+SRCURL[89]="http://dev-www.libreoffice.org/src/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2"
 
-SOURCE[88]="$SRCDIR/sources/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2"
-SRCURL[88]="http://dev-www.libreoffice.org/src/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2"
+SOURCE[90]="$SRCDIR/sources/libpagemaker-0.0.2.tar.bz2"
+SRCURL[90]="http://dev-www.libreoffice.org/src/libpagemaker-0.0.2.tar.bz2"
 
-SOURCE[89]="$SRCDIR/sources/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
-SRCURL[89]="http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
+SOURCE[91]="$SRCDIR/sources/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
+SRCURL[91]="http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"
 
-SOURCE[90]="$SRCDIR/sources/libpng-1.5.18.tar.gz"
-SRCURL[90]="http://dev-www.libreoffice.org/src/libpng-1.5.18.tar.gz"
+SOURCE[92]="$SRCDIR/sources/libpng-1.5.18.tar.gz"
+SRCURL[92]="http://dev-www.libreoffice.org/src/libpng-1.5.18.tar.gz"
 
-SOURCE[91]="$SRCDIR/sources/1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz"
-SRCURL[91]="http://dev-www.libreoffice.org/src/1cd27460f7e3379d1eb109cfd7bcdb39-poppler-0.22.5.tar.gz"
+SOURCE[93]="$SRCDIR/sources/poppler-0.26.4.tar.gz"
+SRCURL[93]="http://dev-www.libreoffice.org/src/poppler-0.26.4.tar.gz"
 
-SOURCE[92]="$SRCDIR/sources/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"
-SRCURL[92]="http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"
+SOURCE[94]="$SRCDIR/sources/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"
+SRCURL[94]="http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"
 
-SOURCE[93]="$SRCDIR/sources/Python-3.3.5.tgz"
-SRCURL[93]="http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"
+SOURCE[95]="$SRCDIR/sources/Python-3.3.5.tgz"
+SRCURL[95]="http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"
 
-SOURCE[94]="$SRCDIR/sources/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"
-SRCURL[94]="http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"
+SOURCE[96]="$SRCDIR/sources/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"
+SRCURL[96]="http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"
 
-SOURCE[95]="$SRCDIR/sources/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"
-SRCURL[95]="http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"
+SOURCE[97]="$SRCDIR/sources/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"
+SRCURL[97]="http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"
 
-SOURCE[96]="$SRCDIR/sources/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"
-SRCURL[96]="http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"
+SOURCE[98]="$SRCDIR/sources/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"
+SRCURL[98]="http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"
 
-SOURCE[97]="$SRCDIR/sources/librevenge-0.0.1.tar.bz2"
-SRCURL[97]="http://dev-www.libreoffice.org/src/librevenge-0.0.1.tar.bz2"
+SOURCE[99]="$SRCDIR/sources/librevenge-0.0.2.tar.bz2"
+SRCURL[99]="http://dev-www.libreoffice.org/src/librevenge-0.0.2.tar.bz2"
 
-SOURCE[98]="$SRCDIR/sources/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
-SRCURL[98]="http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+SOURCE[100]="$SRCDIR/sources/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+SRCURL[100]="http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
 
-SOURCE[99]="$SRCDIR/sources/serf-1.2.1.tar.bz2"
-SRCURL[99]="http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"
+SOURCE[101]="$SRCDIR/sources/serf-1.2.1.tar.bz2"
+SRCURL[101]="http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"
 
-SOURCE[100]="$SRCDIR/sources/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
-SRCURL[100]="http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+SOURCE[102]="$SRCDIR/sources/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+SRCURL[102]="http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 
-SOURCE[101]="$SRCDIR/sources/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
-SRCURL[101]="http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
+SOURCE[103]="$SRCDIR/sources/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
+SRCURL[103]="http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
 
-SOURCE[102]="$SRCDIR/sources/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-SRCURL[102]="http://dev-www.libreoffice.org/src/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+SOURCE[104]="$SRCDIR/sources/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+SRCURL[104]="http://dev-www.libreoffice.org/src/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
 
-SOURCE[103]="$SRCDIR/sources/libvisio-0.1.0.tar.bz2"
-SRCURL[103]="http://dev-www.libreoffice.org/src/libvisio-0.1.0.tar.bz2"
+SOURCE[105]="$SRCDIR/sources/libvisio-0.1.1.tar.bz2"
+SRCURL[105]="http://dev-www.libreoffice.org/src/libvisio-0.1.1.tar.bz2"
 
-SOURCE[104]="$SRCDIR/sources/libwpd-0.10.0.tar.bz2"
-SRCURL[104]="http://dev-www.libreoffice.org/src/libwpd-0.10.0.tar.bz2"
+SOURCE[106]="$SRCDIR/sources/libwpd-0.10.0.tar.bz2"
+SRCURL[106]="http://dev-www.libreoffice.org/src/libwpd-0.10.0.tar.bz2"
 
-SOURCE[105]="$SRCDIR/sources/libwpg-0.3.0.tar.bz2"
-SRCURL[105]="http://dev-www.libreoffice.org/src/libwpg-0.3.0.tar.bz2"
+SOURCE[107]="$SRCDIR/sources/libwpg-0.3.0.tar.bz2"
+SRCURL[107]="http://dev-www.libreoffice.org/src/libwpg-0.3.0.tar.bz2"
 
-SOURCE[106]="$SRCDIR/sources/libwps-0.3.0.tar.bz2"
-SRCURL[106]="http://dev-www.libreoffice.org/src/libwps-0.3.0.tar.bz2"
+SOURCE[108]="$SRCDIR/sources/libwps-0.3.1.tar.bz2"
+SRCURL[108]="http://dev-www.libreoffice.org/src/libwps-0.3.1.tar.bz2"
 
-SOURCE[107]="$SRCDIR/sources/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
-SRCURL[107]="http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+SOURCE[109]="$SRCDIR/sources/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+SRCURL[109]="http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
 
-SOURCE[108]="$SRCDIR/sources/zlib-1.2.8.tar.gz"
-SRCURL[108]="http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"
+SOURCE[110]="$SRCDIR/sources/zlib-1.2.8.tar.gz"
+SRCURL[110]="http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"
 
-# --- End of section generated by gensrc_lo43.sh ---
+# --- End of section generated by gensrc.sh ---
 
 # Use the src_checkout() function if no downloadable tarball exists.
 # This function checks out sources from SVN/CVS and creates a tarball of them.
@@ -837,11 +863,17 @@ if [ "$P1" != "--oldbuild" ]; then
   ## Add internal copies of Google's Carlito and Caladea fonts:
   ## (for 4.3.0 I expect that people install separate font packages instead)
   #cat $SRCDIR/patches/libreoffice.crosextra_fonts.patch | patch -p1 --verbose \
-  #  2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+  #  2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
   ## Fix bug on KDE where application freezes:
   ## (fixed in 4.3.0)
   #cat $SRCDIR/patches/libreoffice.kde_qt_sessionmanager.patch \
-  #  | patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-$PRGNAM.log
+  #  | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+  ## Fix building with internal harfbuzz:
+  #cat $SRCDIR/patches/libreoffice.harfbuzz.patch \
+  #  | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+  # Remove failing unit test:
+  cat $SRCDIR/patches/libreoffice.failing_unittest.patch \
+    | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
 fi
 
 if [ -z "$SRCURL[0]" ]; then
@@ -924,8 +956,10 @@ esac
   ${GITOPTS} \
   ${KDEOPTS} \
   ${ARCHOPTS} \
+  ${GDRIVEOPTS} \
   --disable-gconf \
   --disable-gnome-vfs \
+  --disable-gstreamer-1-0 \
   --disable-kde \
   --disable-lockdown \
   --enable-dbus \
@@ -934,10 +968,9 @@ esac
   --enable-ext-nlpsolver \
   --enable-ext-wiki-publisher \
   --enable-gltf \
-  --enable-gtk3 \
+  --enable-gstreamer-0-10 \
   --enable-hardlink-deliver \
   --enable-odk \
-  --enable-opengl \
   --enable-python=internal \
   --enable-randr-link \
   --enable-release-build \
@@ -945,7 +978,6 @@ esac
   --enable-scripting-javascript \
   --enable-symbols \
   --enable-systray \
-  --enable-vba \
   --with-ant-home=/usr/share/ant \
   --with-external-dict-dir=/usr/share/hunspell \
   --with-external-hyph-dir=/usr/share/hyphen \
@@ -953,7 +985,6 @@ esac
   --with-fonts \
   --with-help \
   --with-jdk-home=$JAVA_HOME \
-  --with-system-boost \
   --with-system-cairo \
   --with-system-curl \
   --with-system-dicts \
@@ -970,9 +1001,11 @@ esac
   --without-junit \
   --without-krb5 \
   --without-myspell-dicts \
+  --without-system-boost \
   --without-system-harfbuzz \
   --without-system-glew \
   --without-system-jars \
+  --without-system-lcms2 \
   --without-system-libvisio \
   --without-system-npapi-headers \
   --without-system-poppler \