libreoffice: update to 6.4.0

1 files changed, 141 insertions, 131 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index bedddb6f..4f184591 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -300,6 +300,8 @@
 #             * Update.
 # 6.3.4-1:    27/dec/2019 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 6.4.0-1:    30/jan/2020 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 .
@@ -335,8 +337,8 @@ ADD_KDE5=$(echo $ADD_KDE5 | tr 'a-z' 'A-Z')
 #SRCVER=${SRCVER:-5.0.0.2git}
 #SRCVER=${SRCVER:-5.0.0.2}
 
-SRCVER=${SRCVER:-6.3.4}
-SUBVER=".2"
+SRCVER=${SRCVER:-6.4.0}
+SUBVER=".3"
 PKG_SUBVER=""
 
 # Under what directory will the script download all sources:
@@ -466,7 +468,7 @@ GITURI[5]=""
 #
 
 # --- Start of section generated by gensrc.sh ---
-# External sources for libreoffice-6.3.4.2
+# External sources for libreoffice-6.4.0.3
 
 SOURCE[6]="$SRCDIR/${LOSRC_DIR}/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -668,8 +670,8 @@ SOURCE[55]="$SRCDIR/${LOSRC_DIR}/graphite2-minimal-1.3.13.tgz"
 SRCURL[55]="https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"
 GITURI[55]=""
 
-SOURCE[56]="$SRCDIR/${LOSRC_DIR}/harfbuzz-2.3.1.tar.bz2"
-SRCURL[56]="https://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"
+SOURCE[56]="$SRCDIR/${LOSRC_DIR}/harfbuzz-2.6.0.tar.xz"
+SRCURL[56]="https://dev-www.libreoffice.org/src/harfbuzz-2.6.0.tar.xz"
 GITURI[56]=""
 
 SOURCE[57]="$SRCDIR/${LOSRC_DIR}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
@@ -684,12 +686,12 @@ SOURCE[59]="$SRCDIR/${LOSRC_DIR}/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.t
 SRCURL[59]="https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"
 GITURI[59]=""
 
-SOURCE[60]="$SRCDIR/${LOSRC_DIR}/icu4c-63_1-src.tgz"
-SRCURL[60]="https://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz"
+SOURCE[60]="$SRCDIR/${LOSRC_DIR}/icu4c-65_1-src.tgz"
+SRCURL[60]="https://dev-www.libreoffice.org/src/icu4c-65_1-src.tgz"
 GITURI[60]=""
 
-SOURCE[61]="$SRCDIR/${LOSRC_DIR}/icu4c-63_1-data.zip"
-SRCURL[61]="https://dev-www.libreoffice.org/src/icu4c-63_1-data.zip"
+SOURCE[61]="$SRCDIR/${LOSRC_DIR}/icu4c-65_1-data.zip"
+SRCURL[61]="https://dev-www.libreoffice.org/src/icu4c-65_1-data.zip"
 GITURI[61]=""
 
 SOURCE[62]="$SRCDIR/${LOSRC_DIR}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
@@ -768,202 +770,210 @@ SOURCE[80]="$SRCDIR/${LOSRC_DIR}/libexttextcat-3.4.5.tar.xz"
 SRCURL[80]="https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"
 GITURI[80]=""
 
-SOURCE[81]="$SRCDIR/${LOSRC_DIR}/libgpg-error-1.27.tar.bz2"
-SRCURL[81]="https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"
+SOURCE[81]="$SRCDIR/${LOSRC_DIR}/libffi-3.3.tar.gz"
+SRCURL[81]="https://dev-www.libreoffice.org/src/libffi-3.3.tar.gz"
 GITURI[81]=""
 
-SOURCE[82]="$SRCDIR/${LOSRC_DIR}/liblangtag-0.6.2.tar.bz2"
-SRCURL[82]="https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"
+SOURCE[82]="$SRCDIR/${LOSRC_DIR}/libgpg-error-1.27.tar.bz2"
+SRCURL[82]="https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"
 GITURI[82]=""
 
