One less tarball; python must be version 3 so we need to build an internal version of it; use npapi headers instead of seamonkey; fix several parameters to the autogen/configure script; let LO determine by itself how many parallel jobs are possible

1 files changed, 13 insertions, 19 deletions

diff --git a/libreoffice/build/libreoffice41.SlackBuild b/libreoffice/build/libreoffice41.SlackBuild
index 168ed80f..409657a9 100755
--- a/libreoffice/build/libreoffice41.SlackBuild
+++ b/libreoffice/build/libreoffice41.SlackBuild
@@ -165,6 +165,9 @@ TAG=${TAG:-alien}
 SRCVER=${SRCVER:-4.0.0}
 SUBVER=".2"
 
+# How many tarballs does this release consist of:
+LO_TARBALLS=4
+
 # If we pull a git shapshot, use today's date as the VERSION:
 # If we are building offline, we do not want git checks:
 if [ "$SRCVER" = "HEAD" ]; then
@@ -183,8 +186,6 @@ fi
 
 DOCS="AUTHORS COPYING* MAINTAINERS NEWS README* TODO"
 
-NUMCPUS=${NUMCPUS:-2}
-
 PACKAGER="Eric Hameleers"
 
 # Where do we look for sources?
@@ -701,32 +702,26 @@ echo "++"
 cd $TMP/tmp-$PRGNAM
 if [ "$P1" != "--oldbuild" ]; then
   echo "Extracting source archive(s) for $PRGNAM..."
-  for (( i = 0; i < 5; i++ )) ; do
+  for (( i = 0; i < ${LO_TARBALLS}; i++ )) ; do
     echo -n " ."
     tar -xf ${SOURCE[$i]}
   done
   echo ""
   # Remove multiple git-hooks directories:
   find . -name git-hooks -type d -depth -exec rm -rf {} \;
-  # Add all sources together for a bootstrap build:
-  #mkdir build
-  # The build is done from within the core sice 3.5:
-  mv libreoffice-core-* build
-  for SUBDIR in libreoffice-*/* ; do mv $(pwd)/$SUBDIR build/ ; done
 
-  echo "Copying all external archives into src directory for $PRGNAM..."
+  echo "Symlinking all external archives into src directory for $PRGNAM..."
   mkdir -p extsrc
-  for (( i = 5; i < ${#SOURCE[*]}; i++ )) ; do
+  for (( i = ${LO_TARBALLS}; i < ${#SOURCE[*]}; i++ )) ; do
     ln -sf ${SOURCE[$i]} extsrc/
   done
-  #touch src.downloaded
 fi
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
 
 # Enter the build directory:
-cd $TMP/tmp-$PRGNAM/build
+cd $TMP/tmp-$PRGNAM/libreoffice-${VERSION}${SUBVER}
 
 echo Building ...
 
@@ -823,7 +818,6 @@ esac
   --with-docdir=/usr/doc/$PRGNAM-${LOVER}$VERSION \
   --with-install-dirname=$PRGNAM \
   --with-lang="$(echo ${LANGUAGES} |tr _ -)" \
-  --with-num-cpus=${NUMCPUS} \
   --without-binsuffix \
   --with-external-tar="$TMP/tmp-$PRGNAM/extsrc" \
   ${GITOPTS} \
@@ -839,15 +833,15 @@ esac
   --disable-pam \
   --disable-pam-link \
   --disable-post-install-scripts \
-  --enable-binfilter \
   --enable-cairo \
   --enable-crypt-link \
   --enable-dbus \
   --enable-ext-nlpsolver \
   --enable-ext-presenter-minimizer \
   --enable-ext-report-builder \
-  --enable-ext-scripting-beanshell \
-  --enable-ext-scripting-javascript \
+  --enable-hardlink-deliver \
+  --enable-scripting-beanshell \
+  --enable-scripting-javascript \
   --enable-ext-wiki-publisher \
   --enable-gstreamer \
   --enable-hids \
@@ -857,7 +851,7 @@ esac
   --enable-ogltrans \
   --enable-opengl \
   --enable-openxml \
-  --enable-python=system \
+  --enable-python=internal \
   --enable-randr-link \
   --enable-release-build \
   --enable-symbols \
@@ -885,13 +879,12 @@ esac
   --with-system-libxml \
   --with-system-libxslt \
   --with-system-mesa-headers \
-  --with-system-mozilla=seamonkey \
   --with-system-mysql \
   --with-system-neon \
+  --with-system-npapi-headers \
   --with-system-nss \
   --with-system-openssl \
   --with-system-poppler \
-  --with-system-python \
   --with-system-redland \
   --with-system-stdlibs \
   --with-system-zlib \
@@ -905,6 +898,7 @@ esac
   --without-system-jars \
   --without-system-libtextcat \
   --without-system-libvisio \
+  --without-system-python \
   --without-system-sampleicc \
   --without-system-servlet-api \
   --without-unix-wrapper \