solenv/flatpak-manifest.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit db698a94ad52d1fbc387df66845907595615bb4f
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Apr 18 13:34:23 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Apr 18 14:25:13 2019 +0200
Disable OpenCL by default for LO Flatpak
...merging <https://github.com/flathub/org.libreoffice.LibreOffice/commit/
2c72c8b2c9beb4995c5a57b4eedf05f6c7ff248d> "Disable OpenCL by default for LO
Flatpak":
"This fixes
<https://github.com/flathub/org.libreoffice.LibreOffice/issues/82>
'LibreOffice cannot be launched with flatpak in normal mode on ASUS E402YA',
where LO was found hanging (for as yet unclear exact reasons) on one machine
when OpenCL was enabled. There have been other issues with OpenCL like
<https://bugzilla.redhat.com/show_bug.cgi?id=1432468> 'LibreOffice crashes
on
startup' on Fedora, so for a Flatpak build targeting a wide range of
distros,
the conservative approach is probably to disable OpenCL by default and have
users explicitly enable it instead."
Change-Id: I887137d1ceb5d97f007f09cba636c59f197f1bff
Reviewed-on: https://gerrit.libreoffice.org/70928
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 4fcf0f5f1383..ef5802713baf 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -574,7 +574,8 @@
"./autogen.sh --prefix=/run/build/libreoffice/inst
--with-distro=LibreOfficeFlatpak",
"make $(if test \"$FLATPAK_ARCH\" = i386; then printf
build-nocheck; fi)",
"make distro-pack-install",
- "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'"
+ "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'",
+ "printf '<?xml version=\"1.0\"?>\\n<oor:data
xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";
xmlns:oor=\"http://openoffice.org/2001/registry\";><dependency
file=\"main\"/><oor:component-data oor:name=\"Common\"
oor:package=\"org.openoffice.Office\"><node oor:name=\"Misc\"><prop
oor:name=\"UseOpenCL\"><value>false</value></prop></node></oor:component-data></oor:data>'
>/app/libreoffice/share/registry/flatpak.xcd"
]
}
],
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