-SOURCE[83]="$SRCDIR/${LOSRC_DIR}/libnumbertext-1.0.5.tar.xz"
-SRCURL[83]="https://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"
+SOURCE[83]="$SRCDIR/${LOSRC_DIR}/liblangtag-0.6.2.tar.bz2"
+SRCURL[83]="https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"
 GITURI[83]=""
 
-SOURCE[84]="$SRCDIR/${LOSRC_DIR}/ltm-1.0.zip"
-SRCURL[84]="https://dev-www.libreoffice.org/src/ltm-1.0.zip"
+SOURCE[84]="$SRCDIR/${LOSRC_DIR}/libnumbertext-1.0.5.tar.xz"
+SRCURL[84]="https://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz"
 GITURI[84]=""
 
-SOURCE[85]="$SRCDIR/${LOSRC_DIR}/xmlsec1-1.2.28.tar.gz"
-SRCURL[85]="https://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"
+SOURCE[85]="$SRCDIR/${LOSRC_DIR}/ltm-1.0.zip"
+SRCURL[85]="https://dev-www.libreoffice.org/src/ltm-1.0.zip"
 GITURI[85]=""
 
-SOURCE[86]="$SRCDIR/${LOSRC_DIR}/libxml2-2.9.10.tar.gz"
-SRCURL[86]="https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"
+SOURCE[86]="$SRCDIR/${LOSRC_DIR}/xmlsec1-1.2.28.tar.gz"
+SRCURL[86]="https://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"
 GITURI[86]=""
 
-SOURCE[87]="$SRCDIR/${LOSRC_DIR}/libxslt-1.1.34.tar.gz"
-SRCURL[87]="https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"
+SOURCE[87]="$SRCDIR/${LOSRC_DIR}/libxml2-2.9.10.tar.gz"
+SRCURL[87]="https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"
 GITURI[87]=""
 
-SOURCE[88]="$SRCDIR/${LOSRC_DIR}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
-SRCURL[88]="https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+SOURCE[88]="$SRCDIR/${LOSRC_DIR}/libxslt-1.1.34.tar.gz"
+SRCURL[88]="https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz"
 GITURI[88]=""
 
-SOURCE[89]="$SRCDIR/${LOSRC_DIR}/lxml-4.1.1.tgz"
-SRCURL[89]="https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"
+SOURCE[89]="$SRCDIR/${LOSRC_DIR}/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
+SRCURL[89]="https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"
 GITURI[89]=""
 
-SOURCE[90]="$SRCDIR/${LOSRC_DIR}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
-SRCURL[90]="https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+SOURCE[90]="$SRCDIR/${LOSRC_DIR}/lxml-4.1.1.tgz"
+SRCURL[90]="https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz"
 GITURI[90]=""
 
-SOURCE[91]="$SRCDIR/${LOSRC_DIR}/mdds-1.4.3.tar.bz2"
-SRCURL[91]="https://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2"
+SOURCE[91]="$SRCDIR/${LOSRC_DIR}/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
+SRCURL[91]="https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"
 GITURI[91]=""
 
-SOURCE[92]="$SRCDIR/${LOSRC_DIR}/mDNSResponder-878.200.35.tar.gz"
-SRCURL[92]="https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"
+SOURCE[92]="$SRCDIR/${LOSRC_DIR}/mdds-1.5.0.tar.bz2"
+SRCURL[92]="https://dev-www.libreoffice.org/src/mdds-1.5.0.tar.bz2"
 GITURI[92]=""
 
-SOURCE[93]="$SRCDIR/${LOSRC_DIR}/libmspub-0.1.4.tar.xz"
-SRCURL[93]="https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"
+SOURCE[93]="$SRCDIR/${LOSRC_DIR}/mDNSResponder-878.200.35.tar.gz"
+SRCURL[93]="https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz"
 GITURI[93]=""
 
-SOURCE[94]="$SRCDIR/${LOSRC_DIR}/libmwaw-0.3.15.tar.xz"
-SRCURL[94]="https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"
+SOURCE[94]="$SRCDIR/${LOSRC_DIR}/libmspub-0.1.4.tar.xz"
+SRCURL[94]="https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz"
 GITURI[94]=""
 
