libreoffice: updated to 6.1.0

1 files changed, 176 insertions, 174 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index f5292370..30f738ca 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -273,6 +273,8 @@
 #             * Rebuilt for the new poppler in -current.
 # 6.0.5-1:    30/jun/2018 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 6.1.0-1:    16/aug/2018 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 .
@@ -292,6 +294,17 @@ PRGNAM6=l10n
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
+# Either add support for KDE4, or for KDE5:
+ADD_KDE4=${ADD_KDE4:-"YES"}
+ADD_KDE4=$(echo $ADD_KDE4 | tr 'a-z' 'A-Z')
+ADD_KDE5=${ADD_KDE5:-"NO"}
+ADD_KDE5=$(echo $ADD_KDE5 | tr 'a-z' 'A-Z')
+if [ "${ADD_KDE4}" = "YES" -a "${ADD_KDE5}" = "YES" ]; then
+  echo "** Support for KDE4 and KDE5 can not be enabled at the same time!"
+  echo "** Disabling KDE4 support now..."
+  ADD_KDE4="NO"
+fi
+
 # SRCVER is the variable you control. It can be one of:
 # "HEAD" - in which case a new git # snapshot will be pulled,
 # "yyyymmdd" - like "20150704", if you downloaded a git snapshot before, or
@@ -304,8 +317,8 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-5.0.0.2git}
 #SRCVER=${SRCVER:-5.0.0.2}
 
-SRCVER=${SRCVER:-6.0.5}
-SUBVER=".2"
+SRCVER=${SRCVER:-6.1.0}
+SUBVER=".3"
 PKG_SUBVER=""
 
 # Under what directory will the script download all sources:
@@ -435,7 +448,7 @@ GITURI[5]=""
 #
 
 # --- Start of section generated by gensrc.sh ---
-# External sources for libreoffice-6.0.5.2
+# External sources for libreoffice-6.1.0.3
 
 SOURCE[6]="$SRCDIR/${LOSRC_DIR}/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -457,8 +470,8 @@ SOURCE[10]="$SRCDIR/${LOSRC_DIR}/apr-util-1.5.4.tar.gz"
 SRCURL[10]="https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"
 GITURI[10]=""
 
-SOURCE[11]="$SRCDIR/${LOSRC_DIR}/boost_1_65_1.tar.bz2"
-SRCURL[11]="https://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2"
+SOURCE[11]="$SRCDIR/${LOSRC_DIR}/boost_1_66_0.tar.bz2"
+SRCURL[11]="https://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"
 GITURI[11]=""
 
 SOURCE[12]="$SRCDIR/${LOSRC_DIR}/breakpad.zip"
@@ -517,12 +530,12 @@ SOURCE[25]="$SRCDIR/${LOSRC_DIR}/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
 SRCURL[25]="https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"
 GITURI[25]=""
 
-SOURCE[26]="$SRCDIR/${LOSRC_DIR}/libepubgen-0.1.0.tar.bz2"
-SRCURL[26]="https://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2"
+SOURCE[26]="$SRCDIR/${LOSRC_DIR}/libepubgen-0.1.1.tar.xz"
+SRCURL[26]="https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz"
 GITURI[26]=""
 
-SOURCE[27]="$SRCDIR/${LOSRC_DIR}/libetonyek-0.1.7.tar.xz"
-SRCURL[27]="https://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz"
+SOURCE[27]="$SRCDIR/${LOSRC_DIR}/libetonyek-0.1.8.tar.xz"
+SRCURL[27]="https://dev-www.libreoffice.org/src/libetonyek-0.1.8.tar.xz"
 GITURI[27]=""
 
 SOURCE[28]="$SRCDIR/${LOSRC_DIR}/expat-2.2.5.tar.bz2"
@@ -593,16 +606,16 @@ SOURCE[44]="$SRCDIR/${LOSRC_DIR}/alef-1.001.tar.gz"
 SRCURL[44]="https://dev-www.libreoffice.org/src/alef-1.001.tar.gz"
 GITURI[44]=""
 
