diff -Nru libreoffice-6.3.1/debian/changelog libreoffice-6.3.1/debian/changelog
--- libreoffice-6.3.1/debian/changelog	2019-09-02 17:17:30.000000000 +0000
+++ libreoffice-6.3.1/debian/changelog	2019-09-17 02:32:01.000000000 +0000
@@ -1,3 +1,13 @@
+libreoffice (1:6.3.1-1+rpi1) bullseye-staging; urgency=medium
+
+  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
+  * Disable pdfium, it fails to build for armv6
+
+  [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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 17 Sep 2019 02:32:01 +0000
+
 libreoffice (1:6.3.1-1) unstable; urgency=medium
 
   * LibreOffice 6.3.1 final release (identical to rc2)
diff -Nru libreoffice-6.3.1/debian/control libreoffice-6.3.1/debian/control
--- libreoffice-6.3.1/debian/control	2019-09-01 19:26:29.000000000 +0000
+++ libreoffice-6.3.1/debian/control	2019-09-17 02:32:01.000000000 +0000
@@ -32,17 +32,13 @@
                g++ (>= 4:7),
                gcc (>= 4:7),
                gdb [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
-               ghostscript [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                gobject-introspection (>= 1.32.0),
                gperf (>= 3.1),
                gpg <!nocheck>,
                gpg-agent <!nocheck>,
                gpgconf <!nocheck>,
-               hunspell-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
-               imagemagick [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                java-common (>= 0.61),
                javahelper (>= 0.37~),
-               junit4 (>= 4.8.2-2) [amd64 arm64] <!nocheck>,
                libabw-dev (>= 0.1),
                libarchive-zip-perl [!hppa !mips64 !s390 !sparc],
                libavahi-client-dev,
@@ -59,7 +55,6 @@
                libclucene-dev (>= 2.3.3.4-4.1),
                libcmis-dev (>= 0.5.2~),
                libcommons-logging-java [!hppa !mips64 !s390 !sparc],
-               libcppunit-dev (>= 1.14) [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                libcups2-dev,
                libcurl4-gnutls-dev,
                libdbus-1-dev (>= 0.60),
@@ -166,11 +161,9 @@
                lp-solve (>= 5.5.0.13-5+b1),
                maven-repo-helper,
                pkg-config,
-               pstoedit [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                python3,
                python3-dev (>= 3.3) <!nopython>,
                python3-distutils <!nopython>,
-               python3-lxml <!nocheck !nopython>,
                qt5-qmake (>= 5.6),
                qtbase5-dev (>= 5.6),
                qtbase5-dev-tools (>= 5.6),
@@ -185,14 +178,12 @@
 Build-Depends-Indep: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc],
                      ant-optional (>= 1.7.0) [!hppa !mips64 !s390 !sparc],
                      doxygen (>= 1.8.4) <!nodoc>,
-                     g++-mingw-w64-i686,
                      gettext,
                      graphviz <!nodoc>,
                      libbsh-java,
                      rdfind,
                      symlinks
 Build-Conflicts: amd-libopencl1,
-                 fonts-opensymbol <!nocheck>,
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
                  nvidia-libopencl1
diff -Nru libreoffice-6.3.1/debian/rules libreoffice-6.3.1/debian/rules
--- libreoffice-6.3.1/debian/rules	2019-09-01 19:10:22.000000000 +0000
+++ libreoffice-6.3.1/debian/rules	2019-09-17 02:32:01.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
@@ -466,7 +468,7 @@
 
 # let's do this only on archs where we have chromium, which is supposedly even only the archs
 # where alsp pdfium is supported.
-OOO_PDFIUM_ARCHS := i386 amd64 armhf arm64
+OOO_PDFIUM_ARCHS := i386 amd64 arm64
 ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS)))
 ENABLE_PDFIUM=y
 else