-SOURCE[95]="$SRCDIR/${LOSRC_DIR}/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
-SRCURL[95]="https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
+SOURCE[95]="$SRCDIR/${LOSRC_DIR}/libmwaw-0.3.15.tar.xz"
+SRCURL[95]="https://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"
 GITURI[95]=""
 
-SOURCE[96]="$SRCDIR/${LOSRC_DIR}/neon-0.30.2.tar.gz"
-SRCURL[96]="https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"
+SOURCE[96]="$SRCDIR/${LOSRC_DIR}/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
+SRCURL[96]="https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"
 GITURI[96]=""
 
-SOURCE[97]="$SRCDIR/${LOSRC_DIR}/nss-3.45-with-nspr-4.21.tar.gz"
-SRCURL[97]="https://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"
+SOURCE[97]="$SRCDIR/${LOSRC_DIR}/neon-0.30.2.tar.gz"
+SRCURL[97]="https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"
 GITURI[97]=""
 
-SOURCE[98]="$SRCDIR/${LOSRC_DIR}/libodfgen-0.1.6.tar.bz2"
-SRCURL[98]="https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"
+SOURCE[98]="$SRCDIR/${LOSRC_DIR}/nss-3.47.1-with-nspr-4.23.tar.gz"
+SRCURL[98]="https://dev-www.libreoffice.org/src/nss-3.47.1-with-nspr-4.23.tar.gz"
 GITURI[98]=""
 
-SOURCE[99]="$SRCDIR/${LOSRC_DIR}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"
-SRCURL[99]="https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"
+SOURCE[99]="$SRCDIR/${LOSRC_DIR}/libodfgen-0.1.6.tar.bz2"
+SRCURL[99]="https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"
 GITURI[99]=""
 
-SOURCE[100]="$SRCDIR/${LOSRC_DIR}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"
-SRCURL[100]="https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"
+SOURCE[100]="$SRCDIR/${LOSRC_DIR}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"
+SRCURL[100]="https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar"
 GITURI[100]=""
 
-SOURCE[101]="$SRCDIR/${LOSRC_DIR}/openldap-2.4.45.tgz"
-SRCURL[101]="https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"
+SOURCE[101]="$SRCDIR/${LOSRC_DIR}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"
+SRCURL[101]="https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"
 GITURI[101]=""
 
-SOURCE[102]="$SRCDIR/${LOSRC_DIR}/openssl-1.0.2t.tar.gz"
-SRCURL[102]="https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"
+SOURCE[102]="$SRCDIR/${LOSRC_DIR}/openldap-2.4.45.tgz"
+SRCURL[102]="https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"
 GITURI[102]=""
 
-SOURCE[103]="$SRCDIR/${LOSRC_DIR}/liborcus-0.14.1.tar.gz"
-SRCURL[103]="https://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz"
+SOURCE[103]="$SRCDIR/${LOSRC_DIR}/openssl-1.0.2t.tar.gz"
+SRCURL[103]="https://dev-www.libreoffice.org/src/openssl-1.0.2t.tar.gz"
 GITURI[103]=""
 
-SOURCE[104]="$SRCDIR/${LOSRC_DIR}/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"
-SRCURL[104]="https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"
+SOURCE[104]="$SRCDIR/${LOSRC_DIR}/liborcus-0.15.3.tar.gz"
+SRCURL[104]="https://dev-www.libreoffice.org/src/liborcus-0.15.3.tar.gz"
 GITURI[104]=""
 
-SOURCE[105]="$SRCDIR/${LOSRC_DIR}/libpagemaker-0.0.4.tar.xz"
-SRCURL[105]="https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"
+SOURCE[105]="$SRCDIR/${LOSRC_DIR}/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"
+SRCURL[105]="https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"
 GITURI[105]=""
 
-SOURCE[106]="$SRCDIR/${LOSRC_DIR}/pdfium-3794.tar.bz2"
-SRCURL[106]="https://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"
+SOURCE[106]="$SRCDIR/${LOSRC_DIR}/libpagemaker-0.0.4.tar.xz"
+SRCURL[106]="https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"
 GITURI[106]=""
 