-SOURCE[45]="$SRCDIR/${LOSRC_DIR}/amiri-0.109.zip"
-SRCURL[45]="https://dev-www.libreoffice.org/src/amiri-0.109.zip"
+SOURCE[45]="$SRCDIR/${LOSRC_DIR}/Amiri-0.111.zip"
+SRCURL[45]="https://dev-www.libreoffice.org/src/Amiri-0.111.zip"
 GITURI[45]=""
 
 SOURCE[46]="$SRCDIR/${LOSRC_DIR}/ttf-kacst_2.01+mry.tar.gz"
 SRCURL[46]="https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"
 GITURI[46]=""
 
-SOURCE[47]="$SRCDIR/${LOSRC_DIR}/ReemKufi-0.6.tar.gz"
-SRCURL[47]="https://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz"
+SOURCE[47]="$SRCDIR/${LOSRC_DIR}/ReemKufi-0.7.zip"
+SRCURL[47]="https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip"
 GITURI[47]=""
 
 SOURCE[48]="$SRCDIR/${LOSRC_DIR}/Scheherazade-2.100.zip"
@@ -629,8 +642,8 @@ SOURCE[53]="$SRCDIR/${LOSRC_DIR}/graphite2-minimal-1.3.10.tgz"
 SRCURL[53]="https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"
 GITURI[53]=""
 
-SOURCE[54]="$SRCDIR/${LOSRC_DIR}/harfbuzz-1.7.0.tar.bz2"
-SRCURL[54]="https://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"
+SOURCE[54]="$SRCDIR/${LOSRC_DIR}/harfbuzz-1.7.4.tar.bz2"
+SRCURL[54]="https://dev-www.libreoffice.org/src/harfbuzz-1.7.4.tar.bz2"
 GITURI[54]=""
 
 SOURCE[55]="$SRCDIR/${LOSRC_DIR}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
@@ -645,12 +658,12 @@ SOURCE[57]="$SRCDIR/${LOSRC_DIR}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.t
 SRCURL[57]="https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"
 GITURI[57]=""
 
-SOURCE[58]="$SRCDIR/${LOSRC_DIR}/icu4c-60_2-src.tgz"
-SRCURL[58]="https://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz"
+SOURCE[58]="$SRCDIR/${LOSRC_DIR}/icu4c-61_1-src.tgz"
+SRCURL[58]="https://dev-www.libreoffice.org/src/icu4c-61_1-src.tgz"
 GITURI[58]=""
 
-SOURCE[59]="$SRCDIR/${LOSRC_DIR}/icu4c-60_2-data.zip"
-SRCURL[59]="https://dev-www.libreoffice.org/src/icu4c-60_2-data.zip"
+SOURCE[59]="$SRCDIR/${LOSRC_DIR}/icu4c-61_1-data.zip"
+SRCURL[59]="https://dev-www.libreoffice.org/src/icu4c-61_1-data.zip"
 GITURI[59]=""
 
 SOURCE[60]="$SRCDIR/${LOSRC_DIR}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
@@ -701,8 +714,8 @@ SOURCE[71]="$SRCDIR/${LOSRC_DIR}/libjpeg-turbo-1.5.2.tar.gz"
 SRCURL[71]="https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz"
 GITURI[71]=""
 
-SOURCE[72]="$SRCDIR/${LOSRC_DIR}/language-subtag-registry-2018-03-30.tar.bz2"
-SRCURL[72]="https://dev-www.libreoffice.org/src/language-subtag-registry-2018-03-30.tar.bz2"
+SOURCE[72]="$SRCDIR/${LOSRC_DIR}/language-subtag-registry-2018-04-23.tar.bz2"
+SRCURL[72]="https://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2"
 GITURI[72]=""
 
 SOURCE[73]="$SRCDIR/${LOSRC_DIR}/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"
@@ -713,8 +726,8 @@ SOURCE[74]="$SRCDIR/${LOSRC_DIR}/lcms2-2.8.tar.gz"
 SRCURL[74]="https://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"
 GITURI[74]=""
 
-SOURCE[75]="$SRCDIR/${LOSRC_DIR}/libassuan-2.4.3.tar.bz2"
-SRCURL[75]="https://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"
+SOURCE[75]="$SRCDIR/${LOSRC_DIR}/libassuan-2.5.1.tar.bz2"
+SRCURL[75]="https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2"
 GITURI[75]=""
 
 SOURCE[76]="$SRCDIR/${LOSRC_DIR}/libatomic_ops-7_2d.zip"
