office/LibreOffice: Updated for version 25.2.4.3

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

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

3 files changed, 111 insertions, 6 deletions

diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index d9fc1a1ca3..676be1aa01 100644
--- a/office/LibreOffice/LibreOffice.SlackBuild
+++ b/office/LibreOffice/LibreOffice.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=LibreOffice
 SRCNAM=libreoffice
-VERSION=${VERSION:-25.2.3.2}
+VERSION=${VERSION:-25.2.4.3}
 SHORT_VERSION=${VERSION%.*.*}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -90,6 +90,11 @@ 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
   # For 7.2.0.4 these aren't found as previously so unpack them manually
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index 73f6998a45..bfd5f24d91 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,10 +1,10 @@
 PRGNAM="LibreOffice"
-VERSION="25.2.3.2"
+VERSION="25.2.4.3"
 HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/25.2.3/libreoffice-25.2.3.2.tar.xz \
-		https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-25.2.3.2-srcs.tar.xz"
-MD5SUM="19c450d4777bf169761ed190eac7c841 \
-	2cf499f422e0c06b659c4386f8da694f"
+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_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="zulu-openjdk17 apache-ant perl-Archive-Zip libcdr libfreehand liblangtag libmspub libzmf"
diff --git a/office/LibreOffice/xpdfwrapper_invalid-argument.diff b/office/LibreOffice/xpdfwrapper_invalid-argument.diff
new file mode 100644
index 0000000000..37821faf01
--- /dev/null
+++ b/office/LibreOffice/xpdfwrapper_invalid-argument.diff
@@ -0,0 +1,100 @@
+--- 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)
+     {