diff -Nru libreoffice-6.1.4/debian/changelog libreoffice-6.1.4/debian/changelog --- libreoffice-6.1.4/debian/changelog 2018-12-15 14:02:18.000000000 +0000 +++ libreoffice-6.1.4/debian/changelog 2018-12-20 06:09:37.000000000 +0000 @@ -1,3 +1,13 @@ +libreoffice (1:6.1.4-1+rpi1) buster-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 Thu, 20 Dec 2018 06:09:37 +0000 + libreoffice (1:6.1.4-1) unstable; urgency=medium * New upstream release candidate diff -Nru libreoffice-6.1.4/debian/control libreoffice-6.1.4/debian/control --- libreoffice-6.1.4/debian/control 2018-12-15 14:02:18.000000000 +0000 +++ libreoffice-6.1.4/debian/control 2018-12-20 06:09:37.000000000 +0000 @@ -33,17 +33,13 @@ g++ (>= 4:7) [m68k], gcc (>= 4:7) [m68k], gdb [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , - ghostscript [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , gobject-introspection (>= 1.32.0), gperf, gpg , gpg-agent , gpgconf , - hunspell-en-us [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , - imagemagick [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , 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, @@ -62,7 +58,6 @@ libclucene-dev (>= 2.3.3.4-4.1), libcmis-dev (>= 0.5.0-3), libcommons-logging-java [!hppa !mips64 !s390 !sparc], - libcppunit-dev (>= 1.14) [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , libcups2-dev, libcurl4-gnutls-dev, libdbus-glib-1-dev (>= 0.70), @@ -171,11 +166,9 @@ lp-solve (>= 5.5.0.13-5+b1), maven-repo-helper, pkg-config, - pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , python3, python3-dev (>= 3.3), python3-distutils, - python3-lxml , qt5-qmake (>= 5.6), qtbase5-dev (>= 5.6), qtbase5-dev-tools (>= 5.6), @@ -190,19 +183,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-liberation (= 1:1.07.4-3) , - fonts-liberation (= 1:1.07.4-4) , - fonts-liberation (= 1:1.07.4-5) , - fonts-liberation2 (= 2.00.1-4) , - fonts-liberation2 (= 2.00.1-5) , - fonts-opensymbol , nvidia-glx-dev, nvidia-glx-legacy-dev, nvidia-libopencl1 diff -Nru libreoffice-6.1.4/debian/rules libreoffice-6.1.4/debian/rules --- libreoffice-6.1.4/debian/rules 2018-12-14 23:39:56.000000000 +0000 +++ libreoffice-6.1.4/debian/rules 2018-12-20 06:09:37.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 @@ -519,7 +521,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 (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS))) ENABLE_PDFIUM=y else