libreoffice: fix gensrc.sh, no more hack needed to fix output

1 files changed, 3 insertions, 7 deletions

diff --git a/libreoffice/build/gensrc.sh b/libreoffice/build/gensrc.sh
index eebba686..47557c10 100755
--- a/libreoffice/build/gensrc.sh
+++ b/libreoffice/build/gensrc.sh
@@ -4,9 +4,7 @@ PRGNAM=libreoffice
 VERSION=7.3.0
 SUBVER=.3
 
-#STARTINDEX=6
-# Hopefully temporary, delete element '[4]' and '[5]' afterwards:
-STARTINDEX=4
+STARTINDEX=6
 
 III=$STARTINDEX
 
@@ -23,10 +21,8 @@ wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/cor
 wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=$(echo $PRGNAM-$VERSION$SUBVER)" > $TMP_FETCH
 
 # Get the names of the tarballs we need:
-eval $( wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/configure.ac?id=$(echo $PRGNAM-$VERSION$SUBVER)" | grep UNOWINREG_DLL= )
-eval $( wget --no-check-certificate -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/configure.ac?id=$(echo $PRGNAM-$VERSION$SUBVER)" | grep OPENSYMBOL_TTF= )
 echo "all:"  >> $TMP_DLLST
-cat $TMP_DLLST | grep -v " *#" | grep -w export | grep -E '(_TARBALL|_JAR)' | cut -f2 -d' ' | cut -f1 -d= | sed -e 's/.*/\t&=$(&)'/  >> $TMP_DLLST
+cat $TMP_DLLST | grep -v " *#" | grep -w export | grep -E '(_TARBALL|_JAR|_TTF)' | cut -f2 -d' ' | cut -f1 -d= | sed -e 's/.*/\t&=$(&)'/  >> $TMP_DLLST
 eval $(make HAVE_JAVA6=TRUE -f $TMP_DLLST)
 
 # Find the download site for a given tarball:
@@ -34,7 +30,7 @@ find_url() {
   cat $TMP_FETCH | sed -n "/$1/,/fetch_Download_item/s/^.*fetch_Download_item[^,]*,\([^,]*\),.*$/\1/p"
 }
 
-for BALL in UNOWINREG_DLL  OPENSYMBOL_TTF $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep -E '(_TARBALL|_JAR)' | cut -f2 -d' ' | cut -f1 -d= ); do
+for BALL in OPENSYMBOL_TTF $( cat $TMP_DLLST | grep -v " *#" | grep -w export | grep -E '(_TARBALL|_JAR)' | cut -f2 -d' ' | cut -f1 -d= ); do
 
   SRCURL=$(find_url $BALL)
   FILE=$(eval "echo \$$BALL")