libreoffice: update to 6.1.2

1 files changed, 18 insertions, 16 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 30f738ca..16a99dc7 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -275,6 +275,8 @@
 #             * Update.
 # 6.1.0-1:    16/aug/2018 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 6.1.2-1:    03/oct/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 .
@@ -317,8 +319,8 @@ fi
 #SRCVER=${SRCVER:-5.0.0.2git}
 #SRCVER=${SRCVER:-5.0.0.2}
 
-SRCVER=${SRCVER:-6.1.0}
-SUBVER=".3"
+SRCVER=${SRCVER:-6.1.2}
+SUBVER=".1"
 PKG_SUBVER=""
 
 # Under what directory will the script download all sources:
@@ -448,7 +450,7 @@ GITURI[5]=""
 #
 
 # --- Start of section generated by gensrc.sh ---
-# External sources for libreoffice-6.1.0.3
+# External sources for libreoffice-6.1.2.1
 
 SOURCE[6]="$SRCDIR/${LOSRC_DIR}/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -514,8 +516,8 @@ SOURCE[21]="$SRCDIR/${LOSRC_DIR}/1f467e5bb703f12cbbb09d5cf67ecf4a-converttextton
 SRCURL[21]="https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"
 GITURI[21]=""
 
-SOURCE[22]="$SRCDIR/${LOSRC_DIR}/curl-7.60.0.tar.gz"
-SRCURL[22]="https://dev-www.libreoffice.org/src/curl-7.60.0.tar.gz"
+SOURCE[22]="$SRCDIR/${LOSRC_DIR}/curl-7.61.1.tar.gz"
+SRCURL[22]="https://dev-www.libreoffice.org/src/curl-7.61.1.tar.gz"
 GITURI[22]=""
 
 SOURCE[23]="$SRCDIR/${LOSRC_DIR}/libe-book-0.1.3.tar.xz"
@@ -642,8 +644,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.4.tar.bz2"
-SRCURL[54]="https://dev-www.libreoffice.org/src/harfbuzz-1.7.4.tar.bz2"
+SOURCE[54]="$SRCDIR/${LOSRC_DIR}/harfbuzz-1.8.4.tar.bz2"
+SRCURL[54]="https://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"
 GITURI[54]=""
 
 SOURCE[55]="$SRCDIR/${LOSRC_DIR}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
@@ -810,8 +812,8 @@ 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}/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"
+SOURCE[96]="$SRCDIR/${LOSRC_DIR}/nss-3.38-with-nspr-4.19.tar.gz"
+SRCURL[96]="https://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz"
 GITURI[96]=""
 
 SOURCE[97]="$SRCDIR/${LOSRC_DIR}/libodfgen-0.1.6.tar.bz2"
@@ -830,8 +832,8 @@ 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}/openssl-1.0.2o.tar.gz"
-SRCURL[101]="https://dev-www.libreoffice.org/src/openssl-1.0.2o.tar.gz"
+SOURCE[101]="$SRCDIR/${LOSRC_DIR}/openssl-1.0.2p.tar.gz"
+SRCURL[101]="https://dev-www.libreoffice.org/src/openssl-1.0.2p.tar.gz"
 GITURI[101]=""
 
 SOURCE[102]="$SRCDIR/${LOSRC_DIR}/liborcus-0.13.4.tar.gz"
@@ -1163,10 +1165,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 \\\\"
+  ## 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
@@ -1310,7 +1312,7 @@ autoconf -v
   --with-external-hyph-dir=/usr/share/hyphen \
   --with-external-thes-dir=/usr/share/mythes \
   --with-fonts \
-  --with-help \
+  --with-help=html \
   --with-jdk-home=$JAVA_HOME \
   --with-system-boost \
   --with-system-cairo \