@@ -737,186 +750,198 @@ SOURCE[80]="$SRCDIR/${LOSRC_DIR}/liblangtag-0.6.2.tar.bz2"
 SRCURL[80]="https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"
 GITURI[80]=""
 
-SOURCE[81]="$SRCDIR/${LOSRC_DIR}/ltm-1.0.zip"
-SRCURL[81]="https://dev-www.libreoffice.org/src/ltm-1.0.zip"
+SOURCE[81]="$SRCDIR/${LOSRC_DIR}/libnumbertext-1.0.4.tar.xz"
+SRCURL[81]="https://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz"
 GITURI[81]=""
 
-SOURCE[82]="$SRCDIR/${LOSRC_DIR}/xmlsec1-1.2.25.tar.gz"
-SRCURL[82]="https://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"
+SOURCE[82]="$SRCDIR/${LOSRC_DIR}/ltm-1.0.zip"
+SRCURL[82]="https://dev-www.libreoffice.org/src/ltm-1.0.zip"
 GITURI[82]=""
 
-SOURCE[83]="$SRCDIR/${LOSRC_DIR}/libxml2-2.9.8.tar.gz"
-SRCURL[83]="https://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"
+SOURCE[83]="$SRCDIR/${LOSRC_DIR}/xmlsec1-1.2.25.tar.gz"
+SRCURL[83]="https://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"
 GITURI[83]=""
 
-SOURCE[84]="$SRCDIR/${LOSRC_DIR}/libxslt-1.1.32.tar.gz"
-SRCURL[84]="https://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"
+SOURCE[84]="$SRCDIR/${LOSRC_DIR}/libxml2-2.9.8.tar.gz"
+SRCURL[84]="https://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz"
 GITURI[84]=""
 
-SOURCE[85]="$SRCDIR/${LOSRC_DIR}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
-SRCURL[85]="https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+SOURCE[85]="$SRCDIR/${LOSRC_DIR}/libxslt-1.1.32.tar.gz"
+SRCURL[85]="https://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"
 GITURI[85]=""
 
-SOURCE[86]="$SRCDIR/${LOSRC_DIR}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
-SRCURL[86]="https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+SOURCE[86]="$SRCDIR/${LOSRC_DIR}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+SRCURL[86]="https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
 GITURI[86]=""
 
-SOURCE[87]="$SRCDIR/${LOSRC_DIR}/mdds-1.3.1.tar.bz2"
-SRCURL[87]="https://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"
+SOURCE[87]="$SRCDIR/${LOSRC_DIR}/lxml-4.1.1.tgz"
+SRCURL[87]="https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"
 GITURI[87]=""
 
-SOURCE[88]="$SRCDIR/${LOSRC_DIR}/mDNSResponder-576.30.4.tar.gz"
-SRCURL[88]="https://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"
+SOURCE[88]="$SRCDIR/${LOSRC_DIR}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+SRCURL[88]="https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
 GITURI[88]=""
 
-SOURCE[89]="$SRCDIR/${LOSRC_DIR}/libmspub-0.1.3.tar.xz"
-SRCURL[89]="https://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz"
+SOURCE[89]="$SRCDIR/${LOSRC_DIR}/mdds-1.3.1.tar.bz2"
+SRCURL[89]="https://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"
 GITURI[89]=""
 
-SOURCE[90]="$SRCDIR/${LOSRC_DIR}/libmwaw-0.3.13.tar.xz"
-SRCURL[90]="https://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz"
+SOURCE[90]="$SRCDIR/${LOSRC_DIR}/mDNSResponder-576.30.4.tar.gz"
+SRCURL[90]="https://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"
 GITURI[90]=""
 
-SOURCE[91]="$SRCDIR/${LOSRC_DIR}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"
-SRCURL[91]="https://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"
+SOURCE[91]="$SRCDIR/${LOSRC_DIR}/libmspub-0.1.4.tar.xz"
+SRCURL[91]="https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"
 GITURI[91]=""
 
