update opt deps, drop desktop file

3 files changed, 13 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3d2c1fb2d39..6d253903947f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nicotine-plus-git
 	pkgdesc = A graphical client for the SoulSeek peer-to-peer system
-	pkgver = 3.3.0.dev4.r8347.7b9969c63
+	pkgver = 3.3.0.dev4.r8514.577411e21
 	pkgrel = 1
 	url = https://nicotine-plus.org
 	arch = any
@@ -14,10 +14,11 @@ pkgbase = nicotine-plus-git
 	makedepends = python-setuptools
 	makedepends = python-wheel
 	depends = python-gobject
-	optdepends = gspell: for spell checking in chat (Gtk 3 only)
 	optdepends = gtk4: default Gtk version
-	optdepends = gtk3: fallback if Gtk 4 is not installed
-	optdepends = libadwaita: test the Libadwaita version
+	optdepends = libadwaita: used with gtk4 if available
+	optdepends = gtk3: fallback if gtk4 is not installed
+	optdepends = gspell: for spell checking in chat (Gtk 3 only)
+	optdepends = libayatana-appindicator: tray icon (Gtk 3 only
 	provides = nicotine-plus
 	provides = nicotine+
 	provides = nicotine
@@ -25,8 +26,6 @@ pkgbase = nicotine-plus-git
 	conflicts = nicotine+
 	conflicts = nicotine
 	source = git+https://github.com/Nicotine-Plus/nicotine-plus.git
-	source = org.nicotine_plus.Nicotine-libadwaita.desktop
 	sha256sums = SKIP
-	sha256sums = 076ecb7184bc435f9849b2669233819cca9d20e4d98d3541c04f1ee73bc0bcfc
 
 pkgname = nicotine-plus-git
diff --git a/PKGBUILD b/PKGBUILD
index de43c34cb49d..cfef453fa2e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: x-demon
 pkgname=nicotine-plus-git
 _appdata_id=org.nicotine_plus.Nicotine
-pkgver=3.3.0.dev4.r8347.7b9969c63
+pkgver=3.3.0.dev4.r8514.577411e21
 pkgrel=1
 pkgdesc="A graphical client for the SoulSeek peer-to-peer system"
 arch=('any')
@@ -12,17 +12,16 @@ url="https://nicotine-plus.org"
 license=('GPL3')
 depends=('python-gobject')
 makedepends=('git' 'python-build' 'python-installer' 'python-setuptools' 'python-wheel')
-optdepends=('gspell: for spell checking in chat (Gtk 3 only)'
-            'gtk4: default Gtk version'
-            'gtk3: fallback if Gtk 4 is not installed'
-            'libadwaita: test the Libadwaita version')
+optdepends=('gtk4: default Gtk version'
+            'libadwaita: used with gtk4 if available'
+            'gtk3: fallback if gtk4 is not installed'
+            'gspell: for spell checking in chat (Gtk 3 only)'
+            'libayatana-appindicator: tray icon (Gtk 3 only')
 checkdepends=('appstream-glib' 'desktop-file-utils' 'python-pytest-xvfb')
 provides=("${pkgname%-git}" 'nicotine+' 'nicotine')
 conflicts=("${pkgname%-git}" 'nicotine+' 'nicotine')
-source=('git+https://github.com/Nicotine-Plus/nicotine-plus.git'
-        "${_appdata_id}-libadwaita.desktop")
-sha256sums=('SKIP'
-            '076ecb7184bc435f9849b2669233819cca9d20e4d98d3541c04f1ee73bc0bcfc')
+source=('git+https://github.com/Nicotine-Plus/nicotine-plus.git')
+sha256sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/${pkgname%-git}"
@@ -55,7 +54,4 @@ check() {
 package() {
   cd "$srcdir/${pkgname%-git}"
   python -m installer --destdir="$pkgdir" dist/*.whl
-
-  install -Dm644 "$srcdir/${_appdata_id}-libadwaita.desktop" -t \
-    "$pkgdir/usr/share/applications/"
 }
diff --git a/org.nicotine_plus.Nicotine-libadwaita.desktop b/org.nicotine_plus.Nicotine-libadwaita.desktop
deleted file mode 100644
index da6e384daa58..000000000000
--- a/org.nicotine_plus.Nicotine-libadwaita.desktop
+++ /dev/null
@@ -1,72 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.1
-Name[ca]=Nicotine+ (Libdwaita)
-Name[cs]=Nicotine+ (Libdwaita)
-Name[da]=Nicotine+ (Libdwaita)
-Name[de]=Nicotine+ (Libdwaita)
-Name[eo]=Nicotine+ (Libdwaita)
-Name[es_CL]=Nicotine+ (Libdwaita)
-Name[es_ES]=Nicotine+ (Libdwaita)
-Name[eu]=Nicotine+ (Libdwaita)
-Name[fi]=Nicotine+ (Libdwaita)
-Name[fr]=Nicotine+ (Libdwaita)
-Name[hu]=Nicotine+ (Libdwaita)
-Name[it]=Nicotine+ (Libdwaita)
-Name[lt]=Nicotine+ (Libdwaita)
-Name[nb_NO]=Nicotine+ (Libdwaita)
-Name[nl]=Nicotine+ (Libdwaita)
-Name[pl]=Nicotine+ (Libdwaita)
-Name[pt_BR]=Nicotine+ (Libdwaita)
-Name[ru]=Nicotine+ (Libdwaita)
-Name[sk]=Nicotine+ (Libdwaita)
-Name[tr]=Nicotine+ (Libdwaita)
-Name[uk]=Nicotine+ (Libdwaita)
-Name[zh_Hans]=Nicotine+ (Libdwaita)
-Name=Nicotine+ (Libdwaita)
-GenericName[ca]=Client de Soulseek
-GenericName[cs]=Soulseek Klient
-GenericName[de]=Soulseek-Client
-GenericName[es_CL]=Cliente de Soulseek
-GenericName[es_ES]=Cliente de Soulseek
-GenericName[fr]=Client Soulseek
-GenericName[hu]=Soulseek kliens
-GenericName[it]=Client per Soulseek
-GenericName[lv]=Soulseek Klients
-GenericName[nb_NO]=Soulseek-klient
-GenericName[nl]=Soulseek cliënt
-GenericName[pl]=Klient Soulseek
-GenericName[pt_BR]=Cliente Soulseek
-GenericName[ru]=Клиент Soulseek
-GenericName[tr]=Soulseek İstemcisi
-GenericName[uk]=Клієнт Soulseek
-GenericName[zh_Hans]=Soulseek客户端
-GenericName=Soulseek Client
-Comment[ca]=Client gràfic per a la xarxa P2P de Soulseek
-Comment[cs]=Grafický klient pro Soulseek P2P síť
-Comment[de]=Grafischer Client für das Soulseek Peer-to-Peer-Netzwerk
-Comment[es_CL]=Cliente gráfico para la red par a par de Soulseek
-Comment[es_ES]=Cliente gráfico para la red P2P de Soulseek
-Comment[fr]=Client graphique pour le réseau P2P Soulseek
-Comment[hu]=Grafikus kliens a Soulseek P2P hálózathoz
-Comment[it]=Client grafico per la rete peer-to-peer Soulseek
-Comment[lv]=Grafiskais klients Soulseek peer-to-peer tīklam
-Comment[nb_NO]=Grafisk klient for Soulseek-likemannsnettverket
-Comment[nl]=Grafische cliënt voor het Soulseek peer-to-peer netwerk
-Comment[pl]=Graficzny klient sieci P2P Soulseek
-Comment[pt_BR]=Cliente gráfico para a rede peer-to-peer Soulseek
-Comment[ru]=Графический клиент для одноранговой сети Soulseek
-Comment[sv]=Grafisk klient för peer-to-peer-nätverket Soulseek
-Comment[tr]=Soulseek eşler arası ağı için grafiksel istemci
-Comment[uk]=Графічний клієнт для однорангової мережі Soulseek
-Comment[zh_Hans]=Soulseek 点对点网络的图形客户端
-Comment=Graphical client for the Soulseek peer-to-peer network
-Icon=org.nicotine_plus.Nicotine
-Exec=env NICOTINE_LIBADWAITA=1 nicotine
-Terminal=false
-Categories=Network;FileTransfer;InstantMessaging;Chat;P2P;GTK;
-Keywords=Soulseek;Nicotine;sharing;chat;messaging;P2P;peer-to-peer;GTK;
-StartupNotify=true
-X-GNOME-SingleWindow=true
-X-GNOME-UsesNotifications=true
-