summaryrefslogtreecommitdiff
path: root/chart2/source/controller/sidebar/ChartColorWrapper.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2023-06-08 13:08:14 +0200
committerAndras Timar <andras.timar@collabora.com>2023-06-09 12:28:37 +0200
commit36f21d78e26183066851dd58e5bc8ea6e991161f (patch)
tree9fc3c5b8d895924e68ecacbfa2dd57f4d81a42be /chart2/source/controller/sidebar/ChartColorWrapper.cxx
parent0ec5f56f2fc5373a66f2f823e2035ab90a4bec76 (diff)
No longer append appdata for components to flatpak's metainfo
This had originally been added with <https://github.com/flathub/org.libreoffice.LibreOffice/commit/945f6caad87658b1df1e8918bd5f64939058ab7f> "clean up desktop integration", see its part "append the appdata for the separate apps (Base, Draw, etc) to the appdata XML we export for Flatpak, so they are visible in software centers etc". But it now started to cause Flathub builds (like <https://buildbot.flathub.org/#/builders/14/builds/3985>) to fail its "Check for right id in AppStream xml" step, and reportedly "the problem is there are multiple components in the metainfo file and I'm not sure it's allowed" (<https://matrix.to/#/!RfXaBjokqHAbzZrgHz:matrix.org/$jWhob-a4LEH-e_TXsJwGWNfMYLF1kcWpXV_oW982ZpI?via=matrix.org&via=gnome.org&via=kde.org>). The solution appears to be to just remove that again (<https://matrix.to/#/!RfXaBjokqHAbzZrgHz:matrix.org/$Yrzf_ZjJxBgUVs6kuP_10Tneu1t1wKQJCM_SC1vNHC4?via=matrix.org&via=gnome.org&via=kde.org>): > I think maybe the problem was from the times that GNOME Software was also > moonlighting as a menu editor > that without Flatpak providing the metainfo for LibreOffice's different > desktop launchers, they were invisible in GNOME Software, which meant you > couldn't add/remove them to menus or the desktop > but since then GNOME just shows all of the launchers, and menu editing / > categories mostly died or sank to the bottom of the 1990s ocean > so maybe this is a non-problem [...] > ah ok > ah so they don't show any more 🤣 So remove the now-unused solenv/bin/assemble-flatpak-appdata-step2.sh and consequently rename the sole remaining solenv/bin/assemble-flatpak-appdata-step1.sh to just solenv/bin/assemble-flatpak-appdata.sh. Change-Id: I3d3fef502f2114274a856102b77edafdd0ecac83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152744 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit b36041bd188c3e7fd95a47245d398ca5c5c29285) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152762 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'chart2/source/controller/sidebar/ChartColorWrapper.cxx')
0 files changed, 0 insertions, 0 deletions