-SOURCE[92]="$SRCDIR/${LOSRC_DIR}/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
-SRCURL[92]="https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
+SOURCE[92]="$SRCDIR/${LOSRC_DIR}/libmwaw-0.3.14.tar.xz"
+SRCURL[92]="https://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"
 GITURI[92]=""
 
-SOURCE[93]="$SRCDIR/${LOSRC_DIR}/neon-0.30.2.tar.gz"
-SRCURL[93]="https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"
+SOURCE[93]="$SRCDIR/${LOSRC_DIR}/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"
+SRCURL[93]="https://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"
 GITURI[93]=""
 
-SOURCE[94]="$SRCDIR/${LOSRC_DIR}/nss-3.33-with-nspr-4.17.tar.gz"
-SRCURL[94]="https://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz"
+SOURCE[94]="$SRCDIR/${LOSRC_DIR}/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
+SRCURL[94]="https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
 GITURI[94]=""
 
-SOURCE[95]="$SRCDIR/${LOSRC_DIR}/libodfgen-0.1.6.tar.bz2"
-SRCURL[95]="https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"
+SOURCE[95]="$SRCDIR/${LOSRC_DIR}/neon-0.30.2.tar.gz"
+SRCURL[95]="https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"
 GITURI[95]=""
 
-SOURCE[96]="$SRCDIR/${LOSRC_DIR}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"
-SRCURL[96]="https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"
+SOURCE[96]="$SRCDIR/${LOSRC_DIR}/nss-3.33-with-nspr-4.17.tar.gz"
+SRCURL[96]="https://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz"
 GITURI[96]=""
 
-SOURCE[97]="$SRCDIR/${LOSRC_DIR}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"
-SRCURL[97]="https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"
+SOURCE[97]="$SRCDIR/${LOSRC_DIR}/libodfgen-0.1.6.tar.bz2"
+SRCURL[97]="https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"
 GITURI[97]=""
 
-SOURCE[98]="$SRCDIR/${LOSRC_DIR}/openldap-2.4.45.tgz"
-SRCURL[98]="https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"
+SOURCE[98]="$SRCDIR/${LOSRC_DIR}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"
+SRCURL[98]="https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar"
 GITURI[98]=""
 
-SOURCE[99]="$SRCDIR/${LOSRC_DIR}/openssl-1.0.2m.tar.gz"
-SRCURL[99]="https://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz"
+SOURCE[99]="$SRCDIR/${LOSRC_DIR}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"
+SRCURL[99]="https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"
 GITURI[99]=""
 
-SOURCE[100]="$SRCDIR/${LOSRC_DIR}/liborcus-0.13.3.tar.gz"
-SRCURL[100]="https://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz"
+SOURCE[100]="$SRCDIR/${LOSRC_DIR}/openldap-2.4.45.tgz"
+SRCURL[100]="https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"
 GITURI[100]=""
 
-SOURCE[101]="$SRCDIR/${LOSRC_DIR}/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"
-SRCURL[101]="https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"
+SOURCE[101]="$SRCDIR/${LOSRC_DIR}/openssl-1.0.2o.tar.gz"
+SRCURL[101]="https://dev-www.libreoffice.org/src/openssl-1.0.2o.tar.gz"
 GITURI[101]=""
 
-SOURCE[102]="$SRCDIR/${LOSRC_DIR}/libpagemaker-0.0.4.tar.xz"
-SRCURL[102]="https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"
+SOURCE[102]="$SRCDIR/${LOSRC_DIR}/liborcus-0.13.4.tar.gz"
+SRCURL[102]="https://dev-www.libreoffice.org/src/liborcus-0.13.4.tar.gz"
 GITURI[102]=""
 
-SOURCE[103]="$SRCDIR/${LOSRC_DIR}/pdfium-3235.tar.bz2"
-SRCURL[103]="https://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2"
+SOURCE[103]="$SRCDIR/${LOSRC_DIR}/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"
+SRCURL[103]="https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"
 GITURI[103]=""
 
-SOURCE[104]="$SRCDIR/${LOSRC_DIR}/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"
-SRCURL[104]="https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"
+SOURCE[104]="$SRCDIR/${LOSRC_DIR}/libpagemaker-0.0.4.tar.xz"
+SRCURL[104]="https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"
 GITURI[104]=""
 
