/external/hyphen/

istro/cib/libreoffice-6-0'>distro/cib/libreoffice-6-0 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/distro-configs/LibreOfficeFlatpak.conf
AgeCommit message (Collapse)Author
2018-06-27Just 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> (cherry picked from commit 3a8ae607cb0e63f252ca5a3b224f479cf304dc3f) Reviewed-on: https://gerrit.libreoffice.org/56404 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit fa465508dfa98eff7fe6f9aacbb75d3fd2fb6eac)
2018-06-27Update 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> (cherry picked from commit 930cb22f75c672c2fa3a4153094df4dd3a71cb7f) Reviewed-on: https://gerrit.libreoffice.org/55429 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e0287fcde646c1f6377f3ae9babe7b5155780282)
2018-06-27solenv/flatpak-manifest.in: Properly disable debug informationStephan Bergmann
...see 02248e9e191f798f96218a0c4d281f99e15bea31 "solenv/flatpak-manifest.in: Disable debug information again, for now" commit message Reviewed-on: https://gerrit.libreoffice.org/55453 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a7db7f3ce699a46ce7e9eafdf4388a3213264464) Conflicts: solenv/flatpak-manifest.in Change-Id: I4a9f8c547a50e8a8c83b5f96768949867aa4bb7b Reviewed-on: https://gerrit.libreoffice.org/55464 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 851d90b25db848c36a6887023b7a5877e293004a)
2018-04-12Merge 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> (cherry picked from commit 727bfa2c87db170483c1e4ae895174295b070c77) Reviewed-on: https://gerrit.libreoffice.org/52653 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 14d68eedb534d55cf2df60de38822c9b1678f9d7)
2018-01-09Let 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> (cherry picked from commit 0ba869fc5c13a29599fda7eb976b2e7959706e04) Reviewed-on: https://gerrit.libreoffice.org/47618 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-01-04Add 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). Reviewed-on: https://gerrit.libreoffice.org/47322 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 22effe2b8edf46539bde34497c6ac3201d70f5ed) Conflicts: solenv/flatpak-manifest.in Change-Id: I5b67c37f168533f9dc7ade11c7c4e2c42814b942 Reviewed-on: https://gerrit.libreoffice.org/47401 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@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