diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-02-12 16:07:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-02-13 13:53:07 +0100 |
| commit | e69843768707146dcd9c294b2cabe721f37e90ac (patch) | |
| tree | 7d9e0737f0de28e52d0188f77e6a63f78bbc706f /solenv/flatpak-manifest.in | |
| parent | 790c234d150e31460709a036ab0bb31884a7e6d7 (diff) | |
Merge in Flatpak improvements
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>:
commit ab8032d1e660db5e77ec7b64ac1d02e27941dfc5
Merge: d1aa013 42b6543
Author: stbergmann <sbergman@redhat.com>
Date: Wed Feb 13 10:01:33 2019 +0100
Merge pull request #73 from flathub/fix-quoting
fix quoting
commit 42b6543ee833e5610465118bbea310ab87807d48
Author: Stephan Bergmann <sbergman@redhat.com>
Date: Tue Feb 12 16:34:08 2019 +0100
fix quoting
commit d1aa013fb631191174f6eb4d390ad5ea0b68a053
Merge: 35de93f dd48ab6
Author: stbergmann <sbergman@redhat.com>
Date: Tue Feb 12 10:33:21 2019 +0100
Merge pull request #69 from flathub/dotty-app-IDs
rename sub-app .desktop files so they are strict sub-IDs
commit dd48ab67b00859a36c3f40a08112afb6078deecc
Author: Robert McQueen <rob@endlessm.com>
Date: Fri Jun 1 12:27:05 2018 +0100
rename sub-app .desktop files so they are strict sub-IDs
The org.libreoffice.LibreOffice-foo names are not actually sub-IDs of
org.libreoffice.LibreOffice which means that Flatpak will not export the
additional components in the appstream. Change the - to . so that the
sub-apps are correctly within the org.libreoffice.LibreOffice namespace
rather than a mere prefix match. Set the X-Flatpak-RenamedFrom list
in the .desktop files to include both the original upstream names
and the - delimited old IDs that we used previous in the Flatpak.
https://github.com/flathub/org.libreoffice.LibreOffice/issues/36
Change-Id: Ida8d5dc8ea38362f77ffb0cf58d3c998b69bd587
Reviewed-on: https://gerrit.libreoffice.org/67737
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv/flatpak-manifest.in')
| -rw-r--r-- | solenv/flatpak-manifest.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 8833fd688f04..833641babbae 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -575,8 +575,8 @@ "make $(if test \"$FLATPAK_ARCH\" = i386; then printf build-nocheck; fi)", "make distro-pack-install", "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" + "desktop-file-edit --set-key=X-Endless-Alias --set-value=libreoffice-startcenter --set-key=X-Flatpak-RenamedFrom --set-value='libreoffice-startcenter.desktop;' /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 --set-key=X-Flatpak-RenamedFrom --set-value=\"libreoffice-$i.desktop;org.libreoffice.LibreOffice-$i.desktop;\" /app/share/applications/org.libreoffice.LibreOffice.$i.desktop; done" ] } ], |