-SOURCE[105]="$SRCDIR/${LOSRC_DIR}/libpng-1.6.34.tar.xz"
-SRCURL[105]="https://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"
+SOURCE[105]="$SRCDIR/${LOSRC_DIR}/pdfium-3426.tar.bz2"
+SRCURL[105]="https://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2"
 GITURI[105]=""
 
-SOURCE[106]="$SRCDIR/${LOSRC_DIR}/poppler-0.59.0.tar.xz"
-SRCURL[106]="https://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz"
+SOURCE[106]="$SRCDIR/${LOSRC_DIR}/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"
+SRCURL[106]="https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"
 GITURI[106]=""
 
-SOURCE[107]="$SRCDIR/${LOSRC_DIR}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"
-SRCURL[107]="https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"
+SOURCE[107]="$SRCDIR/${LOSRC_DIR}/libpng-1.6.34.tar.xz"
+SRCURL[107]="https://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"
 GITURI[107]=""
 
-SOURCE[108]="$SRCDIR/${LOSRC_DIR}/Python-3.5.4.tgz"
-SRCURL[108]="https://dev-www.libreoffice.org/src/Python-3.5.4.tgz"
+SOURCE[108]="$SRCDIR/${LOSRC_DIR}/poppler-0.66.0.tar.xz"
+SRCURL[108]="https://dev-www.libreoffice.org/src/poppler-0.66.0.tar.xz"
 GITURI[108]=""
 
-SOURCE[109]="$SRCDIR/${LOSRC_DIR}/libqxp-0.0.1.tar.xz"
-SRCURL[109]="https://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"
+SOURCE[109]="$SRCDIR/${LOSRC_DIR}/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"
+SRCURL[109]="https://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"
 GITURI[109]=""
 
-SOURCE[110]="$SRCDIR/${LOSRC_DIR}/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
-SRCURL[110]="https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
+SOURCE[110]="$SRCDIR/${LOSRC_DIR}/Python-3.5.5.tar.xz"
+SRCURL[110]="https://dev-www.libreoffice.org/src/Python-3.5.5.tar.xz"
 GITURI[110]=""
 
-SOURCE[111]="$SRCDIR/${LOSRC_DIR}/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
-SRCURL[111]="https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
+SOURCE[111]="$SRCDIR/${LOSRC_DIR}/libqxp-0.0.1.tar.xz"
+SRCURL[111]="https://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"
 GITURI[111]=""
 
-SOURCE[112]="$SRCDIR/${LOSRC_DIR}/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
-SRCURL[112]="https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
+SOURCE[112]="$SRCDIR/${LOSRC_DIR}/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
+SRCURL[112]="https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
 GITURI[112]=""
 
-SOURCE[113]="$SRCDIR/${LOSRC_DIR}/librevenge-0.0.4.tar.bz2"
-SRCURL[113]="https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"
+SOURCE[113]="$SRCDIR/${LOSRC_DIR}/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
+SRCURL[113]="https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
 GITURI[113]=""
 
-SOURCE[114]="$SRCDIR/${LOSRC_DIR}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
-SRCURL[114]="https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+SOURCE[114]="$SRCDIR/${LOSRC_DIR}/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
+SRCURL[114]="https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
 GITURI[114]=""
 
-SOURCE[115]="$SRCDIR/${LOSRC_DIR}/serf-1.2.1.tar.bz2"
-SRCURL[115]="https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"
+SOURCE[115]="$SRCDIR/${LOSRC_DIR}/librevenge-0.0.4.tar.bz2"
+SRCURL[115]="https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"
 GITURI[115]=""
 
-SOURCE[116]="$SRCDIR/${LOSRC_DIR}/libstaroffice-0.0.5.tar.xz"
-SRCURL[116]="https://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz"
+SOURCE[116]="$SRCDIR/${LOSRC_DIR}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+SRCURL[116]="https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
 GITURI[116]=""
 
-SOURCE[117]="$SRCDIR/${LOSRC_DIR}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
-SRCURL[117]="https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+SOURCE[117]="$SRCDIR/${LOSRC_DIR}/serf-1.2.1.tar.bz2"
+SRCURL[117]="https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"
 GITURI[117]=""
 
