From d5eb07c6f0238b87934cb52996b0976d19f93e53 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 21 Jan 2019 22:39:10 +0100 Subject: [PATCH] Remove echonest (#6263) --- data/data.qrc | 3 --- data/providers/22x22/echonest.png | Bin 759 -> 0 bytes data/providers/32x32/echonest.png | Bin 1801 -> 0 bytes data/providers/48x48/echonest.png | Bin 2035 -> 0 bytes debian/control | 1 - dist/clementine.spec.in | 3 +-- snap/snapcraft.yaml | 3 +-- 7 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 data/providers/22x22/echonest.png delete mode 100644 data/providers/32x32/echonest.png delete mode 100644 data/providers/48x48/echonest.png diff --git a/data/data.qrc b/data/data.qrc index 4d49d45c6..f7fff7c07 100644 --- a/data/data.qrc +++ b/data/data.qrc @@ -330,7 +330,6 @@ providers/22x22/cdbaby.png providers/22x22/digitallyimported.png providers/22x22/dropbox.png - providers/22x22/echonest.png providers/22x22/googledrive.png providers/22x22/itunes.png providers/22x22/jamendo.png @@ -363,7 +362,6 @@ providers/32x32/cdbaby.png providers/32x32/digitallyimported.png providers/32x32/dropbox.png - providers/32x32/echonest.png providers/32x32/googledrive.png providers/32x32/itunes.png providers/32x32/jamendo.png @@ -396,7 +394,6 @@ providers/48x48/cdbaby.png providers/48x48/digitallyimported.png providers/48x48/dropbox.png - providers/48x48/echonest.png providers/48x48/googledrive.png providers/48x48/itunes.png providers/48x48/jamendo.png diff --git a/data/providers/22x22/echonest.png b/data/providers/22x22/echonest.png deleted file mode 100644 index d504dba282084b58fc8dad7f14a0596469a040f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 759 zcmV004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv0RI600RN!9r;`8x010qNS#tmY07w7;07w8v$!k6U000McNliru-w78KEfu-C zyrlpD0!T?jK~y-)ot42$6k!;~N7xS5p*D2`4+Xp0**_p+kv;68o3TXDVUe;K!FF9O zcbpkK1%Zf{?t!Nbq=M+MqTZA6kf+-F66^{KrZ??*_yXFbY`I&rma|eZ7bjnu)jZ)lV_frf z$|?9er)RLHS^YW;o#u??tv{YwF5jDbXN^=pmQv0}h47s*u2Dm+%-7^`T65nxqk8ev z+Dv#@T77oQsTZ$%+i#QZ=C_;fW}EPxF|JWVt&AJ;$OMgZYDR~j$lWjzMs?5xN8nH# zDORV3T9u_Ek6h5Ws7`lSKYl8AC4--!1{_gStVs>E%#rb~y#5;7e#hs~oRR9M3KI9g zF<1u^;I^1h>=koH|>1NsZSzt2Yd(9U>F!;STU~cP>X4~ zkKC`|2bjOm7+rpFxB6iy>29Twm;p(U2pA_6<63&i*+|0pDst0c)E~KXr2tb)Q?mni z?9WEPEE4S4fbsczBiuZ&3dXu#F5RB+xPfh*qATIsj3;WL{5qC#@PM!!??GPXy6)002ovPDHLkV1l%lQrrLl diff --git a/data/providers/32x32/echonest.png b/data/providers/32x32/echonest.png deleted file mode 100644 index 278a7238f506091ab7170c681dff796033ab5dd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1801 zcmV+k2ln`hP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 Rdkp{p002ovPDHLkV1lbyxPJfu diff --git a/debian/control b/debian/control index d8900cce4..110af2215 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 7), libcdio-cdda1, libchromaprint-dev, libcrypto++-dev, - libechonest-dev, libglew1.5-dev | libglew-dev, libqt4-dev, diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in index c055d1ace..9e4dcbdd9 100644 --- a/dist/clementine.spec.in +++ b/dist/clementine.spec.in @@ -14,8 +14,7 @@ BuildRequires: qt4-devel boost-devel gcc-c++ glew-devel libgpod-devel BuildRequires: cmake gstreamer1-devel gstreamer1-plugins-base-devel BuildRequires: libmtp-devel protobuf-devel protobuf-compiler libcdio-devel BuildRequires: qjson-devel cryptopp-devel fftw-devel sparsehash-devel -BuildRequires: sqlite-devel pulseaudio-libs-devel libechonest-devel -BuildRequires: libchromaprint-devel +BuildRequires: sqlite-devel pulseaudio-libs-devel libchromaprint-devel Requires: libgpod protobuf-lite libcdio qjson sqlite diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index eed402835..591575fd2 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -33,14 +33,13 @@ parts: # See 'snapcraft plugins' build-packages: - [libgpm2,liblastfm-dev,libtag1-dev,gettext,libboost-dev,libboost-serialization-dev,libqt4-dev,qt4-dev-tools,libqt4-opengl-dev,cmake,libgstreamer1.0-dev,libgstreamer-plugins-base1.0-dev,libglew1.5-dev,libqjson-dev,libgpod-dev,libplist-dev,libusbmuxd-dev,libmtp-dev,libcdio-dev,protobuf-compiler,libprotobuf-dev,libcrypto++-dev,libfftw3-dev,libsparsehash-dev,libsqlite3-dev,libpulse-dev,libqtwebkit-dev,libechonest-dev,libchromaprint-dev,libqca2-dev] + [libgpm2,liblastfm-dev,libtag1-dev,gettext,libboost-dev,libboost-serialization-dev,libqt4-dev,qt4-dev-tools,libqt4-opengl-dev,cmake,libgstreamer1.0-dev,libgstreamer-plugins-base1.0-dev,libglew1.5-dev,libqjson-dev,libgpod-dev,libplist-dev,libusbmuxd-dev,libmtp-dev,libcdio-dev,protobuf-compiler,libprotobuf-dev,libcrypto++-dev,libfftw3-dev,libsparsehash-dev,libsqlite3-dev,libpulse-dev,libqtwebkit-dev,libchromaprint-dev,libqca2-dev] stage-packages: - libc6 - libcdio13 - libchromaprint0 - libcrypto++9v5 - - libechonest2.3 - libfftw3-double3 - libgcc1 - libgl1-mesa-glx