office/LibreOffice: Updated for version 25.2.5.2

Signed-off-by: Christoph Willing <chris.willing@linux.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

office/LibreOffice/LibreOffice.SlackBuild

@@ -1,6 +1,4 @@
 #!/bin/bash
-#
-# ex:set ai shiftwidth=4 inputtab=spaces smarttab noautotab:
 
 # Slackware build script for LibreOffice
 
@@ -24,11 +22,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-cd $(dirname $0) ; CWD=$(pwd)
+cd "$(dirname "$0")" ; CWD=$(pwd)
 
 PRGNAM=LibreOffice
 SRCNAM=libreoffice
-VERSION=${VERSION:-25.2.4.3}
+VERSION=${VERSION:-25.2.5.2}
 SHORT_VERSION=${VERSION%.*.*}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -69,7 +67,18 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ -x /usr/bin/gcc-11.* ];
+
+set -e
+
+rm -rf "$PKG"
+mkdir -p "$TMP" "$PKG" "$OUTPUT"
+cd "$TMP"
+rm -rf "$SRCNAM"-"$VERSION"
+tar xvf "$CWD"/"$SRCNAM"-"$VERSION".tar.xz
+cd "$SRCNAM"-"$VERSION"
+
+#if [ -x /usr/bin/gcc-11.* ];
+if [[ "$(gcc --version |head -1 |cut -d' ' -f3)" == "11."* ]];
 then
   echo Slackware-15.0
   export CC=/usr/bin/clang
@@ -81,27 +90,13 @@ else
   export CXX=/usr/bin/g++
 fi
 
-set -e
-
-rm -rf $PKG
-mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
-cd $SRCNAM-$VERSION
-
-# Needed for 15.0 - not for -current
-if [ -x /usr/bin/gcc-11.* ]; then
-  patch -p0 < $CWD/xpdfwrapper_invalid-argument.diff
-fi
-
-if [ -r $CWD/$SRCNAM-${VERSION}-srcs.tar.xz ]; then
-  tar xvf $CWD/$SRCNAM-${VERSION}-srcs.tar.xz
+if [ -r "$CWD"/"$SRCNAM"-"${VERSION}"-srcs.tar.xz ]; then
+  tar xvf "$CWD"/"$SRCNAM"-"${VERSION}"-srcs.tar.xz
   # For 7.2.0.4 these aren't found as previously so unpack them manually
-  cd $TMP
-  tar xf libreoffice-${VERSION}/external/tarballs/libreoffice-translations-${VERSION}.tar.xz
-  tar xf libreoffice-${VERSION}/external/tarballs/libreoffice-help-${VERSION}.tar.xz
-  cd $SRCNAM-$VERSION
+  cd "$TMP"
+  tar xf libreoffice-"${VERSION}"/external/tarballs/libreoffice-translations-"${VERSION}".tar.xz
+  tar xf libreoffice-"${VERSION}"/external/tarballs/libreoffice-help-"${VERSION}".tar.xz
+  cd "$SRCNAM"-"$VERSION"
 else
   HAVE_SRCS_TARBALL=0
 fi
@@ -118,7 +113,7 @@ LOLANGS=${LOLANGS:-"de es fr id it ja nl vi zh-CN"}
 # By default, LibreOffice ignores MAKEFLAGS -j option and uses all available cpu cores.
 parallel=""
 # If MAKEFLAGS contains -j option, we extract its value to override the default.
-jval="$(echo $MAKEFLAGS |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true
+jval="$(echo "$MAKEFLAGS" |grep -o "\-j *[0-9]*" | grep -o "[0-9]*")" || true
 [ -n "$jval" ] && parallel="--with-parallelism=$jval"
 # If PARALLEL environment variable is set, use that to override everything.
 [ "${PARALLEL:-0}" != "0" ] && parallel="--with-parallelism=$PARALLEL"