-SOURCE[118]="$SRCDIR/${LOSRC_DIR}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
-SRCURL[118]="https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
+SOURCE[118]="$SRCDIR/${LOSRC_DIR}/libstaroffice-0.0.6.tar.xz"
+SRCURL[118]="https://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"
 GITURI[118]=""
 
-SOURCE[119]="$SRCDIR/${LOSRC_DIR}/libvisio-0.1.6.tar.xz"
-SRCURL[119]="https://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"
+SOURCE[119]="$SRCDIR/${LOSRC_DIR}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+SRCURL[119]="https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 GITURI[119]=""
 
-SOURCE[120]="$SRCDIR/${LOSRC_DIR}/libwpd-0.10.2.tar.xz"
-SRCURL[120]="https://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"
+SOURCE[120]="$SRCDIR/${LOSRC_DIR}/twaindsm_2.4.1.orig.tar.gz"
+SRCURL[120]="https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"
 GITURI[120]=""
 
-SOURCE[121]="$SRCDIR/${LOSRC_DIR}/libwpg-0.3.2.tar.xz"
-SRCURL[121]="https://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"
+SOURCE[121]="$SRCDIR/${LOSRC_DIR}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
+SRCURL[121]="https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
 GITURI[121]=""
 
-SOURCE[122]="$SRCDIR/${LOSRC_DIR}/libwps-0.4.8.tar.xz"
-SRCURL[122]="https://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz"
+SOURCE[122]="$SRCDIR/${LOSRC_DIR}/libvisio-0.1.6.tar.xz"
+SRCURL[122]="https://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"
 GITURI[122]=""
 
-SOURCE[123]="$SRCDIR/${LOSRC_DIR}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
-SRCURL[123]="https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+SOURCE[123]="$SRCDIR/${LOSRC_DIR}/libwpd-0.10.2.tar.xz"
+SRCURL[123]="https://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"
 GITURI[123]=""
 
-SOURCE[124]="$SRCDIR/${LOSRC_DIR}/zlib-1.2.11.tar.xz"
-SRCURL[124]="https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"
+SOURCE[124]="$SRCDIR/${LOSRC_DIR}/libwpg-0.3.2.tar.xz"
+SRCURL[124]="https://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"
 GITURI[124]=""
 
-SOURCE[125]="$SRCDIR/${LOSRC_DIR}/libzmf-0.0.2.tar.xz"
-SRCURL[125]="https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"
+SOURCE[125]="$SRCDIR/${LOSRC_DIR}/libwps-0.4.9.tar.xz"
+SRCURL[125]="https://dev-www.libreoffice.org/src/libwps-0.4.9.tar.xz"
 GITURI[125]=""
 
+SOURCE[126]="$SRCDIR/${LOSRC_DIR}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+SRCURL[126]="https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+GITURI[126]=""
+
+SOURCE[127]="$SRCDIR/${LOSRC_DIR}/zlib-1.2.11.tar.xz"
+SRCURL[127]="https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"
+GITURI[127]=""
+
+SOURCE[128]="$SRCDIR/${LOSRC_DIR}/libzmf-0.0.2.tar.xz"
+SRCURL[128]="https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"
+GITURI[128]=""
+
 # --- End of section generated by gensrc.sh ---
 
 # Use the src_checkout() function if no downloadable tarball exists.
@@ -1125,14 +1150,6 @@ echo Building ...
 # Apply our own (or borrowed) patches.
 if [ "$P1" != "--oldbuild" ]; then
   touch $OUTPUT/patch-$PRGNAM.log
-  # Disable failing unit tests:
-  sed -i -e "/CppunitTest_i18npool_test_breakiterator/d" i18npool/Module_i18npool.mk
-  sed -i -e "/CppunitTest_sc_subsequent_filters_test/d" sc/Module_sc.mk 
-  sed -i -e "/CppunitTest_sw_ooxmlexport9/d" sw/Module_sw.mk
-  sed -i -e "/CppunitTest_sw_ooxmlimport/d" sw/Module_sw.mk
-  sed -i -e "/CppunitTest_sw_rtfimport/d" sw/Module_sw.mk
-  sed -i -e "/CppunitTest_sw_uiwriter/d" sw/Module_sw.mk 
-  sed -i -e "/CppunitTest_xmlsecurity_signing/d" xmlsecurity/Module_xmlsecurity.mk
   # Allow building with '--with-system-icw --without-system-harfbuzz'
   cat $SRCDIR/patches/libreoffice5.harfbuzz-icu.patch \
     | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
