solenv/flatpak-manifest.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit d49a0b7391d43b9e4f8e14f9a9bf0bb2223d0025 Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Feb 14 15:06:21 2018 +0100 Revert "--disable-pdfium for Linux aarch64 Flatpak build" ...which should no longer be needed w/ 9efd288b31e259b964097d3eeeff7f6c10945cb3 "pdfium: disable custom allocator". (On Flathub, the original problem had been seen with worker gnome-aarch64-1 using 64K pages, but not with arm-1/arm-3 using 4K pages.) This reverts commit ffc134445ef7e935d18d816626f64e65b4cdbca6. Conflicts: solenv/flatpak-manifest.in Change-Id: I7d169ba92cdcd651b1c560aabf0d4559fad8cf9c diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index cbe5b6a226c7..ae78d0823953 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -548,7 +548,7 @@ ], "buildsystem": "simple", "build-commands": [ - "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = aarch64; then printf %s --disable-pdfium; fi)", + "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak --disable-symbols", "make $(if test \"$(uname -i)\" = i386; then printf build-nocheck; fi)", "make distro-pack-install", "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits