diff -Nru libreoffice-7.2.1/debian/changelog libreoffice-7.2.1/debian/changelog
--- libreoffice-7.2.1/debian/changelog 2021-09-23 15:55:20.000000000 +0000
+++ libreoffice-7.2.1/debian/changelog 2021-09-30 06:33:09.000000000 +0000
@@ -1,3 +1,13 @@
+libreoffice (1:7.2.1-4+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
+
+ -- Raspbian forward porter <root@raspbian.org> Thu, 30 Sep 2021 06:33:09 +0000
+
libreoffice (1:7.2.1-4) unstable; urgency=medium
[ merge from Ubuntu ]
diff -Nru libreoffice-7.2.1/debian/control libreoffice-7.2.1/debian/control
--- libreoffice-7.2.1/debian/control 2021-09-23 15:55:19.000000000 +0000
+++ libreoffice-7.2.1/debian/control 2021-09-30 06:33:09.000000000 +0000
@@ -13,7 +13,6 @@
clang (>= 1:5.0.2) [alpha amd64 arm64 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),
- debhelper (>= 10.10.4),
debhelper-compat (= 12),
default-jdk (>= 2:1.9) [!hppa !s390 !sparc !hurd-i386] <!nojava>,
dh-apparmor,
@@ -21,28 +20,14 @@
dpkg-dev (>= 1.20.1),
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.2~),
libabw-dev (>= 0.1),
libarchive-zip-perl [!hppa !mips64 !s390 !sparc] <!nojava>,
@@ -60,14 +45,12 @@
libcdr-dev (<< 0.2~),
libcdr-dev (>= 0.1),
libclucene-dev (>= 2.3.3.4-4.1),
- 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 (<< 0.2~),
libe-book-dev (>= 0.1),
- libe-book-dev (>= 0.1.2) <!nocheck>,
libebook1.2-dev,
libeot-dev,
libepoxy-dev (>= 1.2),
@@ -75,7 +58,6 @@
libepubgen-dev (>= 0.1.0),
libetonyek-dev,
libetonyek-dev (<< 0.2~),
- libetonyek-dev (>= 0.1.8) <!nocheck>,
libexpat1-dev,
libexttextcat-dev (>= 3.4.1),
libflute-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] <!nojava>,
@@ -154,7 +136,6 @@
libsm-dev,
libstaroffice-dev,
libstaroffice-dev (<< 0.1~),
- libstaroffice-dev (>= 0.0.3) <!nocheck>,
libsuitesparse-dev (>= 1:3.4.0),
libvisio-dev (<< 0.2~),
libvisio-dev (>= 0.1),
@@ -185,16 +166,13 @@
libzmf-dev,
libzmf-dev (<< 0.1~),
libzxingcore-dev,
- locales [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
lp-solve (>= 5.5.0.13-5+b1),
maven-repo-helper,
pkg-config,
poppler-data <!nocheck>,
- 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),
@@ -215,7 +193,6 @@
rdfind,
symlinks
Build-Conflicts: amd-libopencl1,
- fonts-opensymbol <!nocheck>,
nvidia-glx-dev,
nvidia-glx-legacy-dev,
nvidia-libopencl1
diff -Nru libreoffice-7.2.1/debian/rules libreoffice-7.2.1/debian/rules
--- libreoffice-7.2.1/debian/rules 2021-09-21 15:37:53.000000000 +0000
+++ libreoffice-7.2.1/debian/rules 2021-09-30 06:33:09.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
@@ -347,7 +349,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