From 9aaffe3f9592631e9b0d2d009114eaa0499360c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 8 Mar 2024 19:50:36 +0700
Subject: [PATCH] libreoffice: update to 24.2.2.2.

---
 srcpkgs/libreoffice/patches/no-fsword_t.patch | 40 +++++++++++++++++++
 srcpkgs/libreoffice/template                  | 17 ++++----
 srcpkgs/libreoffice/update                    |  3 +-
 3 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 srcpkgs/libreoffice/patches/no-fsword_t.patch

diff --git a/srcpkgs/libreoffice/patches/no-fsword_t.patch b/srcpkgs/libreoffice/patches/no-fsword_t.patch
new file mode 100644
index 00000000000..482674caaaf
--- /dev/null
+++ b/srcpkgs/libreoffice/patches/no-fsword_t.patch
@@ -0,0 +1,40 @@
+From 434065478d35fe8e144aec916ac06438c0150270 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <stephan.bergmann@allotropia.de>
+Date: Fri, 8 Mar 2024 12:47:23 +0100
+Subject: [PATCH] Avoid mentioning Glibc-internal type __fsword_t
+
+...and clean up the use of macros here
+
+Change-Id: Iede9ff705992d5e229b44b48cd88f5b495f6cee4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164571
+Tested-by: Jenkins
+Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
+---
+ sal/osl/unx/file.cxx | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
+index 5c4069cae2de4..b15fe963605fd 100644
+--- a/sal/osl/unx/file.cxx
++++ b/sal/osl/unx/file.cxx
+@@ -39,6 +39,7 @@
+ #include <fcntl.h>
+ #include <limits>
+ #include <limits.h>
++#include <utility>
+ 
+ #include <string.h>
+ #include <pthread.h>
+@@ -67,9 +68,9 @@
+ #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)
++constexpr decltype(std::declval<struct statfs>().f_type) SMB_SUPER_MAGIC = 0x517B;
++constexpr decltype(std::declval<struct statfs>().f_type) CIFS_SUPER_MAGIC = 0xFF534D42;
++constexpr decltype(std::declval<struct statfs>().f_type) SMB2_SUPER_MAGIC = 0xFE534D42;
+ #endif
+ 
+ namespace {
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index e242c335eef..f5e8b307d62 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,6 +1,6 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=24.2.1.2
+version=24.2.2.2
 revision=1
 build_style=meta
 make_build_target="build"
@@ -54,7 +54,7 @@ nocross="Several dependencies are nocross=yes"
 # Source, dictionary, help and translations
 _baseurl="https://download.documentfoundation.org/libreoffice/src/${version%.*}"
 # Please don't remove this mirror, it's faster for me
-# _baseurl="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}"
+_baseurl="https://download.nus.edu.sg/mirror/tdf/libreoffice/src/${version%.*}"
 # _baseurl="https://mirrors.nju.edu.cn/tdf/libreoffice/src/${version%.*}"
 _addurl="https://dev-www.libreoffice.org/src"
 _exturl="https://dev-www.libreoffice.org/extern"
@@ -63,7 +63,6 @@ _exturl="https://dev-www.libreoffice.org/extern"
 # the file 'download.lst' after configure was run.
 distfiles="
  ${_baseurl}/${pkgname}-${version}.tar.xz
- ${_baseurl}/${pkgname}-dictionaries-${version}.tar.xz
  ${_baseurl}/${pkgname}-help-${version}.tar.xz
  ${_baseurl}/${pkgname}-translations-${version}.tar.xz
  ${_addurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
@@ -97,10 +96,9 @@ distfiles="
  ${_addurl}/Java-WebSocket-1.5.4.tar.gz
  ${_addurl}/zxcvbn-c-2.5.tar.gz
 "
-checksum="3ccf577e8f665059ed5a06577b3b37278080be9f29cc4ad3352857a8f2549fa8
- db010c781e85b401e87aa2030902565d5dfceb2c5ff4483c7172484d0f645eab
- 6f8b03b1af94e72c8301164fbcb84c0af57ba6416be8ff02f7b7dd06ff4c2f74
- bf5b164b5e8ac9f796dbc2cf1e9d30e345341d367f634852c47e4572a94f58e9
+checksum="c205a65042f65c94b54ea310344b851043633c3eb5259f4e567d9341aae5e45e
+ e4ca31ec501c3c59e6c7aa4cc1279185675b088b2d042f17a7e6b0a8304ce025
+ 925016b4172c1dcfb2774cdb0376df949241e369375399b9875b154e65f319b2
  1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
@@ -463,7 +461,7 @@ do_configure() {
 	# opts+=" --without-system-glm"
 	opts+=" --without-system-dragonbox"
 	opts+=" --without-system-libfixmath"
-	opts+=" --with-myspell-dicts"
+	opts+=" --without-myspell-dicts"
 	# opts+=" --with-system-icu-for-build=yes"
 	# use system utilities
 	opts+=" --enable-build-opensymbol"
@@ -497,7 +495,8 @@ do_install() {
 
 libreoffice-common_package() {
 	short_desc+=" - Common files"
-	depends="libreoffice-i18n-en-US>=${version}_${revision}"
+	depends="libreoffice-i18n-en-US>=${version}_${revision}
+	 libreoffice-dictionaries"
 	skiprdeps=/usr/lib/libreoffice/program/libofficebean.so
 	replaces="libreoffice-epub>=0"
 	pkg_install() {
diff --git a/srcpkgs/libreoffice/update b/srcpkgs/libreoffice/update
index c231bdfab56..6a313fbec73 100644
--- a/srcpkgs/libreoffice/update
+++ b/srcpkgs/libreoffice/update
@@ -1,2 +1 @@
-site=http://www.libreoffice.org/download/libreoffice-fresh/
-pattern='libreoffice-\K[\d.]+'
+site=https://downloadarchive.documentfoundation.org/libreoffice/old/latest/src/