diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-20 08:56:47 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-05-02 16:00:27 +0200 |
| commit | 705cc3266e5662aa0b6cd752ae0b7fdda6c2da10 (patch) | |
| tree | 9fb8159ecff0708f5acb9fb6e4ec17c2ada6677a | |
| parent | tdf#117129 ww8import: prevent divide-by-zero (diff) | |
| download | core-705cc3266e5662aa0b6cd752ae0b7fdda6c2da10.tar.gz core-705cc3266e5662aa0b6cd752ae0b7fdda6c2da10.zip | |
Merge in Flatpak improvements
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:
commit 715fbcfb4e5c51d40387998932984e54639476a1
Author: Robert McQueen <rob@endlessm.com>
Date: Tue Apr 17 10:26:32 2018 +0100
edit .desktop files to add X-Endless-Alias with original names
Endless OS uses this to update icon grids & taskbar pins if the original files
have been removed. (Happy to update this to a more standardised key if a
consensus emerges.)
Change-Id: I646350090c38d84d1930c5afbec0ee500b60d0fb
(cherry picked from commit a161e41439fc6f9093c212a523154e5146bb1502)
Reviewed-on: https://gerrit.libreoffice.org/53199
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | solenv/flatpak-manifest.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 679ffa773872..52b4c163c207 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -577,7 +577,9 @@ "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak --disable-symbols $(if test \"$(uname -m)\" = aarch64; then printf %s --disable-pdfium; fi)", "make $(if test \"$(uname -i)\" = 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'", + "desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-startcenter /app/share/applications/org.libreoffice.LibreOffice.desktop", + "for i in base calc draw impress math writer xsltfilter; do desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-$i /app/share/applications/org.libreoffice.LibreOffice-$i.desktop; done" ] } ], |