clementine: unnecessary stuff and nonfree references should be removed by us from packaging instead of librefetch

1 files changed, 20 insertions, 18 deletions

diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD
index a93a8a7ab..e9feda768 100644
--- a/libre/clementine/PKGBUILD
+++ b/libre/clementine/PKGBUILD
@@ -27,47 +27,49 @@ optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries'
             'gstreamer0.10-ffmpeg: FFmpeg plugin'
             'gvfs: Various devices support')
 install="${pkgname}.install"
-mksource=("${pkgname}-${pkgver}.tar.gz::https://github.com/$pkgname-player/${pkgname^}/archive/${pkgver}.tar.gz"
-          'remove-nonfree-artwork-and-spotify.patch'
-          'moognu.png')
+mksource=("${pkgname}-${pkgver}.tar.gz::https://github.com/$pkgname-player/${pkgname^}/archive/${pkgver}.tar.gz")
 source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
+        'remove-nonfree-artwork-and-spotify.patch'
+        'moognu.png'
         "${pkgname}-gcc5.1.patch"
         "${pkgname}-udisks-namespace.patch")
-mksha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf'
-              '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b'
-              'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
+mksha256sums=('7df5650445a005c09f5f0e1a1b0d077037c37ecbe4ee77baf9d45f121308a1bf')
 sha256sums=('c68275373b839b5b256b813b5bed85d501f94e12bef3dd8ed69e90094af3f769'
+            '48bfbf42c84ac1891021638627c10780194fcc59eda1c69e157be3aebe8ee10b'
+            'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4'
             'b03c190b881520c3233ed8f5804b518e9e699c6f773ab227f36133f422b786e1'
             'a7c2764576cee303a57e4efe6a5dbd583a66de8a15aee738bd92d4bb21786008')
 
 mksource() {
   cd ${pkgname^}-${pkgver}
 
-  # remove nonfree nonfree artwork and spotify references on files
+  # remove nonfree artwork for the Nyan Cat plugin
+  # https://labs.parabola.nu/issues/329
+  rm -v data/nyancat.png
+}
+
+prepare() {
+  cd ${pkgname^}-${pkgver}
+
+  # remove nonfree artwork and Spotify references
   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
 
-  # remove nonfree spotifyblob folders
+  # remove Spotifyblob folders
   rm -rv ext/{$pkgname-spotifyblob,lib${pkgname}-spotifyblob}
 
-  # remove nonfree spotify files
+  # remove Spotify files
   rm -v cmake/SpotifyVersion.cmake
   rm -v data/spotify-attribution.png
   rm -v data/icons/svg/spotify.svg
   rm -v data/schema/schema-30.sql
   rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
 
-  ## remove nonfree nyancat.png
-  rm -v data/nyancat.png
-
-  ## rut moognu.png to the source code
+  # move free Nyan Cat replacement mascot (MooGNU) to the source code
+  # https://labs.parabola.nu/issues/329
   install -m644 -v ../moognu.png data
 
-  # create a blank file due which is a dependency for clementine
+  # create a blank file because it's a dependency for Clementine
   touch data/schema/schema-30.sql
-}
-
-prepare() {
-  cd ${pkgname^}-${pkgver}
 
   patch -Np1 -i ../clementine-gcc5.1.patch
   patch -Np1 -i ../clementine-udisks-namespace.patch