@@ -1146,6 +1163,10 @@ if [ "$P1" != "--oldbuild" ]; then
   #  cat $SRCDIR/patches/postgresql_openssl10.patch | sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/" \
   #    | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
   #fi
+  # Make libcmis compile against boost-1.68.0:
+  cp $SRCDIR/patches/libcmis_boost_1_68.patch external/libcmis/
+  sed -i external/libcmis/UnpackedTarball_libcmis.mk \
+    -e  "/gb_UnpackedTarball_add_patches,libcmis, \\\\/a external/libcmis/libcmis_boost_1_68.patch \\\\"
 fi
 
 if [ "${USE_LOVER}" == "yes" ]; then
@@ -1162,16 +1183,24 @@ if [ "$ARCH" != "x86_64" ]; then
   export DISABLE_CVE_TESTS=TRUE
 fi
 
-# Check for an installed KDE4 and assume Qt4:
-KDEDIRS=${KDEDIRS:-""}  # to avoid "KDEDIRS: unbound variable"
-if [ ! -z "$KDEDIRS" ]; then
-  ## Stupid but what can I do... LibreOffice detection routines suck:
-  #export KDE4DIR="$KDEDIRS"
-  #export QT4INC="$QT4DIR/include $QT4DIR/include/QtCore"
-  #export QT4LIB="$QT4DIR/lib${LIBDIRSUFFIX}"
-  KDEOPTS="--enable-kde4"
+# Note about KDE5: this also needs Qt5 available. This build will fail
+# if you enable KDE5 support but did not install Qt5!
+# Note that you can enable Qt5 support even if you do not have KDE5;
+# as long as you actually install a Qt5 package!
+#
+# Add KDE related arguments:
+if [ "${ADD_KDE4}" = "YES" ]; then
+  KDEOPTS="--enable-kde4 --disable-gtk3-kde5"
+elif [ "${ADD_KDE5}" = "YES" ]; then
+  KDEOPTS="--disable-kde4 --enable-kde5 --ensable-gtk3-kde5"
+else
+  KDEOPTS="--disable-kde4 --disable-kde5 --dissable-gtk3-kde5"
+fi
+# Add Qt5 related arguments:
+if $(pkg-config Qt5 --exists) || $(pkg-config Qt5Core --exists) ; then
+  QTOPTS="--enable-qt5"
 else
-  KDEOPTS="--disable-kde4"
+  QTOPTS="--disable-qt5"
 fi
 
 # Determine whether we will use gstreamer 0,10 or 1.0:
@@ -1257,7 +1286,6 @@ autoconf -v
   --with-build-version="SlackBuild for ${LOVER}${VERSION}${PKG_SUBVER} by $PACKAGER" \
   --with-external-tar="$TMP/tmp-$PRGNAM/extsrc" \
   --with-lang="$(echo ${LANGUAGES} |tr _ -)" \
-  --with-package-format="archive installed" \
   --with-vendor="Slackware Team ($PACKAGER)" \
   ${GITOPTS} \
   ${GSTOPTS} \
@@ -1265,6 +1293,7 @@ autoconf -v
   ${GDRIVEOPTS} \
   ${GPGMEOPTS} \
   ${POSTGRESQLOPTS} \
+  ${QTOPTS} \
   --enable-dbus \
   --enable-eot \
   --enable-epm \
@@ -1276,7 +1305,6 @@ autoconf -v
   --enable-scripting-beanshell \
   --enable-scripting-javascript \
   --enable-symbols \
-  --enable-systray \
   --with-ant-home=/usr/share/ant \
   --with-external-dict-dir=/usr/share/hunspell \
   --with-external-hyph-dir=/usr/share/hyphen \
@@ -1284,6 +1312,7 @@ autoconf -v
   --with-fonts \
   --with-help \
   --with-jdk-home=$JAVA_HOME \
