diff -Nru libreoffice-6.4.5~rc1/debian/changelog libreoffice-6.4.5~rc1/debian/changelog --- libreoffice-6.4.5~rc1/debian/changelog 2020-06-21 11:07:16.000000000 +0000 +++ libreoffice-6.4.5~rc1/debian/changelog 2020-06-28 17:22:50.000000000 +0000 @@ -1,3 +1,13 @@ +libreoffice (1:6.4.5~rc1-2+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 at Fri, 27 Apr 2018 02:14:18 +0000] + * Disable testsuite. + + -- Raspbian forward porter Sun, 28 Jun 2020 17:22:50 +0000 + libreoffice (1:6.4.5~rc1-2) unstable; urgency=medium * debian/patches/apparmor-cleanups.diff: #include diff -Nru libreoffice-6.4.5~rc1/debian/control libreoffice-6.4.5~rc1/debian/control --- libreoffice-6.4.5~rc1/debian/control 2020-06-21 11:07:16.000000000 +0000 +++ libreoffice-6.4.5~rc1/debian/control 2020-06-28 17:22:50.000000000 +0000 @@ -11,7 +11,6 @@ bzip2, 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.8) [!hppa !s390 !sparc !hurd-i386 !i386] , default-jdk (>= 2:1.8-55) [sparc64] , @@ -20,30 +19,15 @@ dh-apparmor, dh-python , 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] , 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.1), libarchive-zip-perl [!hppa !mips64 !s390 !sparc] , libavahi-client-dev, @@ -60,19 +44,16 @@ 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] , libcups2-dev, libcurl4-gnutls-dev, libdbus-1-dev (>= 0.60), libdconf-dev (>= 0.15.2), libe-book-dev, - libe-book-dev (>= 0.1.2) , libebook1.2-dev, libeot-dev, libepoxy-dev (>= 1.2), libepubgen-dev (>= 0.1.0), libetonyek-dev, - libetonyek-dev (>= 0.1.8) , libexpat1-dev, libexttextcat-dev (>= 3.4.1), libflute-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] , @@ -114,7 +95,6 @@ libmdds-dev (>= 1.5), libmspub-dev (>= 0.1), libmwaw-dev (>= 0.3.1), - libmwaw-dev (>= 0.3.15) , libmythes-dev (>= 2:1.2), libneon27-gnutls-dev, libnspr4-dev, @@ -140,13 +120,11 @@ libserializer-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] , libsm-dev, libstaroffice-dev, - libstaroffice-dev (>= 0.0.3) , 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) , libx11-dev, libxaw7-dev, libxcb-icccm4-dev, @@ -164,15 +142,12 @@ libxt-dev, libxtst-dev, libzmf-dev, - 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), @@ -187,19 +162,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 , - g++-9 (= 9.2.1-12) , - g++-9 (= 9.2.1-13) , - g++-9 (= 9.2.1-14) , - g++-9 (= 9.2.1-15) , - g++-9 (= 9.2.1-15.1) , nvidia-glx-dev, nvidia-glx-legacy-dev, nvidia-libopencl1 diff -Nru libreoffice-6.4.5~rc1/debian/rules libreoffice-6.4.5~rc1/debian/rules --- libreoffice-6.4.5~rc1/debian/rules 2020-06-21 11:07:11.000000000 +0000 +++ libreoffice-6.4.5~rc1/debian/rules 2020-06-28 17:22:50.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 @@ -468,7 +470,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