diff -Nru libreoffice-7.1.5/debian/changelog libreoffice-7.1.5/debian/changelog --- libreoffice-7.1.5/debian/changelog 2021-08-18 06:56:00.000000000 +0000 +++ libreoffice-7.1.5/debian/changelog 2021-08-25 00:04:02.000000000 +0000 @@ -1,3 +1,13 @@ +libreoffice (1:7.1.5-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green 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 Wed, 25 Aug 2021 00:04:02 +0000 + libreoffice (1:7.1.5-2) unstable; urgency=medium * debian/rules, debian/tests/control.in: diff -Nru libreoffice-7.1.5/debian/control libreoffice-7.1.5/debian/control --- libreoffice-7.1.5/debian/control 2021-08-18 06:56:00.000000000 +0000 +++ libreoffice-7.1.5/debian/control 2021-08-25 00:04:02.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] , 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] , flex (>= 2.3.35), - fontconfig [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , fontforge-nox | fontforge, - fonts-crosextra-carlito [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - fonts-dejavu [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - fonts-liberation2 [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , g++ (>= 4:7), gcc (>= 4:7), - gdb [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - ghostscript [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , gobject-introspection (>= 1.32.0), gperf (>= 3.1), - gpg , - gpg-agent , - gpgconf , - hunspell-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - hyphen-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - imagemagick [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , java-common (>= 0.61) , javahelper (>= 0.37~) , - junit4 (>= 4.8.2-2) [amd64 arm64] , libabw-dev (<< 0.2~), libabw-dev (>= 0.1), libarchive-zip-perl [!hppa !mips64 !s390 !sparc] , @@ -63,14 +48,12 @@ libcmis-dev (<< 0.6~), libcmis-dev (>= 0.5.2~), libcommons-logging-java [!hppa !mips64 !s390 !sparc] , - libcppunit-dev (>= 1.14) [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , 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) , libebook1.2-dev, libeot-dev, libepoxy-dev (>= 1.2), @@ -78,7 +61,6 @@ libepubgen-dev (>= 0.1.0), libetonyek-dev, libetonyek-dev (<< 0.2~), - libetonyek-dev (>= 0.1.8) , libexpat1-dev, libexttextcat-dev (>= 3.4.1), libflute-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] , @@ -158,7 +140,6 @@ libsm-dev, libstaroffice-dev, libstaroffice-dev (<< 0.1~), - libstaroffice-dev (>= 0.0.3) , libsuitesparse-dev (>= 1:3.4.0), libvisio-dev (<< 0.2~), libvisio-dev (>= 0.1), @@ -188,15 +169,12 @@ libxtst-dev, libzmf-dev, libzmf-dev (<< 0.1~), - locales [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , lp-solve (>= 5.5.0.13-5+b1), maven-repo-helper, pkg-config, - pstoedit [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , python3, python3-dev (>= 3.3) , python3-distutils , - python3-lxml , qt5-qmake (>= 5.6), qtbase5-dev (>= 5.6), qtbase5-dev-tools (>= 5.6), @@ -210,14 +188,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) , - g++-mingw-w64-i686 , gettext, graphviz , libbsh-java , rdfind, symlinks Build-Conflicts: amd-libopencl1, - fonts-opensymbol , nvidia-glx-dev, nvidia-glx-legacy-dev, nvidia-libopencl1 diff -Nru libreoffice-7.1.5/debian/rules libreoffice-7.1.5/debian/rules --- libreoffice-7.1.5/debian/rules 2021-08-17 14:15:36.000000000 +0000 +++ libreoffice-7.1.5/debian/rules 2021-08-25 00:04:02.000000000 +0000 @@ -15,6 +15,8 @@ # /usr/share/common-licenses/GPL or . ################################################################################ +export DEB_BUILD_OPTIONS += nocheck + vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1))) include /usr/share/dpkg/pkg-info.mk @@ -336,7 +338,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