+  --with-system-boost \
   --with-system-cairo \
   --with-system-curl \
   --with-system-dicts \
@@ -1299,7 +1328,6 @@ autoconf -v
   --without-junit \
   --without-krb5 \
   --without-myspell-dicts \
-  --without-system-boost \
   --without-system-harfbuzz \
   --without-system-jars \
   --without-system-jpeg \
@@ -1310,6 +1338,8 @@ autoconf -v
   --without-system-redland \
   --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+  #--enable-systray \
+  #--with-package-format="archive installed" \
 
 if [ "$USE_GIT" = "no"  ]; then
   touch src.downloaded
@@ -1319,14 +1349,9 @@ fi
 touch $OUTPUT/make-${PRGNAM}.log
 sed -i -e 's/check-if-root //g' Makefile
 echo "Starting $PRGNAM compilation (takes a long time)..."
-#./bootstrap 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
- #Using "make build" instead of just "make" will skip all unit tests:
-if [ "$ARCH" != "x86_64" ]; then
-  # Temporarily skip all checks on x86 (many will fail):
-  make build-nocheck VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-else
-  make build VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-fi
+# Temporarily skip all checks on x86 (many will fail):
+#make build VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+make build-nocheck VERBOSE=yes 2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 
 # Compile the dictionaries from source.
 # Resulting dict-* directories are placed in $INSTDIR :
@@ -1389,8 +1414,10 @@ fi
 # Replace redundant fonts with symlinks to save space:
 ( cd $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/fonts/truetype/
   for FONT in DejaVu*.ttf Liberation*.ttf ; do
-    rm -f $FONT
-    ln -sf /usr/share/fonts/TTF/$FONT
+    if [ -f /usr/share/fonts/TTF/$FONT ]; then
+      rm -f $FONT
+      ln -sf /usr/share/fonts/TTF/$FONT
+    fi
   done
 )
 
@@ -1558,38 +1585,13 @@ fi # End of splitting out language packs
 # Back to base:
 cd $BUILDDIR
 
-# Libreoffice suddenly added version numbers to the name of the wrapper script
-# as well as the to the names of icons, so I'll remove that
-cd $WORKDIR/CustomTarget/sysui/share/libreoffice
-  sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
-         -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
-         -e "s/^PRODUCTVERSION=.*$/PRODUCTVERSION=''/" \
-         -e "s/^office_prefix=.*$/office_prefix=\/usr\/lib${LIBDIRSUFFIX}\/${PRGNAM}/" \
-    create_tree.sh
-
-  # Generate the icons and mimetype files; discard all the other created stuff:
-  KDEMAINDIR=/usr GNOMEDIR=/usr GNOME_MIME_THEME=hicolor DESTDIR=../output \
-    ./create_tree.sh
-cd -
+# Install a menu icon for older desktops like XFCE:
+mkdir -p $PKG/usr/share/pixmaps
+for FILE in base calc draw impress math startcenter writer ; do
+  ln -s ../icons/hicolor/128x128/apps/${PRGNAM}-${FILE}.png \
+    $PKG/usr/share/pixmaps/
+done
 
-mkdir -p $PKG/usr/share/{applications,pixmaps}
-# What about template.desktop ?
-cd $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/xdg/
-  for FILE in base calc draw impress math startcenter writer ; do
-    # Install a desktop menu:
-    sed -i \
-        -e "s/$PRODUCTVERSION//g" \
-        -e "s/$ICONVERSION//g" \
-        -e "s/$PRODUCTVERSIONSHORT//g" \
-      ${FILE}.desktop
-    echo "StartupNotify=true" >> ${FILE}.desktop
-    install -m0644 ${FILE}.desktop \
-      $PKG/usr/share/applications/${PRGNAM}-${FILE}.desktop
-    # Install a menu icon for older desktops like XFCE:
-    ln -s ../icons/hicolor/128x128/apps/${PRGNAM}-${FILE}.png \
-      $PKG/usr/share/pixmaps/
-  done
-cd -
 # Add an entry for the LibO extension manager which went missing:
 cat <<EOF > $PKG/usr/share/applications/${PRGNAM}-extension-manager.desktop
 [Desktop Entry]