@@ -130,8 +125,8 @@ else
   if [ -z "$JAVA_HOME" ]; then
     # if JAVA_HOME isn't set, try to set it by sourcing the profile script
     for i in /etc/profile.d/*jdk*.sh; do
-      if [ -x $i ]; then
-        source $i
+      if [ -x "$i" ]; then
+        source "$i"
         break
       fi
     done
@@ -219,10 +214,10 @@ if pkg-config --atleast-version 24.11.0 poppler ; then poppler="--without-system
     NSS_CFLAGS="$(pkg-config --cflags-only-I mozilla-nss)"\
     --prefix=/usr   \
     --mandir=/usr/man \
-    --docdir=/usr/doc/$PRGNAM-$VERSION \
-    --libdir=/usr/lib$LIBDIRSUFFIX \
+    --docdir=/usr/doc/"$PRGNAM"-"$VERSION" \
+    --libdir=/usr/lib"$LIBDIRSUFFIX" \
     --sysconfdir=/etc \
-    --build=$ARCH-slackware-linux \
+    --build="$ARCH"-slackware-linux \
     --with-vendor="Just Another Slacker" \
     --with-lang="$LOLANGS" \
     --enable-release-build=yes  \
@@ -238,8 +233,8 @@ if pkg-config --atleast-version 24.11.0 poppler ; then poppler="--without-system
     $avahi \
     $vlc \
     $use_ccache \
-    $use_java \
-    $parallel \
+    "$use_java" \
+    "$parallel" \
     --with-tls="nss" \
     --with-x \
     --without-krb5 \
@@ -311,12 +306,12 @@ if pkg-config --atleast-version 24.11.0 poppler ; then poppler="--without-system
 chmod a+x bin/unpack-sources
 if [ "$HAVE_SRCS_TARBALL" = "0" ]; then
   make fetch
-  tar cvf - external/tarballs | xz -c > $CWD/$SRCNAM-$VERSION-srcs.tar.xz
+  tar cvf - external/tarballs | xz -c > "$CWD"/"$SRCNAM"-"$VERSION"-srcs.tar.xz
   echo ; echo "Run build script again with HAVE_SRCS_TARBALL=1"
   exit 0
 fi
 
-patch -p0 < $CWD/no-check-if-root.diff
+patch -p0 < "$CWD"/no-check-if-root.diff
 
 # GCC10 requirements (Tx alienBOB)
 sed -i external/libebook/ExternalProject_libebook.mk \
@@ -324,18 +319,18 @@ sed -i external/libebook/ExternalProject_libebook.mk \
 
 
 make build
-make distro-pack-install DESTDIR=$PKG
+make distro-pack-install DESTDIR="$PKG"
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+find "$PKG" -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-cd $PKG/usr/lib$LIBDIRSUFFIX
-mv $SRCNAM  $SRCNAM-$VERSION
-ln -s $SRCNAM-$VERSION $SRCNAM
+cd "$PKG"/usr/lib"$LIBDIRSUFFIX"
+mv "$SRCNAM"  "$SRCNAM"-"$VERSION"
+ln -s "$SRCNAM"-"$VERSION" "$SRCNAM"
 cd -
 
-for df in $PKG/usr/lib$LIBDIRSUFFIX/$SRCNAM-$VERSION/share/xdg/*.desktop ; do
-    sed -i -e "s/libreofficedev$SHORT_VERSION/libreoffice/g" $df
+for df in "$PKG"/usr/lib"$LIBDIRSUFFIX"/"$SRCNAM"-"$VERSION"/share/xdg/*.desktop ; do
+    sed -i -e "s/libreofficedev$SHORT_VERSION/libreoffice/g" "$df"
 done
 
 # Only enable pyuno if requested
@@ -343,34 +338,34 @@ if [ "${PYUNO:-no}" == "yes" ]; then
   # Use the system python if we have it, else use the python just built with LibreOffice
   PYTHONEXE=$(which python3) || PYTHONEXE=$PKG/usr/lib$LIBDIRSUFFIX/$SRCNAM/program/python
   PYSITEDIR=$($PYTHONEXE -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-  mkdir -p $PKG/$PYSITEDIR
-  cat <<EOF >$PKG/$PYSITEDIR/pyuno.pth
+  mkdir -p "$PKG"/"$PYSITEDIR"
+  cat <<EOF >"$PKG"/"$PYSITEDIR"/pyuno.pth
 import sys; sys.path.insert(0,'/usr/lib$LIBDIRSUFFIX/libreoffice/program')
 EOF
-  chmod 0644 $PKG/$PYSITEDIR/pyuno.pth
+  chmod 0644 "$PKG"/"$PYSITEDIR"/pyuno.pth
 fi
 
-mkdir -p $PKG/etc/profile.d
-sd_prog=/usr/lib$LIBDIRSUFFIX/libreoffice/program
-cat <<EOF >$PKG/etc/profile.d/libreoffice.sh
-export UNO_PATH=$sd_prog
+mkdir -p "$PKG"/etc/profile.d
+sd_prog=/usr/lib"$LIBDIRSUFFIX"/libreoffice/program
+cat <<EOF >"$PKG"/etc/profile.d/libreoffice.sh
+export UNO_PATH="$sd_prog"
 export URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc
 export PATH=\${PATH}:$sd_prog
 EOF
-cat <<EOF >$PKG/etc/profile.d/libreoffice.csh
-setenv UNO_PATH $sd_prog
-setenv URE_BOOTSTRAP vnd.sun.star.pathname:$sd_prog/fundamentalrc
+cat <<EOF >"$PKG"/etc/profile.d/libreoffice.csh
+setenv UNO_PATH "$sd_prog"
+setenv URE_BOOTSTRAP vnd.sun.star.pathname:sd_prog/fundamentalrc
 setenv PATH \${PATH}:$sd_prog
 EOF
-chmod 0755 $PKG/etc/profile.d/libreoffice.{csh,sh}
+chmod 0755 "$PKG"/etc/profile.d/libreoffice.{csh,sh}
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING* README* $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p "$PKG"/usr/doc/"$PRGNAM"-"$VERSION"
+cp -a COPYING* README* "$PKG"/usr/doc/"$PRGNAM"-"$VERSION"
+cat "$CWD"/"$PRGNAM".SlackBuild > "$PKG"/usr/doc/"$PRGNAM"-"$VERSION"/"$PRGNAM".SlackBuild
 
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+mkdir -p "$PKG"/install
+cat "$CWD"/slack-desc > "$PKG"/install/slack-desc
+cat "$CWD"/doinst.sh > "$PKG"/install/doinst.sh
 
-cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
+cd "$PKG"
+/sbin/makepkg -l y -c n "$OUTPUT"/"$PRGNAM"-"$VERSION"-"$ARCH"-"$BUILD""$TAG"."$PKGTYPE"

office/LibreOffice/LibreOffice.info

@@ -1,10 +1,10 @@
 PRGNAM="LibreOffice"
-VERSION="25.2.4.3"
+VERSION="25.2.5.2"
 HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/25.2.4/libreoffice-25.2.4.3.tar.xz \
-		https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-25.2.4.3-srcs.tar.xz"
-MD5SUM="ca85722da71c6cd4e6f0576b31959e62 \
-	501e266a4328a9a7fca4d2d8eb2be4e5"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/25.2.5/libreoffice-25.2.5.2.tar.xz \
+		https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-25.2.5.2-srcs.tar.xz"
+MD5SUM="f215c051d230755251e32b4112459950 \
+	1a0cfab976a22e13f3971398fb2407d7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zulu-openjdk17 apache-ant perl-Archive-Zip libcdr libfreehand liblangtag libmspub libzmf"

office/LibreOffice/xpdfwrapper_invalid-argument.diff

@@ -1,100 +0,0 @@
---- sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx.orig	2025-06-05 20:22:59.000000000 +1000
-+++ sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx	2025-06-07 21:12:54.394041989 +1000
-@@ -214,8 +214,9 @@
-     int nLineSize = (width + 7)/8;
-     aScanlines.reserve( nLineSize * height + height );
- 
--    if (!str->reset())
--        return;
-+    str->reset();
-+    //if (!str->reset())
-+    //    return;
-     for( int y = 0; y < height; y++ )
-     {
-         // determine filter type (none) for this scanline
-@@ -253,8 +254,9 @@
-                         width,
-                         colorMap->getNumPixelComps(),
-                         colorMap->getBits()));
--    if (!imgStr->reset())
--        return;
-+    imgStr->reset();
-+    //if (!imgStr->reset())
-+    //    return;
- 
-     // create scan line data buffer
-     OutputBuffer aScanlines;
-@@ -291,8 +293,9 @@
-                         maskColorMap->getNumPixelComps(),
-                         maskColorMap->getBits()));
- 
--    if (!imgStrMask->reset())
--        return;
-+    imgStrMask->reset();
-+    //if (!imgStrMask->reset())
-+    //    return;
- 
-     for( int y = 0; y < maskHeight; ++y )
-     {
-@@ -341,8 +344,9 @@
-                         width,
-                         colorMap->getNumPixelComps(),
-                         colorMap->getBits()));
--    if (!imgStr->reset())
--        return;
-+    imgStr->reset();
-+    //if (!imgStr->reset())
-+    //    return;
- 
-     // create scan line data buffer
-     OutputBuffer aScanlines;
-@@ -376,8 +380,9 @@
-     std::unique_ptr<ImageStream> imgStrMask(
-         new ImageStream(maskStr, maskWidth, 1, 1));
- 
--    if (!imgStrMask->reset())
--        return;
-+    imgStrMask->reset();
-+    //if (!imgStrMask->reset())
-+    //    return;
- 
-     for( int y = 0; y < maskHeight; ++y )
-     {
---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2025-06-05 20:22:59.000000000 +1000
-+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2025-06-07 22:55:54.377041989 +1000
-@@ -231,8 +231,9 @@
- #else
-     str = ((DCTStream *)str)->getRawStream();
- #endif
--    if (!str->reset())
--        return;
-+    str->reset();
-+    //if (!str->reset())
-+    //    return;
- 
-     o_rOutputBuf.clear();
-     ExtractJpegData(str, o_rOutputBuf);
-@@ -268,8 +269,9 @@
-     o_rOutputBuf.resize(header_size);
- 
-     // initialize stream
--    if (!str->reset())
--        return;
-+    str->reset();
-+    //if (!str->reset())
-+    //    return;
- 
-     // copy the raw stream
-     if( bInvert )
-@@ -326,8 +328,9 @@
-                         width,
-                         colorMap->getNumPixelComps(),
-                         colorMap->getBits()));
--    if (!imgStr->reset())
--        return;
-+    imgStr->reset();
-+    //if (!imgStr->reset())
-+    //    return;
- 
-     for( int y=0; y<height; ++y)
-     {