-SOURCE[107]="$SRCDIR/${LOSRC_DIR}/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"
-SRCURL[107]="https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"
+SOURCE[107]="$SRCDIR/${LOSRC_DIR}/pdfium-3963.tar.bz2"
+SRCURL[107]="https://dev-www.libreoffice.org/src/pdfium-3963.tar.bz2"
 GITURI[107]=""
 
-SOURCE[108]="$SRCDIR/${LOSRC_DIR}/libpng-1.6.37.tar.xz"
-SRCURL[108]="https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"
+SOURCE[108]="$SRCDIR/${LOSRC_DIR}/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"
+SRCURL[108]="https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"
 GITURI[108]=""
 
-SOURCE[109]="$SRCDIR/${LOSRC_DIR}/poppler-0.82.0.tar.xz"
-SRCURL[109]="https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"
+SOURCE[109]="$SRCDIR/${LOSRC_DIR}/libpng-1.6.37.tar.xz"
+SRCURL[109]="https://dev-www.libreoffice.org/src/libpng-1.6.37.tar.xz"
 GITURI[109]=""
 
-SOURCE[110]="$SRCDIR/${LOSRC_DIR}/postgresql-9.2.24.tar.bz2"
-SRCURL[110]="https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"
+SOURCE[110]="$SRCDIR/${LOSRC_DIR}/poppler-0.82.0.tar.xz"
+SRCURL[110]="https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz"
 GITURI[110]=""
 
-SOURCE[111]="$SRCDIR/${LOSRC_DIR}/Python-3.5.9.tar.xz"
-SRCURL[111]="https://dev-www.libreoffice.org/src/Python-3.5.9.tar.xz"
+SOURCE[111]="$SRCDIR/${LOSRC_DIR}/postgresql-9.2.24.tar.bz2"
+SRCURL[111]="https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2"
 GITURI[111]=""
 
-SOURCE[112]="$SRCDIR/${LOSRC_DIR}/libqxp-0.0.2.tar.xz"
-SRCURL[112]="https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"
+SOURCE[112]="$SRCDIR/${LOSRC_DIR}/Python-3.7.6.tar.xz"
+SRCURL[112]="https://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz"
 GITURI[112]=""
 
-SOURCE[113]="$SRCDIR/${LOSRC_DIR}/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
-SRCURL[113]="https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
+SOURCE[113]="$SRCDIR/${LOSRC_DIR}/QR-Code-generator-1.4.0.tar.gz"
+SRCURL[113]="https://dev-www.libreoffice.org/src/QR-Code-generator-1.4.0.tar.gz"
 GITURI[113]=""
 
-SOURCE[114]="$SRCDIR/${LOSRC_DIR}/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
-SRCURL[114]="https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
+SOURCE[114]="$SRCDIR/${LOSRC_DIR}/libqxp-0.0.2.tar.xz"
+SRCURL[114]="https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz"
 GITURI[114]=""
 
-SOURCE[115]="$SRCDIR/${LOSRC_DIR}/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
-SRCURL[115]="https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
+SOURCE[115]="$SRCDIR/${LOSRC_DIR}/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
+SRCURL[115]="https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz"
 GITURI[115]=""
 
-SOURCE[116]="$SRCDIR/${LOSRC_DIR}/librevenge-0.0.4.tar.bz2"
-SRCURL[116]="https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"
+SOURCE[116]="$SRCDIR/${LOSRC_DIR}/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
+SRCURL[116]="https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz"
 GITURI[116]=""
 
-SOURCE[117]="$SRCDIR/${LOSRC_DIR}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
-SRCURL[117]="https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+SOURCE[117]="$SRCDIR/${LOSRC_DIR}/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
+SRCURL[117]="https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
 GITURI[117]=""
 
-SOURCE[118]="$SRCDIR/${LOSRC_DIR}/serf-1.2.1.tar.bz2"
-SRCURL[118]="https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"
+SOURCE[118]="$SRCDIR/${LOSRC_DIR}/librevenge-0.0.4.tar.bz2"
+SRCURL[118]="https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"
 GITURI[118]=""
 
-SOURCE[119]="$SRCDIR/${LOSRC_DIR}/libstaroffice-0.0.6.tar.xz"
-SRCURL[119]="https://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"
+SOURCE[119]="$SRCDIR/${LOSRC_DIR}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
+SRCURL[119]="https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
 GITURI[119]=""
 
