Move appindicator to shared-modules, update metainfo, other misc changes

com.spotify.Client.desktop

@@ -2,11 +2,10 @@
 Type=Application
 Name=Spotify
 GenericName=Music Player
-Icon=com.spotify.Client
+Icon=/usr/share/spotify/icons/spotify-linux-128.png
 TryExec=spotify
 Exec=spotify %U
 Terminal=false
 MimeType=x-scheme-handler/spotify;
 Categories=Audio;Music;Player;AudioVideo;
 StartupWMClass=spotify
-X-GNOME-UsesNotifications=true

com.spotify.Client.json

@@ -23,124 +23,17 @@
         "--env=LD_LIBRARY_PATH=/app/lib",
         "--env=TMPDIR=/tmp"
     ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig",
-        "/share/pkgconfig",
-        "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "/share/doc",
-        "*.la",
-        "*.a"
-    ],
     "modules": [
+        "shared-modules/libayatana-appindicator/libayatana-appindicator-gtk3.json",
         "shared-modules/lzo/lzo.json",
         "shared-modules/squashfs-tools/squashfs-tools.json",
-        {
-            "name": "libayatana-appindicator",
-            "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DENABLE_BINDINGS_MONO=NO",
-                "-DENABLE_BINDINGS_VALA=NO",
-                "-DENABLE_GTKDOC=NO"
-            ],
-            "modules": [
-                "shared-modules/intltool/intltool-0.51.json",
-                {
-                    "name": "libdbusmenu-gtk3",
-                    "buildsystem": "autotools",
-                    "build-options": {
-                        "cflags": "-Wno-error",
-                        "env": {
-                            "HAVE_VALGRIND_FALSE": "#",
-                            "HAVE_VALGRIND_TRUE": ""
-                        }
-                    },
-                    "config-opts": [
-                        "--with-gtk=3",
-                        "--disable-dumper",
-                        "--disable-static",
-                        "--disable-tests",
-                        "--disable-gtk-doc",
-                        "--enable-introspection=no",
-                        "--disable-vala"
-                    ],
-                    "sources": [
-                        {
-                            "type": "archive",
-                            "url": "https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz",
-                            "sha256": "b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a"
-                        }
-                    ],
-                    "cleanup": [
-                        "/include",
-                        "/libexec",
-                        "/lib/pkgconfig",
-                        "/lib/*.la",
-                        "/share/doc",
-                        "/share/libdbusmenu",
-                        "/share/gtk-doc",
-                        "/share/gir-1.0"
-                    ]
-                },
-                {
-                    "name": "ayatana-ido",
-                    "buildsystem": "cmake-ninja",
-                    "sources": [
-                        {
-                            "type": "git",
-                            "url": "https://github.com/AyatanaIndicators/ayatana-ido.git",
-                            "tag": "0.10.4",
-                            "commit": "f968079b09e2310fefc3fc307359025f1c74b3eb",
-                            "x-checker-data": {
-                                "type": "git",
-                                "tag-pattern": "^([\\d.]+)$"
-                            }
-                        },
-                        {
-                            "type": "shell",
-                            "//": "Remove unused Vala/GIR files",
-                            "commands": [
-                                "sed -i 's/Vala REQUIRED/Vala /' src/CMakeLists.txt",
-                                "sed -i '/install.*AyatanaIdo3-0.4.*/d' src/CMakeLists.txt"
-                            ]
-                        }
-                    ]
-                },
-                {
-                    "name": "libayatana-indicator",
-                    "buildsystem": "cmake-ninja",
-                    "sources": [
-                        {
-                            "type": "git",
-                            "url": "https://github.com/AyatanaIndicators/libayatana-indicator.git",
-                            "tag": "0.9.4",
-                            "commit": "611bb384b73fa6311777ba4c41381a06f5b99dad",
-                            "x-checker-data": {
-                                "type": "git",
-                                "tag-pattern": "^([\\d.]+)$"
-                            }
-                        }
-                    ]
-                }
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://github.com/AyatanaIndicators/libayatana-appindicator.git",
-                    "tag": "0.5.93",
-                    "commit": "238c8b02718fa5b4af95ede72beeed762094f4cc",
-                    "x-checker-data": {
-                        "type": "git",
-                        "tag-pattern": "^([\\d.]+)$"
-                    }
-                }
-            ]
-        },
         {
             "name": "ffmpeg-4.4",
+            "cleanup": [
+                "/include",
+                "/lib/pkgconfig",
+                "/share"
+            ],
             "config-opts": [
                 "--enable-shared",
                 "--disable-static",
@@ -208,19 +101,21 @@
                 "install apply_extra /app/bin",
                 "install get-scale-factor.py xsettings.py /app/bin",
                 "install spotify-bin /app/bin/spotify",
-                "install -Dm644 com.spotify.Client.appdata.xml /app/share/appdata/com.spotify.Client.appdata.xml",
+                "install -Dm644 com.spotify.Client.metainfo.xml /app/share/metainfo/com.spotify.Client.metainfo.xml",
                 "install -Dm644 com.spotify.Client.svg /app/share/icons/hicolor/scalable/apps/com.spotify.Client.svg",
                 "install -Dm644 com.spotify.Client-symbolic.svg /app/share/icons/hicolor/symbolic/apps/com.spotify.Client-symbolic.svg",
-                "install -Dm644 com.spotify.Client.desktop /app/share/applications/com.spotify.Client.desktop"
+                "install -Dm644 com.spotify.Client.desktop /app/share/applications/com.spotify.Client.desktop",
+                "desktop-file-edit --set-icon=\"com.spotify.Client\" /app/share/applications/com.spotify.Client.desktop",
+                "desktop-file-edit --set-key=\"X-GNOME-UsesNotifications\" --set-value=\"true\" /app/share/applications/com.spotify.Client.desktop"
             ],
             "sources": [
                 {
                     "type": "script",
                     "dest-filename": "apply_extra",
                     "commands": [
-                        "unsquashfs -quiet -no-progress spotify.snap usr/bin usr/share/spotify",
-                        "mv squashfs-root/usr/* .",
-                        "rm -r spotify.snap squashfs-root share/spotify/apt-keys share/spotify/spotify.desktop"
+                        "unsquashfs -quiet -no-progress spotify.snap usr/share/spotify",
+                        "mv squashfs-root/usr/share/spotify/* .",
+                        "rm -r apt-keys spotify.desktop spotify.snap squashfs-root"
                     ]
                 },
                 {
@@ -229,7 +124,7 @@
                 },
                 {
                     "type": "file",
-                    "path": "com.spotify.Client.appdata.xml"
+                    "path": "com.spotify.Client.metainfo.xml"
                 },
                 {
                     "type": "file",

com.spotify.Client.appdata.xml → com.spotify.Client.metainfo.xml

@@ -1,37 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
+<component type="desktop-application">
   <id>com.spotify.Client</id>
-  <provides><id>com.spotify.Client.desktop</id></provides>
   <launchable type="desktop-id">com.spotify.Client.desktop</launchable>
   <name>Spotify</name>
-  <developer_name>Spotify</developer_name>
+  <developer id="com.spotify">
+    <name>Spotify AB</name>
+  </developer>
   <summary>Online music streaming service</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>LicenseRef-proprietary=https://www.spotify.com/us/legal/end-user-agreement/</project_license>
   <url type="homepage">https://www.spotify.com</url>
   <url type="help">https://community.spotify.com/t5/Desktop-Linux/bd-p/desktop_linux</url>
   <description>
-    <p>Access all of your favorite music, discover new songs, and share music online with your friends - all in one place. 
-    Create shared playlists or share individual songs with your Facebook friends with just a click of a button. 
-    Follow your favorite artists or friends to know what they are listening to, and then save the songs to your own playlists. 
-      Spotify is the best way to have access to millions of songs, and all the latest hits.</p>
+    <p>
+      Stream the tracks you love instantly, browse the charts or fire up curated
+      playlists in every genre and mood. Discover new music too, with awesome
+      playlists built just for you.
+    </p>
+    <p>
+      Spotify also offers 5+ million podcast titles, including originals and
+      exclusives that you can't find anywhere else.
+    </p>
+    <p>
+      Listen free, or get ad-free music listening with Premium.
+    </p>
+    <p>Spotify Free features:</p>
+    <ul>
+      <li>Play songs, albums, playlists and podcasts</li>
+      <li>Listen to your favorite artists</li>
+      <li>Create playlists with your favorite music</li>
+      <li>Enjoy your personal Discover Weekly playlist every week</li>
+      <li>Collaborate on playlists and see what your friends are playing</li>
+      <li>Find nearby events and gigs by your favorite artists</li>
+    </ul>
+    <p>Spotify Premium features:</p>
+    <ul>
+      <li>Download music for offline listening</li>
+      <li>Enjoy high-quality audio</li>
+      <li>Enjoy unlimited skips and full on-demand playback</li>
+      <li>Listen to the music you love, ad-free</li>
+      <li>No commitment - cancel any time you like</li>
+      <li>Get 15 hours of audiobooks every month. Audiobooks in Premium are currently
+      available in Australia, New Zealand, the UK, Ireland, the US &amp; Canada. Discover
+      350,000+, 15 hours/month of available listening for Premium Individual
+      subscribers and Duo &amp; Family plan managers.</li>
+    </ul>
+    <p>
+      Note: Spotify for Linux is a labor of love from our engineers that wanted to
+      listen to Spotify on their Linux development machines. They work on it in their
+      spare time and it is currently not a platform that we actively support. The
+      experience may differ from our other Spotify Desktop clients, such as Windows
+      and Mac.
+    </p>
   </description>
   <screenshots>
     <screenshot type="default">
       <caption>Artist</caption>
-      <image type="source" width="1920" height="1080">https://raw.githubusercontent.com/flathub/com.spotify.Client/master/screenshots/Artist.png</image>
+      <image type="source" width="2244" height="1718">https://raw.githubusercontent.com/flathub/com.spotify.Client/master/screenshots/Artist.png</image>
     </screenshot>
     <screenshot>
       <caption>Playlist</caption>
-      <image type="source" width="1920" height="1080">https://raw.githubusercontent.com/flathub/com.spotify.Client/master/screenshots/Playlist.png</image>
+      <image type="source" width="2244" height="1718">https://raw.githubusercontent.com/flathub/com.spotify.Client/master/screenshots/Playlist.png</image>
     </screenshot>
     <screenshot>
       <caption>Podcast</caption>
-      <image type="source" width="1920" height="1080">https://raw.githubusercontent.com/flathub/com.spotify.Client/master/screenshots/Podcast.png</image>
+      <image type="source" width="2244" height="1718">https://raw.githubusercontent.com/flathub/com.spotify.Client/master/screenshots/Podcast.png</image>
     </screenshot>
     <screenshot>
       <caption>Fullscreen</caption>
-      <image type="source" width="1920" height="1080">https://raw.githubusercontent.com/flathub/com.spotify.Client/master/screenshots/Fullscreen.png</image>
+      <image type="source" width="3840" height="2160">https://raw.githubusercontent.com/flathub/com.spotify.Client/master/screenshots/Fullscreen.png</image>
     </screenshot>
   </screenshots>
   <kudos>
@@ -74,6 +111,20 @@
     <release date="2018-10-25" version="1.0.92.390"/>
     <release date="2018-09-15" version="1.0.89.313"/>
   </releases>
-  <content_rating type="oars-1.1"/>
+  <content_rating type="oars-1.1">
+    <content_attribute id="money-purchasing">intense</content_attribute>
+  </content_rating>
+  <provides>
+    <mediatype>x-scheme-handler/spotify</mediatype>
+  </provides>
+  <requires>
+    <display_length compare="ge">768</display_length>
+    <internet bandwidth_mbitps="1">always</internet>
+  </requires>
+  <supports>
+    <control>keyboard</control>
+    <control>pointing</control>
+    <control>touch</control>
+  </supports>
   <update_contact>tingping_at_fedoraproject.org</update_contact>
 </component>

flathub.json

@@ -1,4 +1,3 @@
 {
-    "only-arches": ["x86_64"],
-    "require-important-update": true
+    "only-arches": ["x86_64"]
 }

spotify-bin

@@ -55,7 +55,7 @@ if [[ -e "${XDG_RUNTIME_DIR}/${WAYLAND_SOCKET}" || -e "${WAYLAND_DISPLAY}" ]]; t
     EXTRA_FLAGS+=("--enable-wayland-ime" "--ozone-platform-hint=auto")
 fi
 
-env PULSE_PROP_application.icon_name="com.spotify.Client" LD_PRELOAD=/app/lib/spotify-preload.so${LD_PRELOAD:+:$LD_PRELOAD} /app/extra/bin/spotify "${EXTRA_FLAGS[@]}" "$@" &
+env PULSE_PROP_application.icon_name="com.spotify.Client" LD_PRELOAD=/app/lib/spotify-preload.so${LD_PRELOAD:+:$LD_PRELOAD} /app/extra/spotify "${EXTRA_FLAGS[@]}" "$@" &
 
 if [ $URI_HANDLED -eq 1 ]; then
     waitandopenuri "$@"