libreoffice: make it compile and run on Slackware 14.2

1 files changed, 26 insertions, 14 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index e1ba2ce1..f16b301a 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -29,11 +29,14 @@
 # Descr:      free office suite
 # URL:        http://www.libreoffice.org/
 # Needs:      
-# Build-time: apache-ant,jdk8,perl-archive-zip
+# Build-time: perl-archive-zip
+#             jdk9, apache-ant if you need Java support, disabled by default.
 #             Reinstall gpgme because its headers may have been overwritten
 #             by kdepimlibs4...
-#             (and for Slackware 13.37, you need to install mozilla-nss and
-#              also upgrade to the seamonkey and seamonkey-solibs in /patches !)
+#             (for Slackware 14.2 you need to upgrade gcc to the 9.2.0 version
+#              in 'unsupported' and you can revert back to 5.5.0 after
+#              compilation is completed. You also need to compile/upgrade to
+#              the version of gperf as found in Slackware 15.0)
 # Changelog:
 # 20101010-1: 10/oct/2010 by Eric Hameleers <alien@slackware.com>
 #             * Initial build from git. I will refine this SlackBuild, once a
@@ -314,6 +317,8 @@
 #             * Update.
 # 7.0.0-1:    09/aug/2020 by Eric Hameleers <alien@slackware.com>
 #             * New major release!
+# 7.x.x-1:    xx/xxx/2020 by Eric Hameleers <alien@slackware.com>
+#             * Make it compile and run on Slackware 14.2.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -1206,9 +1211,6 @@ echo Building ...
 # Apply our own (or borrowed) patches.
 if [ "$P1" != "--oldbuild" ]; then
   touch $OUTPUT/patch-$PRGNAM.log
-  # Allow building with '--with-system-icu --without-system-harfbuzz'
-  cat $SRCDIR/patches/libreoffice5.harfbuzz-icu.patch \
-    | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
   # Add support for KDE5 destop session:
   cat $SRCDIR/patches/libreoffice.kde5_mailer.patch \
     | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
@@ -1253,11 +1255,14 @@ fi
 
 # If graphite2 is installed we can use the system harfbuzz:
 if /usr/bin/pkg-config --exists graphite2 ; then
-  HARFBUZZOPTS=" --with-system-icu \
+  HARFBUZZOPTS=" --with-system-boost \
+                 --with-system-icu \
                  --with-system-graphite \
                  --with-system-harfbuzz "
 else
-  HARFBUZZOPTS=" --with-system-icu \
+  HARFBUZZOPTS=" --without-system-boost \
+                 --without-system-icu \
+                 --without-system-graphite \
                  --without-system-harfbuzz "
 fi
 
@@ -1304,11 +1309,6 @@ else
 fi
 export CFLAGS="$SLKCFLAGS"
 export CPPFLAGS="-DU_USING_ICU_NAMESPACE=1"
-export HARFBUZZ_LIBS="-lharfbuzz-icu -lharfbuzz"
-#if openssl-1.0 version 1>/dev/null 2>/dev/null ; then
-#  export OPENSSL_CFLAGS="-I/usr/include/openssl-1.0"
-#  export OPENSSL_LIBS="-L/usr/lib${LIBDIRSUFFIX}/openssl-1.0"
-#fi
 
 # If this local directory does not exist during configuration,
 # support for Open Clip Art will be disabled:
@@ -1378,7 +1378,6 @@ autoconf -v
   --with-external-thes-dir=/usr/share/mythes \
   --with-fonts \
   --with-help=html \
-  --with-system-boost \
   --with-system-cairo \
   --with-system-curl \
   --with-system-dicts \
@@ -1840,6 +1839,19 @@ for file in $(ls $SRCDIR/profile.d/${PRGNAM}*) ; do
 done
 chmod 755 $PKG/etc/profile.d/*
 
+# On Slackware older than 14.2+, also copy the libstdc++.so into the package,
+# because the LibreOffice binaries will depend on it and a default Slackware
+# will not contain this newer version (we use a newer version of gcc
+# to compile libreoffice):
+if [ -n "$(grep ^[^+]*$ /etc/slackware-version)" ]; then
+  if [ $(cat /etc/slackware-version |cut -d' ' -f2 |cut -d. -f1) -le 14 ]; then
+    GLIBCXXLIB=$(readlink -f /usr/lib${LIBDIRSUFFIX}/libstdc++.so.6)
+    cp -ia $GLIBCXXLIB $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/program/
+    ln -s $(basename $GLIBCXXLIB) \
+      $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/program/libstdc++.so.6
+  fi
+fi
+
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;