libreoffice: had some issues on -current with openssl-1.1 and gpgmepp headers

I have not been able to fix the former, but the latter could be resolved by re-installing gpgme

1 files changed, 23 insertions, 12 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index f64221aa..a7174783 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -1132,6 +1132,13 @@ if [ "$P1" != "--oldbuild" ]; then
   # Add support for KDE5 destop session:
   cat $SRCDIR/patches/libreoffice.kde5_mailer.patch \
     | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+  ### Rather. I will disable postgresql-sdbc for -current,
+  #  because I can not get it to compile against openssl-1.1 at all...
+  #if openssl-1.0 version 1>/dev/null 2>/dev/null ; then
+  #  # Compile postgresql against openssl-1.0:
+  #  cat $SRCDIR/patches/postgresql_openssl10.patch | sed -e "s/@LIBDIRSUFFIX@/$LIBDIRSUFFIX/" \
+  #    | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
+  #fi
 fi
 
 if [ "${USE_LOVER}" == "yes" ]; then
@@ -1167,21 +1174,25 @@ else
   GSTOPTS="--enable-gstreamer-0-10 --disable-gstreamer-1-0"
 fi
 
+# Do not build postgresql-sdbc on -current with its new openssl-1.1:
+if openssl-1.0 version 1>/dev/null 2>/dev/null ; then
+  POSTGRESQLOPTS="--disable-postgresql-sdbc"
+else
+  POSTGRESQLOPTS=""
+fi
+
 # Causes a lot of trouble otherwise:
 if ! which gpgme-config 1>/dev/null 2>/dev/null ; then
   GPGMEOPTS="--without-system-gpgmepp"
-  SLKGPGMELDFLAGS=""
+  SLKGPGMELDFLAGS="-L${BUILDDIR}/instdir/program -lgpgmepp -lgpgme -lassuan -lgpg-error"
 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
+  SLKGPGMELDFLAGS="-L${BUILDDIR}/instdir/program -lgpgmepp -lgpgme -lassuan -lgpg-error"
+else
   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:
@@ -1190,12 +1201,15 @@ export OOInstall="/usr/lib${LIBDIRSUFFIX}/libreoffice"
 export OODESTDIR="$PKG"
 
 # Regular build flags:
-#export LDFLAGS="-lboost_system -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"
 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:
@@ -1227,10 +1241,6 @@ fi
 # Never hurts:
 aclocal -I m4
 autoconf -v
-
-## Do not run autogen.sh on make:
-#touch autogen.lastrun
-#./configure \
 ./autogen.sh \
   --prefix=/usr \
   --docdir=/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} \
@@ -1247,6 +1257,7 @@ autoconf -v
   ${KDEOPTS} \
   ${GDRIVEOPTS} \
   ${GPGMEOPTS} \
+  ${POSTGRESQLOPTS} \
   --enable-dbus \
   --enable-eot \
   --enable-epm \
@@ -1273,8 +1284,8 @@ autoconf -v
   --with-system-icu \
   --with-system-neon \
   --with-system-nss \
-  --with-system-openssl \
   --with-system-libxml \
+  --with-system-openssl \
   --with-system-zlib \
   --with-x \
   --without-gssapi \