diff options
| author |   Christoph Willing <chris.willing@linux.com> | 2024-04-01 10:53:32 +1100 |
|---|---|---|
| committer | Christoph Willing <chris.willing@linux.com> | 2024-04-01 10:55:45 +1100 |
| commit | 0b8407f77e65bab1773bac1fd59f76e72e06126d (patch) | |
| tree | 8e58d7de4b639237c94d6a89b25276fa5eae643b | |
| parent | 3517d0e3773de0f33656bc338f8d7a7f3296ed58 (diff) | |
| download | slackbuilds-user/chris.willing/updates.tar.gz slackbuilds-user/chris.willing/updates.tar.xz | |
office/LibreOffice: Updated for version 24.2.2.2user/chris.willing/updates
Signed-off-by: Christoph Willing <chris.willing@linux.com>
| -rw-r--r-- | office/LibreOffice/LibreOffice.SlackBuild | 3 | ||||
| -rw-r--r-- | office/LibreOffice/LibreOffice.info | 10 | ||||
| -rw-r--r-- | office/LibreOffice/narrowing_0f5dfae.diff | 17 |
3 files changed, 6 insertions, 24 deletions
diff --git a/office/LibreOffice/LibreOffice.SlackBuild b/office/LibreOffice/LibreOffice.SlackBuild index b50cf374e4..b3b349606f 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:-24.2.1.2} +VERSION=${VERSION:-24.2.2.2} SHORT_VERSION=${VERSION%.*.*} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -318,7 +318,6 @@ if [ "$HAVE_SRCS_TARBALL" = "0" ]; then fi patch -p0 < $CWD/no-check-if-root.diff -patch -p0 < $CWD/narrowing_0f5dfae.diff # GCC10 requirements (Tx alienBOB) sed -i external/libebook/ExternalProject_libebook.mk \ diff --git a/office/LibreOffice/LibreOffice.info b/office/LibreOffice/LibreOffice.info index 47317bd25a..eb06942f03 100644 --- a/office/LibreOffice/LibreOffice.info +++ b/office/LibreOffice/LibreOffice.info @@ -1,10 +1,10 @@ PRGNAM="LibreOffice" -VERSION="24.2.1.2" +VERSION="24.2.2.2" HOMEPAGE="https://www.libreoffice.org" -DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/24.2.1/libreoffice-24.2.1.2.tar.xz \ - https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-24.2.1.2-srcs.tar.xz" -MD5SUM="acaa6d8c1b7a11bafd8415961763e342 \ - 132fad4355fa02abbf7dfe56756ab05a" +DOWNLOAD="https://download.documentfoundation.org/libreoffice/src/24.2.2/libreoffice-24.2.2.2.tar.xz \ + https://sourceforge.net/projects/slackbuildsdirectlinks/files/LibreOffice/libreoffice-24.2.2.2-srcs.tar.xz" +MD5SUM="72d05d00734c6921a47c369b8d7ef8cf \ + 87a2d12d9b00c2662c1fee4303d54c48" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk17 apache-ant perl-Archive-Zip libcdr libfreehand liblangtag libmspub libzmf" diff --git a/office/LibreOffice/narrowing_0f5dfae.diff b/office/LibreOffice/narrowing_0f5dfae.diff deleted file mode 100644 index 69f656cab1..0000000000 --- a/office/LibreOffice/narrowing_0f5dfae.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- sal/osl/unx/file.cxx.orig 2024-02-26 01:15:17.000000000 +1000 -+++ sal/osl/unx/file.cxx 2024-03-08 21:40:36.345000000 +1000 -@@ -64,6 +64,14 @@ - #include <vector> - #endif - -+#ifdef LINUX -+#include <sys/vfs.h> -+// As documented by the kernel -+#define SMB_SUPER_MAGIC static_cast<__fsword_t>(0x517B) -+#define CIFS_SUPER_MAGIC static_cast<__fsword_t>(0xFF534D42) -+#define SMB2_SUPER_MAGIC static_cast<__fsword_t>(0xFE534D42) -+#endif -+ - namespace { - - enum class State |