-SOURCE[120]="$SRCDIR/${LOSRC_DIR}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
-SRCURL[120]="https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+SOURCE[120]="$SRCDIR/${LOSRC_DIR}/serf-1.2.1.tar.bz2"
+SRCURL[120]="https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"
 GITURI[120]=""
 
-SOURCE[121]="$SRCDIR/${LOSRC_DIR}/twaindsm_2.4.1.orig.tar.gz"
-SRCURL[121]="https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"
+SOURCE[121]="$SRCDIR/${LOSRC_DIR}/libstaroffice-0.0.6.tar.xz"
+SRCURL[121]="https://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz"
 GITURI[121]=""
 
-SOURCE[122]="$SRCDIR/${LOSRC_DIR}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
-SRCURL[122]="https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
+SOURCE[122]="$SRCDIR/${LOSRC_DIR}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+SRCURL[122]="https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 GITURI[122]=""
 
-SOURCE[123]="$SRCDIR/${LOSRC_DIR}/libvisio-0.1.7.tar.xz"
-SRCURL[123]="https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"
+SOURCE[123]="$SRCDIR/${LOSRC_DIR}/twaindsm_2.4.1.orig.tar.gz"
+SRCURL[123]="https://dev-www.libreoffice.org/src/twaindsm_2.4.1.orig.tar.gz"
 GITURI[123]=""
 
-SOURCE[124]="$SRCDIR/${LOSRC_DIR}/libwpd-0.10.3.tar.xz"
-SRCURL[124]="https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"
+SOURCE[124]="$SRCDIR/${LOSRC_DIR}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
+SRCURL[124]="https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"
 GITURI[124]=""
 
-SOURCE[125]="$SRCDIR/${LOSRC_DIR}/libwpg-0.3.3.tar.xz"
-SRCURL[125]="https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"
+SOURCE[125]="$SRCDIR/${LOSRC_DIR}/libvisio-0.1.7.tar.xz"
+SRCURL[125]="https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"
 GITURI[125]=""
 
-SOURCE[126]="$SRCDIR/${LOSRC_DIR}/libwps-0.4.10.tar.xz"
-SRCURL[126]="https://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"
+SOURCE[126]="$SRCDIR/${LOSRC_DIR}/libwpd-0.10.3.tar.xz"
+SRCURL[126]="https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz"
 GITURI[126]=""
 
-SOURCE[127]="$SRCDIR/${LOSRC_DIR}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
-SRCURL[127]="https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+SOURCE[127]="$SRCDIR/${LOSRC_DIR}/libwpg-0.3.3.tar.xz"
+SRCURL[127]="https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"
 GITURI[127]=""
 
-SOURCE[128]="$SRCDIR/${LOSRC_DIR}/zlib-1.2.11.tar.xz"
-SRCURL[128]="https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"
+SOURCE[128]="$SRCDIR/${LOSRC_DIR}/libwps-0.4.10.tar.xz"
+SRCURL[128]="https://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz"
 GITURI[128]=""
 
-SOURCE[129]="$SRCDIR/${LOSRC_DIR}/libzmf-0.0.2.tar.xz"
-SRCURL[129]="https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"
+SOURCE[129]="$SRCDIR/${LOSRC_DIR}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
+SRCURL[129]="https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
 GITURI[129]=""
 
+SOURCE[130]="$SRCDIR/${LOSRC_DIR}/zlib-1.2.11.tar.xz"
+SRCURL[130]="https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"
+GITURI[130]=""
+
+SOURCE[131]="$SRCDIR/${LOSRC_DIR}/libzmf-0.0.2.tar.xz"
+SRCURL[131]="https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"
+GITURI[131]=""
+
 # --- End of section generated by gensrc.sh ---
 
 # Use the src_checkout() function if no downloadable tarball exists.
