diff --git a/srcpkgs/libreoffice/patches/009-kde.patch b/srcpkgs/libreoffice/patches/009-kde.patch
index 4c2371daf42..ff29937b050 100644
--- a/srcpkgs/libreoffice/patches/009-kde.patch
+++ b/srcpkgs/libreoffice/patches/009-kde.patch
@@ -1,8 +1,9 @@
-Upstream: maybe
-Description: Moving some runtime check to compile time check
+Upstream: https://gerrit.libreoffice.org/c/core/+/174512/
+diff --git a/configure.ac b/configure.ac
+index 459ce88b930e..0b84d85c47f8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -13598,12 +13598,13 @@ then
+@@ -13834,12 +13834,12 @@ then
      save_CXXFLAGS=$CXXFLAGS
      CXXFLAGS="$CXXFLAGS $KF5_CFLAGS"
      AC_MSG_CHECKING([whether KDE is >= 5.0])
@@ -13,13 +14,12 @@ Description: Moving some runtime check to compile time check
  int main(int argc, char **argv) {
 -       if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) return 0;
 -       else return 1;
-+       int a[2 * (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) - 1];
-+       a[0] = 0;
-+       return a[0];
++       static_assert(KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0);
++       return 0;
  }
         ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
      CXXFLAGS=$save_CXXFLAGS
-@@ -13674,12 +13675,13 @@ then
+@@ -13910,12 +13910,12 @@ then
      CXXFLAGS="$CXXFLAGS $KF6_CFLAGS"
      dnl KF6 development version as of 2023-06 uses version number 5.240
      AC_MSG_CHECKING([whether KDE is >= 5.240])
@@ -30,9 +30,11 @@ Description: Moving some runtime check to compile time check
  int main(int argc, char **argv) {
 -       if (KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)) return 0;
 -       else return 1;
-+       int a[2 *(KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)) - 1];
-+       a[0] = 0;
-+       return a[0];
++       static_assert(KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240));
++       return 0;
  }
         ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[])
      CXXFLAGS=$save_CXXFLAGS
+-- 
+2.47.0.rc0
+
diff --git a/srcpkgs/libreoffice/patches/990-32bit-gtk4.patch b/srcpkgs/libreoffice/patches/990-32bit-gtk4.patch
deleted file mode 100644
index e8c5ad84eac..00000000000
--- a/srcpkgs/libreoffice/patches/990-32bit-gtk4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/vcl/unx/gtk4/gtkaccessibletext.cxx
-+++ b/vcl/unx/gtk4/gtkaccessibletext.cxx
-@@ -102,7 +102,7 @@ static unsigned int lo_accessible_text_get_caret_position(GtkAccessibleText* sel
-     if (!xText.is())
-         return 0;
- 
--    return std::max(0, xText->getCaretPosition());
-+    return std::max(sal_Int32(0), xText->getCaretPosition());
- }
- 
- static gboolean lo_accessible_text_get_selection(GtkAccessibleText* self, gsize* n_ranges,
-
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index dee73e85c16..36a2342e239 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=24.8.0.3
-revision=2
+version=24.8.2.1
+revision=1
 build_style=meta
 build_helper="gir"
 make_build_target="build"
@@ -19,10 +19,10 @@ _xdeps="zlib-devel libjpeg-turbo-devel clucene-devel expat-devel xmlsec1-devel
  CoinMP-devel lpsolve-devel libexttextcat-devel libnumbertext-devel
  libepoxy-devel cairo-devel liblangtag-devel libpng-devel tiff-devel
  libwebp-devel fontconfig-devel libcmis-devel
- gobject-introspection libgirepository-devel"
+ gobject-introspection libgirepository-devel libglib-devel"
 hostmakedepends="automake flex gperf hyphen icu libtool openldap which gettext xz
  tar perl-Archive-Zip pkg-config sane unzip zip python3-setuptools
- fontforge python3-lxml qt6-base gnupg
+ fontforge python3-lxml qt6-base gnupg glib-devel
  $(vopt_if java 'openjdk17 apache-ant beanshell rhino hsqldb1.8.0')"
 makedepends="$_xdeps openssl-devel libXrender-devel libbluetooth-devel
  gpgmepp-devel libXinerama-devel libXt-devel libX11-devel libICE-devel
@@ -96,9 +96,9 @@ distfiles="
  ${_addurl}/Java-WebSocket-1.5.6.tar.gz
  ${_addurl}/zxcvbn-c-2.5.tar.gz
 "
-checksum="5b11468cd1b68c05c33b151fcd7d044eea0c7e1dbf4bda028b490e18df7d78c1
- 7653e34fa2139fa6818d644208a0fc9e4e43be18d669c020f38c8dab161671ed
- 5e2706a6b0339b3424a3fb75c83b73817603722baf8fa11a9b84dc9a65ece55c
+checksum="ab301baeb64114a9a1bce5dcb914ee0bf3e2ac7b8d74d32f3233f5f312bcc4cf
+ 4ff77d50dfa77c45dff7ca8c5033028ff24530b7e9ce333aee2a418046d08ef6
+ 72382c0fb00d83511be9197bf1e4e0947899084a287a97960942e49624676efb
  75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
  7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
  e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00