libreoffice: rebuilt for new poppler in -current. Reverted cosmetic changes that are not working

1 files changed, 23 insertions, 21 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index f66b5bff..01d97858 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -269,6 +269,8 @@
 #             * Rebuilt because of shared library updates in -current.
 # 6.0.4-1:    09/may/2018 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 6.0.4-2:    13/may/2018 by Eric Hameleers <alien@slackware.com>
+#             * Rebuilt for the new poppler in -current.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -285,7 +287,7 @@ PRGNAM4=sdkdoc
 PRGNAM5=kde-integration
 PRGNAM6=l10n
 
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-alien}
 
 # SRCVER is the variable you control. It can be one of:
@@ -1430,24 +1432,24 @@ cat $TMP/package-${PRGNAM}-kde-integration/install/slack-desc | grep "^${PRGNAM}
 echo "Starting split-off of dictionaries from main $PRGNAM package..."
 DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
 echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
-for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
+for DICTLANG in $(cat $SRCDIR/languages.dict |grep -v "^ *#" |cut -d= -f1) ; do
   DICTLANGDESC="$(grep ^${DICTLANG}= $SRCDIR/languages.dict |cut -f2 -d=)"
   if [ -d $INSTDIR/share/extensions/dict-${DICTLANG} ]; then
-    mkdir -p $TMP/package-${PRGNAM3}-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
     cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
-      $TMP/package-${PRGNAM3}-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
-    chown -R root:root $TMP/package-${PRGNAM3}-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
-    mkdir -p $TMP/package-${PRGNAM3}-${DICTLANG}/install
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
+    chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
     cat $SRCDIR/slack-desc.dict \
       | sed -e "s/@LANG@/$DICTLANG/g"  -e "s/@LANGDESC@/$DICTLANGDESC/g" > \
-      $TMP/package-${PRGNAM3}-${DICTLANG}/install/slack-desc
-      cd $TMP/package-${PRGNAM3}-${DICTLANG}
-      /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM3}-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+      cd $TMP/package-${PRGNAM}-dict-${DICTLANG}
+      /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
       cd -
       cd $OUTPUT
-      md5sum ${PRGNAM3}-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM3}-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+      md5sum ${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
       cd -
-      cat $TMP/package-${PRGNAM3}-${DICTLANG}/install/slack-desc | grep "^${PRGNAM3}-$DICTLANG" > $OUTPUT/${PRGNAM3}-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
+      cat $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc | grep "^${PRGNAM}-dict-$DICTLANG" > $OUTPUT/${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
   else
     echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
   fi
@@ -1515,8 +1517,8 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
     langdesc="$(grep ^${lang}= $SRCDIR/languages |cut -f2 -d=)"
     lolang=$(echo $lang | tr _ -)
     echo "Splitting out '$lang' ($langdesc) - looking for '$lolang'..."
-    rm -rf ${PKG6}-$lang
-    mkdir -p ${PKG6}-$lang
+    rm -rf ${PKG}-l10n-$lang
+    mkdir -p ${PKG}-l10n-$lang
     tar cf - --remove-files \
       $(find . -depth -name "README*$lolang*" \
       -o -name "LICENSE*${lolang}*" \
@@ -1529,24 +1531,24 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
       -o -name "Lang_*${lolang}.xba" \
       -o -name "Langpack-${lolang}.xcu" \
       -o -name "*${lolang}.oxt") \
-    | ( cd ${PKG6}-$lang ; tar xf - )
+    | ( cd ${PKG}-l10n-$lang ; tar xf - )
     # Create slack-desc and doinst.sh :
-    mkdir -p ${PKG6}-$lang/install
+    mkdir -p ${PKG}-l10n-$lang/install
     cat $SRCDIR/slack-desc.l10n \
       | sed -e "s/@LANG@/$lang/g" -e "s/@LANGDESC@/$langdesc/g" > \
-      ${PKG6}-$lang/install/slack-desc
+      ${PKG}-l10n-$lang/install/slack-desc
     # Install per-language dictionary:
     cat $SRCDIR/doinst.sh.l10n \
       | sed -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" \
             -e "s/@LANG@/${lolang}/g" -e "s/@PRGNAM@/$PRGNAM/" \
-      > ${PKG6}-$lang/install/doinst.sh
-    cd ${PKG6}-$lang
-    /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM6}-${lang}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
+      > ${PKG}-l10n-$lang/install/doinst.sh
+    cd ${PKG}-l10n-$lang
+    /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-l10n-${lang}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
     cd -
     cd $OUTPUT
-    md5sum ${PRGNAM6}-${lang}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM6}-$lang-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+    md5sum ${PRGNAM}-l10n-${lang}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-l10n-$lang-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
     cd -
-    cat $PKG6-$lang/install/slack-desc | grep "^${PRGNAM6}-$lang" > $OUTPUT/${PRGNAM6}--$lang-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
+    cat $PKG-l10n-$lang/install/slack-desc | grep "^${PRGNAM}-l10n-$lang" > $OUTPUT/${PRGNAM}-l10n-$lang-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
   done
 fi # End of splitting out language packs