ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#135504: Install application metadata in /usr/share/metainfo

Browse Source 
Current path /usr/share/appdata is deprecated [1].

[1] https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location

Change-Id: Ibd837240ad329c005a840f9ae2e0f4f13f139b59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106025
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
This commit is contained in:
Chris Mayo
2020-12-23 16:21:31 +01:00
committed by Michael Stahl
parent f7de7de118
commit 4cd4726e9d
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solenv/bin/assemble-flatpak-appdata-step1.sh
+1 -1
View File
@@ -19,7 +19,7 @@
set -e
## org.libreoffice.LibreOffice.appdata.xml is manually derived from the various
## inst/share/appdata/libreoffice-*.appdata.xml (at least recent GNOME Software
## inst/share/metainfo/libreoffice-*.appdata.xml (at least recent GNOME Software
## doesn't show more than five screenshots anyway, so restrict to one each from
## the five libreoffice-*.appdata.xml: Writer, Calc, Impress, Draw, Base):
cat <<\EOF >"${1?}"org.libreoffice.LibreOffice.appdata.xml
solenv/bin/assemble-flatpak.sh
+1 -1
View File
@@ -63,7 +63,7 @@ done
mkdir -p /app/share/appdata
"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step1.sh /app/share/appdata/ 1
"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh "${PREFIXDIR?}"/share/appdata/ \
"${SRCDIR?}"/solenv/bin/assemble-flatpak-appdata-step2.sh "${PREFIXDIR?}"/share/metainfo/ \
/app/share/appdata/
## see <https://github.com/flatpak/flatpak/blob/master/app/
sysui/desktop/freedesktop/freedesktop-menus.spec
+1 -1
View File
@@ -391,5 +391,5 @@ fi
/usr/share/icons/hicolor/*/apps/*png
/usr/share/icons/hicolor/*/apps/*svg
/usr/share/icons/hicolor/*/mimetypes/*png
/usr/share/metainfo/*
/usr/share/mime/packages/*
/usr/share/appdata/*
sysui/desktop/share/create_tree.sh
+3 -3
View File
@@ -56,9 +56,9 @@ for i in `cat launcherlist`; do
ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/${PREFIXDIR}/share/applications/${PREFIX}-${i}"
done
mkdir -p "${DESTDIR}/${PREFIXDIR}/share/appdata"
mkdir -p "${DESTDIR}/${PREFIXDIR}/share/metainfo"
for i in base calc draw impress writer; do
cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/${PREFIX}-${i}.appdata.xml"
cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/metainfo/${PREFIX}-${i}.appdata.xml"
done
cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIXDIR}/share/appdata/org.${PREFIX}.kde.metainfo.xml"
cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIXDIR}/share/metainfo/org.${PREFIX}.kde.metainfo.xml"