Skip to content

Commit

Permalink
fix: nonet, appdata -> metainfo (#416)
Browse files Browse the repository at this point in the history
* Validate appdata file with nonet flag

By default, appstream-util checks if URLs listed in the appdata file are
resolvable.  Tuba's appdata file includes screenshot URLs.  Most Linux
distro build environments do not allow outbound network connections.
Without a network connection, the validation fails.  Fedora recommends
using the `--nonet` flag to skip that part.

https://docs.fedoraproject.org/en-US/packaging-guidelines/AppData/#_app_data_validate_usage

* Rename appdata file to metainfo

The current appdata/metainfo specification recommends the .metainfo.xml
extension.

https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html
  • Loading branch information
carlwgeorge authored Jul 28, 2023
1 parent b7f4e4c commit 8e0e380
Show file tree
Hide file tree
Showing 26 changed files with 93 additions and 93 deletions.
2 changes: 1 addition & 1 deletion build-aux/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ parts:
meson-parameters:
- --prefix=/usr
- -Ddevel=true
parse-info: [usr/share/metainfo/dev.geopjr.Tuba.appdata.xml]
parse-info: [usr/share/metainfo/dev.geopjr.Tuba.metainfo.xml]
build-packages:
- libjson-glib-dev
- libsecret-1-dev
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ if desktop_utils.found()
endif

appstream_file = i18n.merge_file(
input: meson.project_name() + '.appdata.xml.in',
output: meson.project_name() + '.appdata.xml',
input: meson.project_name() + '.metainfo.xml.in',
output: meson.project_name() + '.metainfo.xml',
po_dir: join_paths(meson.project_source_root(), 'po'),
install: true,
install_dir: join_paths(get_option('datadir'), 'metainfo'),
Expand All @@ -55,6 +55,6 @@ if appstream_util.found()
test(
'Validate appstream file',
appstream_util,
args: ['validate-relax', appstream_file],
args: ['validate-relax', '--nonet', appstream_file],
)
endif
2 changes: 1 addition & 1 deletion po/POTFILES
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
./data/dev.geopjr.Tuba.desktop.in
./data/dev.geopjr.Tuba.appdata.xml.in
./data/dev.geopjr.Tuba.metainfo.xml.in

./data/ui/widgets/status.ui
./data/ui/widgets/votebox.ui
Expand Down
8 changes: 4 additions & 4 deletions po/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ msgstr ""
"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
"X-Generator: Weblate 5.0-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "تصفح الفديفرس"

Expand All @@ -35,14 +35,14 @@ msgstr ""
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "تبويق;ماستدون;الفديفرس;غوتو سوشل;بليروما;أكوما;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
"platforms like Mastodon, GoToSocial, Akkoma &amp; more!"
msgstr ""

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/be.po
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 5.0-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Праглядзіце Fediverse"

Expand All @@ -35,7 +35,7 @@ msgstr "Кліент Fediverse"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -45,7 +45,7 @@ msgstr ""
"сувязі са сваімі любімымі супольнасцямі, сям'ёй і сябрамі з падтрымкай такіх "
"платформаў Fediverse, як Mastodon, GoToSocial, Akkoma і іншых!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/de_DE.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.0-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Surfe im Fediverse"

Expand All @@ -36,7 +36,7 @@ msgstr "Fediverse-Client"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -47,7 +47,7 @@ msgstr ""
"Unterstützung beliebter Fediverse-Plattformen wie Mastodon, GoToSocial, "
"Akkoma &amp; mehr!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.0-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Explore el Fediverso"

Expand All @@ -36,7 +36,7 @@ msgstr "Cliente para Fediverso"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -46,7 +46,7 @@ msgstr ""
"conectado con sus comunidades favoritas, familia y amigos con soporte para "
"plataformas de Fediverso populares como Mastodon, GoToSocial, Akkoma y más!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/eu.po
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.0-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Arakatu Fedibertsoa"

Expand All @@ -33,7 +33,7 @@ msgstr "Fedibertsorako bezeroa"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;fedibertsoa;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -43,7 +43,7 @@ msgstr ""
"zure komunitate gogokoenekin eta familia eta lagunekin, Mastodon, "
"GoToSocial, Akkoma eta bestelako Fedibertsoko plataformen laguntzaz!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/fa.po
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 4.18-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "توبا"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "کاوش در فدیورس"

Expand All @@ -36,7 +36,7 @@ msgstr ""
"toot;mastodon;fediverse;gotosocial;pleroma;akkoma;بوق;ماستودون;فدیورس;پلروما;"
"گوتو سوشال;آکوما;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -46,7 +46,7 @@ msgstr ""
"خانواده و دوستان با پشتیبانی از بن‌سازه‌های محبوب فدبورس چون ماستودون، "
"گوتوسوشال، آکوما و بیش‌تر!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/fi.po
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 5.0-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Selaa Fediverseä"

Expand All @@ -33,7 +33,7 @@ msgstr "Fediverse-asiakasohjelmisto"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -43,7 +43,7 @@ msgstr ""
"suosikkiyhteisöihisi, perheeseesi ja kavereihisi suosituilla "
"liittoversumialustoilla kuten Mastodon, GoToSocial, Akkoma ja niin edelleen!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 5.0-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Parcourez le Fédiverse"

Expand All @@ -34,7 +34,7 @@ msgstr "Client pour le Fédiverse"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "toot;pouet;fediverse;gotosocial;pleroma;akkoma;mastodon;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -45,7 +45,7 @@ msgstr ""
"plateformes populaires du Fédiverse comme Mastodon, GoToSocial, Akkoma & "
"plus encore !"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/hu.po
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.18-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Böngéssz a Fediverse-ben"

Expand All @@ -34,7 +34,7 @@ msgstr "Fediverse kliens"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr ""

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -45,7 +45,7 @@ msgstr ""
"népszerű Fediverse felületeken, mint a Mastodon, GoToSocial, Akkoma és még "
"sok más!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.18-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Esplora il Fediverso"

Expand All @@ -35,7 +35,7 @@ msgstr "Client Fediverso"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -45,7 +45,7 @@ msgstr ""
"comunità, famiglia e amici preferiti con il supporto per piattaforme "
"popolari del Fediverso come Mastodon, GoToSocial, Akkoma e molti altri!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
8 changes: 4 additions & 4 deletions po/ja.po
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 5.0-dev\n"

#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.appdata.xml.in:6
#: data/dev.geopjr.Tuba.desktop.in:4 data/dev.geopjr.Tuba.metainfo.xml.in:6
msgid "Tuba"
msgstr "Tuba"

#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.appdata.xml.in:7
#: data/dev.geopjr.Tuba.desktop.in:5 data/dev.geopjr.Tuba.metainfo.xml.in:7
msgid "Browse the Fediverse"
msgstr "Fediverse を探索"

Expand All @@ -33,7 +33,7 @@ msgstr "Fediverse クライアント"
msgid "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"
msgstr "toot;mastodon;fediverse;gotosocial;pleroma;akkoma;"

#: data/dev.geopjr.Tuba.appdata.xml.in:9
#: data/dev.geopjr.Tuba.metainfo.xml.in:9
msgid ""
"Explore the federated social web with Tuba for GNOME. Stay connected to your "
"favorite communities, family and friends with support for popular Fediverse "
Expand All @@ -43,7 +43,7 @@ msgstr ""
"う。Mastodon、GoToSocial、Akkomaなどの人気のFediverseプラットフォームをサポー"
"トしており、お気に入りのコミュニティ、家族や友達とつながることができます!"

#: data/dev.geopjr.Tuba.appdata.xml.in:12
#: data/dev.geopjr.Tuba.metainfo.xml.in:12
msgid ""
"The Fediverse is a decentralized social network that consists of multiple "
"interconnected platforms and communities, allowing users to communicate and "
Expand Down
Loading

0 comments on commit 8e0e380

Please sign in to comment.