@@ -1188,10 +1198,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 libfreehand compile against icu4c-65.1:
-  cp $SRCDIR/patches/libfreehand_icu_65.1.patch external/libfreehand/
-  echo '$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, external/libfreehand/libfreehand_icu_65.1.patch))' \
-    >> external/libfreehand/UnpackedTarball_libfreehand.mk
+  ## Make libfreehand compile against icu4c-65.1:
+  #cp $SRCDIR/patches/libfreehand_icu_65.1.patch external/libfreehand/
+  #echo '$(eval $(call gb_UnpackedTarball_add_patches,libfreehand, external/libfreehand/libfreehand_icu_65.1.patch))' \
+  #  >> external/libfreehand/UnpackedTarball_libfreehand.mk
 fi
 
 if [ "${USE_LOVER}" == "yes" ]; then
@@ -1211,23 +1221,17 @@ fi
 # Note about KDE5: you'll need the Frameworks packages, nothing more,
 # but 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:
+KDEOPTS="--disable-kf5 --disable-gtk3-kde5"
+QTOPTS="--disable-qt5"
 if [ "${ADD_KDE5}" = "YES" ]; then
-  KDEOPTS="--enable-kde5 --enable-gtk3-kde5"
-else
-  KDEOPTS="--disable-kde5 --disable-gtk3-kde5"
-fi
-# Add Qt5 related arguments:
-if $(pkg-config Qt5Core --exists) ; then
-  QTOPTS="--enable-qt5"
-  unset CPLUS_INCLUDE_PATH
-  unset QT4DIR
-  export QTDIR="/usr/lib${LIBDIRSUFFIX}/qt5"
-else
-  QTOPTS="--disable-qt5"
+  if $(pkg-config Qt5Core --exists) ; then
+    KDEOPTS="--enable-kf5 --enable-gtk3-kde5"
+    QTOPTS="--enable-qt5"
+    unset CPLUS_INCLUDE_PATH
+    unset QT4DIR
+    export QTDIR="/usr/lib${LIBDIRSUFFIX}/qt5"
+  fi
 fi
 
 # If graphite2 is installed we can use the system harfbuzz:
@@ -1240,11 +1244,11 @@ else
                  --without-system-harfbuzz "
 fi
 
-# Determine whether we will use gstreamer 0,10 or 1.0:
+# Determine whether we can use gstreamer 1.0:
 if /usr/bin/pkg-config --exists gstreamer-1.0 ; then
-  GSTOPTS="--disable-gstreamer-0-10 --enable-gstreamer-1-0"
+  GSTOPTS="--enable-gstreamer-1-0"
 else
-  GSTOPTS="--enable-gstreamer-0-10 --disable-gstreamer-1-0"
+  GSTOPTS="--disable-gstreamer-1-0"
 fi
 
 ## Do not build postgresql-sdbc on -current with its new openssl-1.1:
@@ -1303,6 +1307,9 @@ else
   LANGUAGES="${DEF_LANG} $(echo ${ADD_LANGUAGES} |sed -e "s/${DEF_LANG} *//")"
 fi
 
+# We need to set this to be able to build an internal python3 interpreter:
+export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata_m_linux_${TARGET}-gnu"
+
 # Don't build localized help which is not translated (taken from Fedora):
 POORHELPS=$(ls -d translations/source/*/helpcontent2 translations/source/*|cut -f 3 -d /|sort|uniq -u|xargs)
 # Don't build localized help which is poorly translated:
@@ -1376,6 +1383,7 @@ autoconf -v
   --without-system-libvisio \
   --without-system-mdds \
   --without-system-poppler \
+  --without-system-qrcodegen \
   --without-system-redland \
   --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
@@ -1496,7 +1504,9 @@ if [ "${ADD_KDE5}" = "YES" ]; then
   # have a choice to leave these libraries out:
   echo "Starting split-off of KDE integration libraries from main $PRGNAM package..."
   mkdir -p $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program
-  for KDEFILE in libvclplug*kde*lo.so libkde*be1lo.so lo_kde*filepicker ; do
+  for KDEFILE in \
+   libvclplug*qt5*lo.so libvclplug*k*5*lo.so libk*5*be1lo.so lo_k*5*filepicker ;
+  do
     mv $PKG/usr/lib${LIBDIRSUFFIX}/libreoffice/program/${KDEFILE} \
       $TMP/package-${PRGNAM}-kde-integration/usr/lib${LIBDIRSUFFIX}/libreoffice/program/
   done