office/LibreOffice: Updated for version 7.2.0.4

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

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

3 files changed, 28 insertions, 22 deletions

diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild
index 92193f6e70..5abae1c170 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:-7.1.5.2}
+VERSION=${VERSION:-7.2.0.4}
 SHORT_VERSION=${VERSION%.*.*}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -79,10 +79,18 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
 cd $SRCNAM-$VERSION
 
-if [ "$HAVE_SRCS_TARBALL" = "1" ]; then
+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
+else
+  HAVE_SRCS_TARBALL=0
 fi
 
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -165,8 +173,6 @@ if pkg-config --exists libvlc ; then vlc="--enable-vlc" ; else vlc="" ; fi
 
 # Other options
 if pkg-config --exists avahi-core ; then avahi="--enable-avahi" ; else avahi="" ; fi
-if pkg-config --exists python3 ; then Python3="--enable-python=system" ; else Python3="" ; fi
-if pkg-config --exists Qt5 ; then qt5="--enable-qt5" ; else qt5="" ; fi
 if pkg-config --exists valgrind ; then valgrind="--with-valgrind" ; else valgrind="" ; fi
 
 use_ccache="--disable-ccache" ; [ "${USE_CCACHE:-no}" != "no" ] && use_ccache=""
@@ -192,14 +198,16 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ]     &
     --with-vendor="Just Another Slacker" \
     --with-lang="$LOLANGS" \
     --enable-release-build=yes  \
+    --enable-qt5 \
+    --enable-python=system \
     --enable-gio \
+    --disable-skia \
     $extct2n \
     $extnumbertext \
     $extnlpsolver \
     $extlanguagetool \
     $extwikipub \
     $avahi \
-    $Python3 \
     $vlc \
     $use_ccache \
     $use_java \
@@ -265,7 +273,6 @@ extnlpsolver="--enable-ext-nlpsolver"; [ "${EXTNLPSOLVER:-yes}" != "yes" ]     &
     $lpsolve \
     $mythes \
     $postgresql \
-    $qt5 \
     $valgrind \
     $ucpp \
     $odbc \
@@ -285,11 +292,9 @@ fi
 patch -p0 < $CWD/no-check-if-root.diff
 
 # GCC10 requirements (Tx alienBOB)
-sed -i external/libcdr/ExternalProject_libcdr.mk \
-   -e '/configure /i \\t\t&& sed -i "s/TRUE/true/g" src/lib/libcdr_utils.cpp \\'
 sed -i external/libebook/ExternalProject_libebook.mk \
     -e '/configure /i \\t\t&& sed -i "s/TRUE/true/g" src/lib/EBOOKCharsetConverter.cpp \\'
-sed -i i18npool/source/calendar/calendar_gregorian.cxx -e 's/TRUE/true/'
+
 
 export LDFLAGS="-lboost_system"
 make build-nocheck
diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info
index 188f148bbb..b01cd3ff71 100644
--- a/office/LibreOffice/LibreOffice.info
+++ b/office/LibreOffice/LibreOffice.info
@@ -1,10 +1,10 @@
 PRGNAM="LibreOffice"
-VERSION="7.1.5.2"
+VERSION="7.2.0.4"
 HOMEPAGE="https://www.libreoffice.org"
-DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.1.5/libreoffice-7.1.5.2.tar.xz \
-          https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.1.5.2-srcs.tar.xz"
-MD5SUM="c713b9417769650c3c2007352a7bf3a8 \
-        81fb5752c8d89be2c131949c48619e9d"
+DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/7.2.0/libreoffice-7.2.0.4.tar.xz \
+          https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-7.2.0.4-srcs.tar.xz"
+MD5SUM="a4f2e92dc6829d556156ec7a13a965b8 \
+        0ed691eba52080ceed0936ea16c80ff5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk11 apache-ant perl-Archive-Zip"
diff --git a/office/LibreOffice/no-check-if-root.diff b/office/LibreOffice/no-check-if-root.diff
index 946526c69c..8dfe755d13 100644
--- a/office/LibreOffice/no-check-if-root.diff
+++ b/office/LibreOffice/no-check-if-root.diff
@@ -1,10 +1,11 @@
---- Makefile.orig	2020-12-13 08:04:37.172000000 +1000
-+++ Makefile	2020-12-13 08:04:58.538000000 +1000
-@@ -63,7 +63,6 @@
- 		echo; \
- 		echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \
- 		echo; \
--		exit 1; \
+--- Makefile.orig	2021-08-21 10:12:14.335000000 +1000
++++ Makefile	2021-08-21 10:13:38.458000000 +1000
+@@ -65,7 +65,7 @@
+ 			echo; \
+ 			echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \
+ 			echo; \
+-			exit 1; \
++#			exit 1; \
+ 		fi \
  	fi
  
- gb_Side ?= host