diff -Nru libreoffice-7.3.0/debian/changelog libreoffice-7.3.0/debian/changelog
--- libreoffice-7.3.0/debian/changelog	2022-01-31 11:34:10.000000000 +0000
+++ libreoffice-7.3.0/debian/changelog	2022-02-08 19:02:59.000000000 +0000
@@ -1,3 +1,16 @@
+libreoffice (1:7.3.0-1+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
+  * Disable testsuite.
+
+  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
+  * Disable pdfium, it fails to build for armv6
+
+  [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green]
+  * Use clang 11, newer versions cause armv7 contamination issues.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 08 Feb 2022 19:02:59 +0000
+
 libreoffice (1:7.3.0-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru libreoffice-7.3.0/debian/control libreoffice-7.3.0/debian/control
--- libreoffice-7.3.0/debian/control	2022-01-26 15:53:25.000000000 +0000
+++ libreoffice-7.3.0/debian/control	2022-02-08 19:02:59.000000000 +0000
@@ -9,13 +9,10 @@
                binutils (>= 2.37-9) [ppc64],
                bison,
                bzip2,
-               clang (>= 1:11) [armel],
-               clang (>= 1:12) [ppc64el],
-               clang (>= 1:5.0.2) [alpha amd64 arm64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el],
+               clang-11 [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el],
                coinor-libcoinmp-dev (>= 1.8.3-3),
                coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
                cpp,
-               debhelper (>= 10.10.4),
                debhelper-compat (= 12),
                default-jdk (>= 2:1.9) [!hppa !s390 !sparc !hurd-i386] <!nojava>,
                dh-python <!nopython>,
@@ -30,7 +27,6 @@
                gperf (>= 3.1),
                java-common (>= 0.61) <!nojava>,
                javahelper (>= 0.37~) <!nojava>,
-               junit4 (>= 4.8.2-2) [amd64 arm64] <!nocheck !nojava>,
                libabsl-dev,
                libabw-dev (<< 0.2~),
                libabw-dev (>= 0.1),
@@ -221,7 +217,6 @@
                      rdfind,
                      symlinks
 Build-Conflicts: amd-libopencl1,
-                 fonts-opensymbol <!nocheck>,
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
                  nvidia-libopencl1
diff -Nru libreoffice-7.3.0/debian/rules libreoffice-7.3.0/debian/rules
--- libreoffice-7.3.0/debian/rules	2022-01-22 07:40:56.000000000 +0000
+++ libreoffice-7.3.0/debian/rules	2022-02-08 19:02:59.000000000 +0000
@@ -15,6 +15,8 @@
 # /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
 ################################################################################
 
+export DEB_BUILD_OPTIONS += nocheck
+
 vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
 
 include /usr/share/dpkg/pkg-info.mk
@@ -377,7 +379,7 @@
 ENABLE_PDFIMPORT=y
 ENABLE_POPPLER=y
 SYSTEM_STUFF += poppler
-ENABLE_PDFIUM=y
+ENABLE_PDFIUM=n
 ifneq (big,$(DEB_HOST_ARCH_ENDIAN))
 ENABLE_SKIA=y
 endif
@@ -671,7 +673,7 @@
 # allow clang for skia?
 ALLOW_CLANG=y
 
-CLANG_VERSION=default
+CLANG_VERSION=11
 
 ifneq "$(shell echo $(USE_CLANG)$(ALLOW_CLANG) | grep y)" ""
   # /usr/bin/ld: /usr/lib/llvm-11/bin/../lib/LLVMgold.so: error loading plugin: /usr/lib/llvm-11/bin/../lib/LLVMgold.so: cannot open shared object file: No such file or directory