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>

2 files changed, 8 insertions, 8 deletions

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 802c61cd8f86..67ad285fcf98 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -20,15 +20,15 @@ mkdir -p /app/share/applications
 for i in "${PREFIXDIR?}"/share/applications/libreoffice-*.desktop
 do
  sed -e 's,^Exec=libreoffice,Exec=/app/libreoffice/program/soffice,' \
-  -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' "$i" \
-  >/app/share/applications/org.libreoffice.LibreOffice-"${i#"${PREFIXDIR?}"/share/applications/libreoffice-}"
+  -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice./' "$i" \
+  >/app/share/applications/org.libreoffice.LibreOffice."${i#"${PREFIXDIR?}"/share/applications/libreoffice-}"
 done
-mv /app/share/applications/org.libreoffice.LibreOffice-startcenter.desktop \
+mv /app/share/applications/org.libreoffice.LibreOffice.startcenter.desktop \
  /app/share/applications/org.libreoffice.LibreOffice.desktop
 
 # Flatpak .desktop exports take precedence over system ones due to
 # the order of XDG_DATA_DIRS - re-associating text/plain seems a bit much
-sed -i "s/text\/plain;//" /app/share/applications/org.libreoffice.LibreOffice-writer.desktop
+sed -i "s/text\/plain;//" /app/share/applications/org.libreoffice.LibreOffice.writer.desktop
 
 ## icons/hicolor/*/apps/libreoffice-* ->
 ## icons/hicolor/*/apps/org.libreoffice.LibreOffice-*:
@@ -40,7 +40,7 @@ do
  cp -a "$i" \
   "$(dirname /app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/"$(basename "$i")"
  cp -a "$i" \
-  "$(dirname /app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/org.libreoffice.LibreOffice-"${i##*/apps/libreoffice-}"
+  "$(dirname /app/share/icons/hicolor/"${i#"${PREFIXDIR?}"/share/icons/hicolor/}")"/org.libreoffice.LibreOffice."${i##*/apps/libreoffice-}"
 done
 
 mkdir -p /app/share/runtime/locale
@@ -142,7 +142,7 @@ EOF
 # append the appdata for the different components
 for i in "${PREFIXDIR?}"/share/appdata/libreoffice-*.appdata.xml
 do
-  sed "1 d; s/<id>libreoffice/<id>org.libreoffice.LibreOffice/" "$i" \
+  sed "1 d; s/<id>libreoffice-/<id>org.libreoffice.LibreOffice./" "$i" \
     >>/app/share/appdata/org.libreoffice.LibreOffice.appdata.xml
 done
 
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"
             ]
         }
     ],