Fix AppData.xml installation #218
Conversation
|
Could you also cherry-pick the two other desktop/appdata-related commits from https://github.com/arch1t3cht/Aegisub/pull/52/commits and remove the |
EL-File4138
force-pushed
the
appdata-fix
branch
from
8f33c74 to
cd9619d
Compare
|
Did a bit of force push to correct past commit state, hope that does not mess around the history. Also corrected the metadata template. |
a91c4f7 switched processing of the desktop file from intltool to gettext-backed i18n.merge_file and dropped leading underscores which used to be processed by intltool. However, this commit omitted dropping the underscore from Keywords, resulting in this field being stripped from the installed version. Furthermore, make_pot.sh was broken since it too relied on the underscore meaning POT regeneration will now remove the desktop files strings from translation files. Since it was not added to po/POTFILES meson’s native aegisub-pot target also doesn't add desktop file strings to the translation pool. Though, this target still misses a lot of other strings as well and shouldn't be used yet anyway. This commit removes leftover underscores and reintegrates desktop file strings into both make_pot.sh. Integration into aegisub-pot is done in a follow-up commit.
meson’s i18n module get’s confused by .template and fails to extract translatable strings, thus rename to in.in. Note: while this slightly improves the situation, meson’s aegisub-pot target is still missing many strings. make_pot.sh should be used.
arch1t3cht
force-pushed
the
appdata-fix
branch
from
cd9619d to
ae20ba2
Compare
|
Your rebase had a merge conflict marker in it that was then again wiped by the first renaming commit, so I re-cherry-picked things and force pushed. meson's i18n module is definitely still not complete, yes, but that can be fixed some other time. |
arch1t3cht
force-pushed
the
appdata-fix
branch
2 times, most recently
from
e25e87a to
9d89a7c
Compare
It used to be genrated and installed by the old custom build system, but apparently got lost in switching to meson. Rename to .in.in instead of .template.in, since i18n otherwise gets utterly confused failing to recognise the file type and both erroring out with "no ITS rules found" during merge_file and failing to extract any translatable strings. Also drop underscores which were previously processed by intltool. This doesn't yet automatically replace the release version and date in the appdata file, but neither did the old build. Note: while this slightly improves the situation, meson’s aegisub-pot target is still missing many strings. make_pot.sh should be used.
This aligns with the specification change of AppData metadata. This together with two cherry-picked commit (2716cf1, 932b04d) should resolve TypesettingTools#215.
|
Understood, do you think it's ready to be merged now? |
This fix #215.
It passed an out-of-band build/packaging session on Fedora Copr.