libreoffice: updated to 6.0.4

1 files changed, 16 insertions, 10 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 7d4c7a5b..4740fb3a 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -255,18 +255,20 @@
 #             * Rebuilt for slackware-current.
 # 5.4.4-2:    20/dec/2017 by Eric Hameleers <alien@slackware.com>
 #             * Update.
-# 6.0.0-1:    07/feb/2017 by Eric Hameleers <alien@slackware.com>
+# 6.0.0-1:    07/feb/2018 by Eric Hameleers <alien@slackware.com>
 #             * New major release!
-# 6.0.1-1:    10/feb/2017 by Eric Hameleers <alien@slackware.com>
+# 6.0.1-1:    10/feb/2018 by Eric Hameleers <alien@slackware.com>
 #             * Bugfix release.
-# 6.0.2-1:    04/mar/2017 by Eric Hameleers <alien@slackware.com>
+# 6.0.2-1:    04/mar/2018 by Eric Hameleers <alien@slackware.com>
 #             * Update.
-# 6.0.3-1:    28/mar/2017 by Eric Hameleers <alien@slackware.com>
+# 6.0.3-1:    28/mar/2018 by Eric Hameleers <alien@slackware.com>
 #             * Update.
-# 6.0.3-2:    01/apr/2017 by Eric Hameleers <alien@slackware.com>
+# 6.0.3-2:    01/apr/2018 by Eric Hameleers <alien@slackware.com>
 #             * Rebuilt because of shared library updates in -current.
-# 6.0.3-3:    01/apr/2017 by Eric Hameleers <alien@slackware.com>
+# 6.0.3-3:    01/apr/2018 by Eric Hameleers <alien@slackware.com>
 #             * Rebuilt because of shared library updates in -current.
+# 6.0.4-1:    09/may/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 .
@@ -282,7 +284,7 @@ PRGNAM3=dict
 PRGNAM4=sdkdoc
 PRGNAM5=kde-integration
 
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
 # SRCVER is the variable you control. It can be one of:
@@ -297,7 +299,7 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-5.0.0.2git}
 #SRCVER=${SRCVER:-5.0.0.2}
 
-SRCVER=${SRCVER:-6.0.3}
+SRCVER=${SRCVER:-6.0.4}
 SUBVER=".2"
 PKG_SUBVER=""
 
@@ -427,7 +429,7 @@ GITURI[5]=""
 #
 
 # --- Start of section generated by gensrc.sh ---
-# External sources for libreoffice-6.0.3.2
+# External sources for libreoffice-6.0.4.2
 
 SOURCE[6]="$SRCDIR/${LOSRC_DIR}/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
 SRCURL[6]="https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
@@ -1168,14 +1170,18 @@ fi
 # Causes a lot of trouble otherwise:
 if ! which gpgme-config 1>/dev/null 2>/dev/null ; then
   GPGMEOPTS="--without-system-gpgmepp"
+  SLKGPGMELDFLAGS=""
 elif [ $(gpgme-config --version |cut -d. -f1) -eq 1 -a $(gpgme-config --version |cut -d. -f2) -lt 9 ]; then
   # gpgme < 1.9.0 so don't use the system libs:
   GPGMEOPTS="--without-system-gpgmepp"
+  SLKGPGMELDFLAGS=""
 elif [ "$ARCH" = "x86_64" ]; then
   echo "Using system gpgme"
   GPGMEOPTS="--with-system-gpgmepp"
+  SLKGPGMELDFLAGS="$(gpgme-config --libs)"
 else
   GPGMEOPTS="--without-system-gpgmepp"
+  SLKGPGMELDFLAGS=""
 fi
 
 # Make it install into proper directories:
@@ -1185,7 +1191,7 @@ export OODESTDIR="$PKG"
 
 # Regular build flags:
 #export LDFLAGS="-lboost_system -Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ $SLKLDFLAGS"
-export LDFLAGS="$(gpgme-config --libs) -Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ $SLKLDFLAGS"
+export LDFLAGS="${SLKGPGMELDFLAGS} -Wl,-rpath,/usr/lib${LIBDIRSUFFIX}/libreoffice/program/ $SLKLDFLAGS"
 export CXXFLAGS="$(pkg-config --cflags QtCore) $SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
 export CPPFLAGS="-DU_USING_ICU_NAMESPACE=1"