summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-02-13 22:39:33 +0000
committer Eric Hameleers <alien@slackware.com>2015-02-13 22:39:33 +0000
commit3218590a6fab84b6cb11189fcaa44bcc221279af (patch)
tree2e5f68bb3e60b18a103f747bf7f141ea83a0d6ee
parent78260df51e9acbaaeafee260d98f1572a35d8dc8 (diff)
downloadasb-3218590a6fab84b6cb11189fcaa44bcc221279af.tar.gz
asb-3218590a6fab84b6cb11189fcaa44bcc221279af.tar.xz
libreoffice: fix the check on missing source tarballs
-rwxr-xr-xlibreoffice/build/libreoffice.SlackBuild11
1 files changed, 6 insertions, 5 deletions
diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 56232628..89fcf55d 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -335,10 +335,6 @@ SRCURL[5]="http://cgit.freedesktop.org/libreoffice/core/plain/Makefile.fetch?id=
# Extra libraries / binaries required to build LibreOffice from source:
# Lots of tarballs of which I am not sure which one are really needed...
#
-# A quick way to find if the array needs editing is to run this command
-# (it should output nothing):
-# for FILE in `wget -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/ooo.lst.in?id=$(echo $PRGNAM-$VERSION$SUBVER)" |grep -v "^http://"` |grep -v "^@" ; do if [ ! -f sources/$FILE ]; then echo $FILE; fi ; done;
-#
# --- Start of section generated by gensrc.sh ---
# External sources for libreoffice-4.4.0.3
@@ -816,7 +812,12 @@ echo "** Since they will not be downloaded when LibreOffice starts compiling,"
echo "** you may run into problems later."
echo "** NOTE: this indicates that this SlackBuild needs to be updated."
echo "-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-"
-for FILE in $(wget -q -O - "http://cgit.freedesktop.org/libreoffice/core/tree/download.lst?id=$PRGNAM-$VERSION$SUBVER" | grep "^export " | grep _TARBALL | grep -v "filter " |grep -v "MOZ_ZIP" | cut -d' ' -f4) ; do if [ ! -f $SRCDIR/sources/$FILE ]; then echo $FILE; fi ; done;
+TMP_DLLST=$(mktemp -t lo_XXXXXX)
+wget -q -O - "http://cgit.freedesktop.org/libreoffice/core/plain/download.lst?id=$(echo $PRGNAM-$VERSION$SUBVER)" > $TMP_DLLST
+echo "all:" >> $TMP_DLLST
+cat $TMP_DLLST | grep -v " *#" | grep -w export | grep TARBALL | cut -f2 -d' ' | sed -e 's/.*/\t&=$(&)'/ >> $TMP_DLLST
+for FILE in $(make HAVE_JAVA6=TRUE -f $TMP_DLLST | cut -f2- -d=) ; do if [ ! -f $SRCDIR/sources/$FILE ]; then echo $FILE; fi ; done;
+rm $TMP_DLLST
echo "-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-"
if [ "$P1" == "--download" ]; then