solenv/flatpak-manifest.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ffc134445ef7e935d18d816626f64e65b4cdbca6
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Feb 9 11:26:43 2018 +0100
--disable-pdfium for Linux aarch64 Flatpak build
At least current PDFium master <https://pdfium.googlesource.com/pdfium/+/
026717cb667cf0c7215cf55daf794d69752fc900/third_party/base/allocator/
partition_allocator/page_allocator.h#33> still hard-codes the assumption
that
"All Blink-supported systems have 4096 sized system pages". On Linux
aarch64
machines with 64K page size (as reported by `getconf PAGE_SIZE`, e.g., on
Flathub worker <https://flathub.org/builds/#/workers/18> "gnome-aarch64-1"),
that causes LO's CppunitTest_svtools_graphic to fail with SIGABRT, when
pdfium::base::SetSystemPagesInaccessible (workdir/UnpackedTarball/pdfium/
third_party/base/allocator/partition_allocator/page_allocator.cpp) causes an
mprotect to fail in a pattern like
> mmap(0x1051200000, 2097152, PROT_READ|PROT_WRITE,
MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x1051200000
> mprotect(0x1051200000, 4096, PROT_NONE) = 0
> mprotect(0x1051202000, 8192, PROT_NONE) = -1 EINVAL (Invalid argument)
The loss of functionality caused by --disable-pdfium is assumed to be
acceptable
("used for insert->image and selecting a pdf I believe", according to
caolan on
IRC), and e.g. Fedora disables it for all arches since
<https://src.fedoraproject.org/rpms/libreoffice/c/
1f6713e951de6aa9af43a9bd92ed011edf0c6fe9> "update to 5.4.0 alpha1".
Change-Id: I39385c332ddd6a2a3a221f0d0577181709944313
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c64ed249ffa8..0bbd0319d49d 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -532,7 +532,7 @@
],
"buildsystem": "simple",
"build-commands": [
- "./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=LibreOfficeFlatpak --disable-symbols",
+ "./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" =
aarch64; then printf %s --disable-pdfium; fi)",
"make",
"make distro-pack-install",
"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
commit 02248e9e191f798f96218a0c4d281f99e15bea31
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Feb 9 11:16:33 2018 +0100
solenv/flatpak-manifest.in: Disable debug information again, for now
Merge in <https://github.com/flathub/org.libreoffice.LibreOffice/commit/
c6831b215070415a32669fbe63adfc4c36b5f568> "Disable debug information again,
for
now", to bring repos back in sync. If we want to keep this permanently,
--enable-symbols should instead be dropped from
distro-configs/LibreOfficeFlatpak.conf.
Change-Id: I656d77a446deecbc41ab25f05af7187dc544126c
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 69b918113091..c64ed249ffa8 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -532,7 +532,7 @@
],
"buildsystem": "simple",
"build-commands": [
- "./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=LibreOfficeFlatpak",
+ "./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=LibreOfficeFlatpak --disable-symbols",
"make",
"make distro-pack-install",
"make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
commit a5ce8f010d996fb156ab747a07077c4ab7e8c9f4
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Feb 9 11:03:51 2018 +0100
Use sha256 instead of sha512
...as the latter is apparently a recent addition to flatpak-manifest that
some
Flathub workers (like <https://flathub.org/builds/#/workers/16> "arm-3")
still
do not support, causing "module libreoffice: Sha256 not specified" failures.
<http://ant.apache.org/bindownload.cgi> and
<https://archive.apache.org/dist/ant/binaries/> do not provide SHA-256
values,
so computed it locally.
Change-Id: Iee664402f26c9ab428624a4a7933db310efd71b1
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 1078b49ed62a..69b918113091 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -28,7 +28,7 @@
{
"type": "archive",
"url":
"https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz";,
- "sha512":
"a1af5173eafbc5b76fe0ae62c656c96a4c3bfd9d67b10ad19fef53152ae73d61aa05d1b57ceca1d007475113f234feb9d1541d2c624f6ac606361a6e6e375385",
+ "sha256":
"361c8ad2ed8341416e323e7c28af10a8297170a80fdffba294a5c2031527bb6c",
"dest": "ant"
},
{
commit ea89bd3fdd475fda72e852c687f6ce81b610df47
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Feb 9 11:00:12 2018 +0100
Use stable URL for apache-ant download
as proposed by
<http://mail-archives.apache.org/mod_mbox/ant-user/201802.mbox/
%3c001b01d3a101$eadd7ea0$c0987be0$@de%3e> "AW: Stable link to
apache-ant-*-bin.tar.xz?" (but using https instead of http)
Change-Id: I6f1a5d06c4f2f6ad1861a5c0bda3341f13c8899a
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index c19528f999d4..1078b49ed62a 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -27,7 +27,7 @@
},
{
"type": "archive",
- "url":
"http://www-us.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz";,
+ "url":
"https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.2-bin.tar.xz";,
"sha512":
"a1af5173eafbc5b76fe0ae62c656c96a4c3bfd9d67b10ad19fef53152ae73d61aa05d1b57ceca1d007475113f234feb9d1541d2c624f6ac606361a6e6e375385",
"dest": "ant"
},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
