summaryrefslogtreecommitdiff
path: root/distro-configs/LibreOfficeFlatpak.conf
AgeCommit message (Collapse)Author
2019-01-28aarch64 and arm need libatomic_opsStephan Bergmann
(cf. LO's configure.ac, needed for external/firebird on non-x86[-64]), but org.freedesktop.Sdk//18.08 apparently doesn't provide it (while org.freedesktop.Sdk//1.6 apparently did) (cf. <https://github.com/flathub/org.libreoffice.LibreOffice/pull/67/commits/ b2762523a4678bedd55c11db232868cbaf9c7bdd> "aarch64 and arm need libatomic_ops") Change-Id: I6eb060251ce85bfd399b72d9c90a93497a3a9029 Reviewed-on: https://gerrit.libreoffice.org/66987 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-01-03Update Flatpak to OpenJDK11Stephan Bergmann
see <https://github.com/flathub/org.libreoffice.LibreOffice/issues/57> "OpenJDK 11 is available". Change-Id: Ie24ed7349ca9a4a57c1a8d18d10b29c4a37e259c Reviewed-on: https://gerrit.libreoffice.org/65830 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-20Enable --help=html for flatpakStephan Bergmann
To not increase the size of the main org.libreoffice.LibreOffice app further, the plan was to realize this as an org.libreoffice.LibreOffice.Help extension. Ideally, this would be a localized extension, so that, by default, only a relevant subset of the extension would be downloaded and installed. (But see below.) There are multiple technical problems, as discussed at <https://github.com/ flathub/org.libreoffice.LibreOffice/issues/35#issuecomment-447295308> "Add integrated LibreOffice Help offline": * LO can't pass a file URL with query part to xdg-open, so uses a temporary wrapper .html file that redirects to the target URL. But for the flatpak case this wrapper can't be in /tmp (which isn't visible from outside the flatpak sandbox), but is instead stored in a new temp dir under $XDG_CACHE_HOME (which is always set for flatpaks and /is/ visible form the outside) that is removed on LO exit. * The file URL stored in the temp file must be rewritten from the internal path (/app/libreoffice/help/...) to the path as seen outside the flatpak sandbox. While the path for the org.libreoffice.LibreOffice /app is stored in /.flatpak-info, the external path for the org.libreoffice.LibreOffice.Help extension is different and not stored there. So use a hack trying to construct that path from what information is available in /.flatpak-info. * But the help content consists of locale-specific and shared files, and those reference each other with relative links. But a localized flatpak extension cannot contain shared files, it can only contain per-language sub-dirs. And if the shared help files were kept out of the extension, as part of the app itself, the relative paths among these files inside the flatpak sandbox would differ from those outside of it, so would be broken when viewing the content in the external browser. A solution would either (a) need to somehow rewrite the content of all the help files being served from LO to the external browser, or (b) replicate the shared help files in all the extension's per- language sub-dirs (and if some localization uses en-US content as a fallback for only part of its translated content, e.g., in the case of media files, would need to also replicate that en-US content), or (c) use a non-localized extension that always contains the content for all localizations. For now, I chose the third approach. This makes the org.libreoffice.LibreOffice.Help extension relatively large (the current /app/libreoffice/help tree has a size of ca. 100MB), so that I decided to not have it downloaded and installed automatically ("no-autodownload": true in solenv/flatpak-manifest.in). (I checked with Flatpak 1.0.6 that if the extension should be changed to a localized one with the same name in the future, updating from an older version would work. If the old extension was not installed, just the relevant localizations of the new version will be downloaded and installed. If the old extension was installed, the full set of localizations of the new version will be downloaded and installed.) (As also mentioned at <https://github.com/flathub/org.libreoffice.LibreOffice/ issues/35#issuecomment-447295308>: "A second, minor, nuisance is that, for security reasons, an `xdg-open file:///...html` call from a flatpak leads to an intermediate popup dialog letting the user chose which application to use to open the URI, while e.g. an `xdg-open http:///...html` is allowed to go directly to the user's preferred browser. So accessing help content from LO flatpak would present that popup dialog first, forcing the user to select a browser to proceed.") Change-Id: I35f5a23947dd551dc1b9bff1dd2abd6710073b5f Reviewed-on: https://gerrit.libreoffice.org/65451 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-11mythes is included in org.freedesktop.Sdk//18.08Stephan Bergmann
Change-Id: I9980f60ebe4cef26348fc26af6b56245260abcca Reviewed-on: https://gerrit.libreoffice.org/64937 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-09-03Adapt solenv/flatpak-manifest.in to recent changesStephan Bergmann
Change-Id: Ibbc167ca736012e7585694885370c1505ad48499 Reviewed-on: https://gerrit.libreoffice.org/59939 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-06-25Just use --with-extra-buildid=FlatpakStephan Bergmann
...as suggested in comment <https://github.com/flathub/ org.libreoffice.LibreOffice/issues/48#issuecomment-399739393> to "LibreOffice 6.0.5": "Should 'Flatpak version' be just 'Flatpak' to save translation of 'version' in the string for non-English locales?" Change-Id: I53171a5725f54520ae9e3cbaf294e291d16e1c78 Reviewed-on: https://gerrit.libreoffice.org/56390 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-06-08solenv/flatpak-manifest.in: Properly disable debug informationStephan Bergmann
...see 02248e9e191f798f96218a0c4d281f99e15bea31 "solenv/flatpak-manifest.in: Disable debug information again, for now" commit message Change-Id: I4a9f8c547a50e8a8c83b5f96768949867aa4bb7b Reviewed-on: https://gerrit.libreoffice.org/55453 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-06-07Update Flatpak to OpenJDK10Stephan Bergmann
see <https://github.com/flathub/org.libreoffice.LibreOffice/issues/42> "OpenJDK 10 is now available". Change-Id: Iaae9d22d91d984a5c11eee26bd05ab7d328d7a5b Reviewed-on: https://gerrit.libreoffice.org/55422 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-05-15Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
Change-Id: Ic8f4afe8f46b5f0c36eeffdbb04b3cc652884ab4
2018-04-09Merge in Flatpak improvementsStephan Bergmann
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: commit 7a2393f5fcab8c6938180c4718f2c61acd495528 Author: Robert McQueen <rob@endlessm.com> Date: Tue Apr 3 10:41:22 2018 +0100 port to freedesktop.org 1.6 runtime Gtk+3/GIO/etc dependencies used by LO in "GNOME" mode are actually included in the freedesktop.org runtime. Try to build against fd.o by downgrading gst-libav (fd.o has gst 1.10 rather than gnome's 1.12), bundling dbus-glib and disable Gtk+ 2. commit 42650da01f270e86bfb40035a9194b23ccf24c4c Author: Robert McQueen <rob@endlessm.com> Date: Tue Apr 3 11:23:27 2018 +0100 fix up LD_LIBRARY_PATH with gcc7 Append to library path rather than resetting it (causes build failures due to overriding /app/lib). commit 3e4c655294c8124cb54e1c651ec4dc1230b8151e Author: Robert McQueen <rob@endlessm.com> Date: Tue Apr 3 11:25:02 2018 +0100 fixup solenv/bin/assemble_flatpak.sh Use mkdir -p to be robust to other modules (ie dbus-glib) creating some of the paths before we do. commit d1d449ffa837b1de876f524494dbce09ec92ce73 Author: Robert McQueen <rob@endlessm.com> Date: Wed Apr 4 15:50:49 2018 +0100 split resource/registry data into Locales extension Move the language-specific data into the /app/share/runtime path which flatpak-builder splits into the Locale extension if we re-enable separate-locales. We symlink the original locations back to these paths, which means we have dangling symlinks depending on which Locale sutpaths are installed. Include Stephan Bergmann's patch from https://gerrit.libreoffice.org/#/c/52381/ to make the configmgr robust to such dangling links. commit ad6674f166c68fb79e19d80950a104a0a33f81dc Author: Robert McQueen <rob@endlessm.com> Date: Wed Apr 4 16:05:28 2018 +0100 make locale split glob more specific This loop will fail if the share/registry/res folder gains any .xcd files which are not named fcfg_langpack_* or registry_* so just to be safe, only glob these files. Change-Id: Icd41d7077b9f308dbb196927715b210328709662 Reviewed-on: https://gerrit.libreoffice.org/52642 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-15--without-lxml for Flatpak buildsStephan Bergmann
where the Yocto-based GNOME SDK provides no python lxml, but building LO's internal one fails because it internally uses {xml2,xslt}-config, and those are broken by (mis?-)design in Yocto, just returning with exit code 1. It didn't work well to pass applications of pkg-config into the external/lxml build as replacements for --with-{xml2,xslt}-config (as is successfully done elsewhere with 1462b2784fa3e95499808b2ef706e4787a01aaae "Adapt the external/redland/raptor/xml2-config.patch to raptor2-2.0.15"), so just run gla11y in its slightly limited form without lxml in the Flatpak build. Change-Id: I2d42901373c8c861b16da385c37bcc24d6e783fd Reviewed-on: https://gerrit.libreoffice.org/51321 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-08Let flatpak-builder build .Debug extensionStephan Bergmann
Includes a revert of 58891d589bd8da700f135b098dd50833277c65dc "Add distro-pack- install-strip target to be used by dev-tools' flatpak/build.sh". Change-Id: Ie2ba18bc13471b46e8d5f41868bae5aee17ff25f Reviewed-on: https://gerrit.libreoffice.org/47599 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-01-03Add JVM support to FlatpakStephan Bergmann
...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/5> "Add JRE-based components". It appeared to be easiest to install the Ant build-time dependency to /run/build/libreoffice/ant, instead of making it into a flatpak-builder module of its own. (The sha512 is as given at <http://ant.apache.org/bindownload.cgi>.) To avoid further dependencies, configure --without-export-validation and --without-junit, only affecting build-time checks (and the amount of checks thus affected by a plain `make` should be small). Change-Id: I5b67c37f168533f9dc7ade11c7c4e2c42814b942 Reviewed-on: https://gerrit.libreoffice.org/47322 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-10-30related: tdf#103884 remove gltf/collada featureThorsten Behrens
Change-Id: Icd26ad96c0337844ef1463dabfbe791caa00dd2d Reviewed-on: https://gerrit.libreoffice.org/43972 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2017-09-07No libqxp in org.gnome.Sdk//3.24Stephan Bergmann
Change-Id: Ia3551572269e1cf04b2a398cd08f718fd248c6e6
2017-08-18No libepubgen in org.gnome.Sdk//3.24Stephan Bergmann
Change-Id: I71a9e382b2a36cfba38dbd14e1af303153356d47
2017-06-28No suitable xmlsec found in org.gnome.Sdk//3.24Stephan Bergmann
Change-Id: I233925da999cffb80fee5e9ef00137b710b61f56
2017-04-10No gpgmepp in org.gnome.Sdk//3.20Stephan Bergmann
Change-Id: I4ca06ca42bd48151fcee4a0f22ebdaef4a797e6a
2017-02-02Adapt LibreOfficeFlatpak.conf to newly added dependenciesStephan Bergmann
...that are all not provided by the underlying GNOME 3.20 SDK/runtime Change-Id: I23f1a462f8bf44a30c09bbccad5916304d7c4da1
2016-12-13change from glew to epoxyCaolán McNamara
because that works under wayland out of the box and gtk3 uses it already Change-Id: Iefaac31e325534a81a5389f752804af917c1baef Reviewed-on: https://gerrit.libreoffice.org/31213 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-11xdg-app got renamed to FlatpakStephan Bergmann
Change-Id: Ib5ea4ad5b6033ee1634ea2f245742f862a40042d
generated by cgit (git 2.34.1) at 2025-01-28 15:02:17 +0000