diff -Nru libreoffice-6.4.4~rc1/debian/changelog libreoffice-6.4.4~rc1/debian/changelog
--- libreoffice-6.4.4~rc1/debian/changelog 2020-04-29 19:28:30.000000000 +0000
+++ libreoffice-6.4.4~rc1/debian/changelog 2020-05-12 11:22:26.000000000 +0000
@@ -1,3 +1,13 @@
+libreoffice (1:6.4.4~rc1-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, 12 May 2020 11:22:26 +0000
+
libreoffice (1:6.4.4~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff -Nru libreoffice-6.4.4~rc1/debian/control libreoffice-6.4.4~rc1/debian/control
--- libreoffice-6.4.4~rc1/debian/control 2020-04-29 19:28:30.000000000 +0000
+++ libreoffice-6.4.4~rc1/debian/control 2020-05-12 11:22:26.000000000 +0000
@@ -9,7 +9,6 @@
bc,
bison,
bzip2,
- debhelper (>= 10.10.4),
debhelper-compat (= 12),
default-jdk (>= 2:1.8) [!hppa !s390 !sparc !hurd-i386 !i386] <!nojava>,
default-jdk (>= 2:1.8-55) [sparc64] <!nojava>,
@@ -18,30 +17,15 @@
dh-apparmor,
dh-python <!nopython>,
dpkg-dev (>= 1.18.2~),
- dwz (>> 0.12-3),
firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !mips64 !s390 !sparc],
- firebird3.0-server-core [!hppa !mips64 !s390 !sparc] <!nocheck>,
flex (>= 2.3.35),
- fontconfig [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
fontforge-nox | fontforge,
- fonts-crosextra-carlito [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
- fonts-dejavu [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
- fonts-liberation2 [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
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>,
- hyphen-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) <!nojava>,
javahelper (>= 0.37~) <!nojava>,
- junit4 (>= 4.8.2-2) [amd64 arm64] <!nocheck !nojava>,
libabw-dev (>= 0.1),
libarchive-zip-perl [!hppa !mips64 !s390 !sparc] <!nojava>,
libavahi-client-dev,
@@ -58,19 +42,16 @@
libclucene-dev (>= 2.3.3.4-4.1),
libcmis-dev (>= 0.5.2~),
libcommons-logging-java [!hppa !mips64 !s390 !sparc] <!nojava>,
- libcppunit-dev (>= 1.14) [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
libcups2-dev,
libcurl4-gnutls-dev,
libdbus-1-dev (>= 0.60),
libdconf-dev (>= 0.15.2),
libe-book-dev,
- libe-book-dev (>= 0.1.2) <!nocheck>,
libebook1.2-dev,
libeot-dev,
libepoxy-dev (>= 1.2),
libepubgen-dev (>= 0.1.0),
libetonyek-dev,
- libetonyek-dev (>= 0.1.8) <!nocheck>,
libexpat1-dev,
libexttextcat-dev (>= 3.4.1),
libflute-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] <!nojava>,
@@ -112,7 +93,6 @@
libmdds-dev (>= 1.5),
libmspub-dev (>= 0.1),
libmwaw-dev (>= 0.3.1),
- libmwaw-dev (>= 0.3.15) <!nocheck>,
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnspr4-dev,
@@ -138,13 +118,11 @@
libserializer-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] <!nojava>,
libsm-dev,
libstaroffice-dev,
- libstaroffice-dev (>= 0.0.3) <!nocheck>,
libsuitesparse-dev (>= 1:3.4.0),
libvisio-dev (>= 0.1),
libwpd-dev (>= 0.10),
libwpg-dev (>= 0.3),
libwps-dev (>= 0.4),
- libwps-dev (>= 0.4.9) <!nocheck>,
libx11-dev,
libxaw7-dev,
libxcb-icccm4-dev,
@@ -162,15 +140,12 @@
libxt-dev,
libxtst-dev,
libzmf-dev,
- locales [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
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,19 +160,12 @@
Build-Depends-Indep: ant (>= 1.7.0) [!hppa !mips64 !s390 !sparc] <!nojava>,
ant-optional (>= 1.7.0) [!hppa !mips64 !s390 !sparc] <!nojava>,
doxygen (>= 1.8.4) <!nodoc>,
- g++-mingw-w64-i686,
gettext,
graphviz <!nodoc>,
libbsh-java <!nojava>,
rdfind,
symlinks
Build-Conflicts: amd-libopencl1,
- fonts-opensymbol <!nocheck>,
- g++-9 (= 9.2.1-12) <!nocheck>,
- g++-9 (= 9.2.1-13) <!nocheck>,
- g++-9 (= 9.2.1-14) <!nocheck>,
- g++-9 (= 9.2.1-15) <!nocheck>,
- g++-9 (= 9.2.1-15.1) <!nocheck>,
nvidia-glx-dev,
nvidia-glx-legacy-dev,
nvidia-libopencl1
diff -Nru libreoffice-6.4.4~rc1/debian/rules libreoffice-6.4.4~rc1/debian/rules
--- libreoffice-6.4.4~rc1/debian/rules 2020-04-29 19:28:30.000000000 +0000
+++ libreoffice-6.4.4~rc1/debian/rules 2020-05-12 11:22:26.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
@@ -493,7 +495,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