libreoffice: this compiles on 64bit -current

1 files changed, 23 insertions, 15 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 096f125d..dce9a8a0 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -1149,6 +1149,10 @@ fi
 # Check for an installed KDE4 and assume Qt4:
 KDEDIRS=${KDEDIRS:-""}  # to avoid "KDEDIRS: unbound variable"
 if [ ! -z "$KDEDIRS" ]; then
+  ## Stupid but what can I do... LibreOffice detection routines suck:
+  #export KDE4DIR="$KDEDIRS"
+  #export QT4INC="$QT4DIR/include $QT4DIR/include/QtCore"
+  #export QT4LIB="$QT4DIR/lib${LIBDIRSUFFIX}"
   KDEOPTS="--enable-kde4"
 else
   KDEOPTS="--disable-kde4"
@@ -1162,7 +1166,17 @@ else
 fi
 
 # Causes a lot of trouble otherwise:
-GPGMEOPTS="--without-system-gpgmepp"
+if ! which gpgme-config 1>/dev/null 2>/dev/null ; then
+  GPGMEOPTS="--without-system-gpgmepp"
+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"
+elif [ "$ARCH" = "x86_64" ]; then
+  echo "Using system gpgme"
+  GPGMEOPTS="--with-system-gpgmepp"
+else
+  GPGMEOPTS="--without-system-gpgmepp"
+fi
 
 # Make it install into proper directories:
 export OOInBase="/usr/lib${LIBDIRSUFFIX}/libreoffice"
@@ -1170,8 +1184,9 @@ 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 CXXFLAGS="$SLKCFLAGS"
+#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 CXXFLAGS="$(pkg-config --cflags QtCore) $SLKCFLAGS"
 export CFLAGS="$SLKCFLAGS"
 export CPPFLAGS="-DU_USING_ICU_NAMESPACE=1"
 export HARFBUZZ_LIBS="-lharfbuzz-icu -lharfbuzz"
@@ -1203,20 +1218,14 @@ else
   GITOPTS="--disable-fetch-external" 
 fi
 
-case "$ARCH" in 
-  arm*)
-    ARCHOPTS="--disable-postgresql-sdbc " ;;
-  *)
-    ARCHOPTS=" " ;;
-esac
-
 # Never hurts:
 aclocal -I m4
 autoconf -v
 
-# Do not run autogen.sh on make:
-touch autogen.lastrun
-./configure \
+## Do not run autogen.sh on make:
+#touch autogen.lastrun
+#./configure \
+./autogen.sh \
   --prefix=/usr \
   --docdir=/usr/doc/$PRGNAM-${LOVER}${VERSION}${PKG_SUBVER} \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -1230,7 +1239,6 @@ touch autogen.lastrun
   ${GITOPTS} \
   ${GSTOPTS} \
   ${KDEOPTS} \
-  ${ARCHOPTS} \
   ${GDRIVEOPTS} \
   ${GPGMEOPTS} \
   --enable-dbus \
@@ -1252,7 +1260,6 @@ touch autogen.lastrun
   --with-fonts \
   --with-help \
   --with-jdk-home=$JAVA_HOME \
-  --with-system-boost \
   --with-system-cairo \
   --with-system-curl \
   --with-system-dicts \
@@ -1268,6 +1275,7 @@ touch autogen.lastrun
   --without-junit \
   --without-krb5 \
   --without-myspell-dicts \
+  --without-system-boost \
   --without-system-harfbuzz \
   --without-system-jars \
   --without-system-jpeg \