clementine-libre: update and fix remove-nonfree-artwork-and-spotify.patch to the last version

3 files changed, 376 insertions, 368 deletions

diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index b41c4e40a..463a94be4 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -27,19 +27,15 @@ conflicts=('clementine')
 provides=("clementine=$pkgver")
 install=clementine.install
 source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
-        'clementine-1.1.1-libimobiledevice-fix.patch'
         'remove-nonfree-artwork-and-spotify.patch'
         'moognu.png')
 sha256sums=('563d00da4e893f7b1966ed137bcab28042151e31ea561cb7076047d3cad96f72'
-            '688bdd15c898cb198dc85d58e2dedcca33771e374b4c6b621be723bafc167590'
-            '23f3b5022e8936b1a7bbf2c63f61fe308c5f215664e3b8ba2d1520b579db24e6'
+            'e3b0ba3649d6c66ef002ce281949ab6febf2481893245b4e30c6f11ae6f5b463'
             'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
 
 prepare() {
   cd ${_pkgname}-${pkgver}
 
-  patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch
-
   # remove nonfree nonfree artwork and spotify references on files
   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
 
@@ -48,7 +44,7 @@ prepare() {
 
   # remove nonfree spotify files
   rm -v cmake/SpotifyVersion.cmake
-  rm -v data/spotify-core-logo-128x128.png
+  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}}}
diff --git a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch
deleted file mode 100644
index da7722fcb..000000000
--- a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix clementine-1.1.1/src/devices/imobiledeviceconnection.h
---- clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix	2013-04-23 14:44:56.932661018 -0400
-+++ clementine-1.1.1/src/devices/imobiledeviceconnection.h	2013-04-23 14:46:44.033657190 -0400
-@@ -51,7 +51,7 @@ private:
-   idevice_t device_;
-   afc_client_t afc_;
- 
--  uint16_t afc_port_;
-+  lockdownd_service_descriptor_t afc_port_;
- };
- 
- #endif // IMOBILEDEVICECONNECTION_H
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index 3a948bf96..957ddc7e7 100644
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -1,7 +1,8 @@
-diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-libre-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m 
---- clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m	2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m	2012-05-28 17:19:14.612750904 -0300
-@@ -98,7 +98,6 @@
+diff --git a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m
+index a349f59..c418e0b 100644
+--- a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m
++++ b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m
+@@ -98,7 +98,6 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
  {
  	return [NSArray arrayWithObjects:
  		[[NSBundle mainBundle] bundleIdentifier], // your app
@@ -9,10 +10,11 @@ diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-li
  		@"com.apple.iTunes",
  		@"com.apple.QuickTimePlayerX",
  		@"com.apple.quicktimeplayer",
-diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
---- clementine-1.1.0/CMakeLists.txt	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/CMakeLists.txt	2012-10-26 01:58:08.725496264 -0200
-@@ -7,7 +7,6 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ba5a8a..986351b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,6 @@ include(cmake/Summary.cmake)
  include(cmake/Version.cmake)
  include(cmake/Deb.cmake)
  include(cmake/Rpm.cmake)
@@ -20,15 +22,15 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
  include(cmake/OptionalSource.cmake)
  set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
  
-@@ -55,7 +54,6 @@
- pkg_check_modules(USBMUXD libusbmuxd)
- pkg_check_modules(LIBMTP libmtp>=1.0)
- pkg_check_modules(INDICATEQT indicate-qt)
--pkg_check_modules(SPOTIFY libspotify>=12.1.45)
- pkg_check_modules(CDIO libcdio)
+@@ -78,7 +77,6 @@ pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.7)
+ pkg_check_modules(LIBXML libxml-2.0)
  pkg_check_modules(QCA qca2)
- pkg_check_modules(CHROMAPRINT libchromaprint)
-@@ -81,13 +79,6 @@
+ pkg_check_modules(QJSON REQUIRED QJson)
+-pkg_check_modules(SPOTIFY libspotify>=12.1.45)
+ pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
+ 
+ if (WIN32)
+@@ -124,13 +122,6 @@ if (APPLE)
    find_library(GROWL Growl)
    find_library(SPARKLE Sparkle)
  
@@ -41,44 +43,42 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
 -
    add_subdirectory(3rdparty/SPMediaKeyTap)
    set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
-   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)  
-@@ -224,26 +215,16 @@
+   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
+@@ -254,7 +245,7 @@ optional_component(DEVICEKIT ON "Devices: DeviceKit backend"
    DEPENDS "D-Bus support" HAVE_DBUS
  )
  
--optional_component(SPOTIFY ON "Spotify support: core code"
-+optional_component(SPOTIFY OFF "Spotify support: core code"
-   DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
- )
- 
 -optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper"
 +optional_component(SPOTIFY_BLOB OFF "Spotify support: non-GPL binary helper"
    DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
    DEPENDS "libspotify" SPOTIFY_FOUND
-   DEPENDS "Spotify support: core code" HAVE_SPOTIFY
  )
+@@ -270,13 +261,6 @@ optional_component(SPARKLE ON "Sparkle integration"
  
--set(NEED_SPOTIFY_DOWNLOADER OFF)
--if(HAVE_SPOTIFY AND NOT HAVE_SPOTIFY_BLOB)
--  set(NEED_SPOTIFY_DOWNLOADER ON)
+ optional_component(VISUALISATIONS ON "Visualisations")
+ 
+-if(NOT HAVE_SPOTIFY_BLOB AND NOT QCA_FOUND)
+-  message(FATAL_ERROR "Either QCA must be available or the non-GPL Spotify "
+-          "code must be compiled in")
+-elif(QCA_FOUND)
+-  set(HAVE_SPOTIFY_DOWNLOADER ON)
 -endif()
 -
--optional_component(SPOTIFY_DOWNLOADER
--  ${NEED_SPOTIFY_DOWNLOADER} "Spotify support: blob downloader"
--  DEPENDS "qca2" QCA_FOUND
--)
--
- optional_component(MOODBAR ON "Moodbar support"
-   DEPENDS "fftw3" FFTW3_FOUND
- )
-@@ -411,14 +392,6 @@
+ # Find DBus if it's enabled
+ if (HAVE_DBUS)
+   find_package(Qt4 REQUIRED QtDbus)
+@@ -440,7 +424,6 @@ add_subdirectory(ext/libclementine-common)
+ add_subdirectory(ext/libclementine-tagreader)
+ add_subdirectory(ext/clementine-tagreader)
+ add_subdirectory(ext/libclementine-remote)
+-add_subdirectory(ext/libclementine-spotifyblob)
+ 
+ option(WITH_DEBIAN OFF)
+ if(WITH_DEBIAN)
+@@ -451,10 +434,6 @@ if(HAVE_BREAKPAD)
    add_subdirectory(3rdparty/google-breakpad)
  endif(HAVE_BREAKPAD)
  
--if(HAVE_SPOTIFY)
--  add_subdirectory(ext/libclementine-spotifyblob)
--endif(HAVE_SPOTIFY)
--
 -if(HAVE_SPOTIFY_BLOB)
 -  add_subdirectory(ext/clementine-spotifyblob)
 -endif(HAVE_SPOTIFY_BLOB)
@@ -86,18 +86,19 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
  if(HAVE_MOODBAR)
    add_subdirectory(gst/moodbar)
  endif()
-diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
---- clementine-1.1.1/data/data.qrc		2012-11-18 06:51:26.000000000 -0200
-+++ clementine-libre-1.1.1/data/data.qrc	2013-05-13 02:55:19.579440533 -0300
-@@ -1,7 +1,6 @@
- <RCC>
+diff --git a/data/data.qrc b/data/data.qrc
+index 4c5473f..bd5fe2d 100644
+--- a/data/data.qrc
++++ b/data/data.qrc
+@@ -2,7 +2,6 @@
      <qresource prefix="/">
          <file>blank.ttf</file>
+         <file>clementine_remote_qr.png</file>
 -        <file>clementine-spotify-public.pem</file>
          <file>currenttrack_bar_left.png</file>
          <file>currenttrack_bar_mid.png</file>
          <file>currenttrack_bar_right.png</file>
-@@ -76,7 +75,6 @@
+@@ -77,7 +76,6 @@
          <file>icons/22x22/phone-nokia-n900.png</file>
          <file>icons/22x22/phone-palm-pre.png</file>
          <file>icons/22x22/phone.png</file>
@@ -105,7 +106,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
          <file>icons/22x22/user-away.png</file>
          <file>icons/22x22/view-choose.png</file>
          <file>icons/22x22/view-fullscreen.png</file>
-@@ -153,7 +151,6 @@
+@@ -154,7 +152,6 @@
          <file>icons/32x32/phone-palm-pre.png</file>
          <file>icons/32x32/phone.png</file>
          <file>icons/32x32/search.png</file>
@@ -113,7 +114,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
          <file>icons/32x32/tools-wizard.png</file>
          <file>icons/32x32/view-choose.png</file>
          <file>icons/32x32/view-fullscreen.png</file>
-@@ -229,7 +226,6 @@
+@@ -230,7 +227,6 @@
          <file>icons/48x48/phone-nokia-n900.png</file>
          <file>icons/48x48/phone-palm-pre.png</file>
          <file>icons/48x48/phone.png</file>
@@ -121,7 +122,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
          <file>icons/48x48/view-choose.png</file>
          <file>icons/48x48/view-fullscreen.png</file>
          <file>icons/48x48/view-media-equalizer.png</file>
-@@ -261,10 +257,10 @@
+@@ -262,10 +258,10 @@
          <file>lumberjacksong.txt</file>
          <file>lyrics/ultimate_providers.xml</file>
          <file>mainwindow.css</file>
@@ -130,35 +131,37 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
          <file>nomusic.png</file>
          <file>now_playing_tooltip.txt</file>
 -        <file>nyancat.png</file>
+         <file>oauthsuccess.html</file>
          <file>osd_background.png</file>
          <file>osd_shadow_corner.png</file>
-         <file>osd_shadow_edge.png</file>
-@@ -339,7 +335,6 @@
+@@ -391,7 +387,6 @@
          <file>smartplaylistsearchterm.css</file>
          <file>songinfo.css</file>
          <file>spinner.gif</file>
--        <file>spotify-core-logo-128x128.png</file>
+-        <file>spotify-attribution.png</file>
          <file>star-off.png</file>
          <file>star-on.png</file>
          <file>tiny-pause.png</file>
-diff -rauN clementine-1.1.0/dist/macdeploy.py clementine-libre-1.1.0/dist/macdeploy.py
---- clementine-1.1.0/dist/macdeploy.py	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/dist/macdeploy.py	2012-10-26 02:06:12.781965350 -0200
-@@ -387,10 +387,7 @@
- FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules')
- 
- try:
--  FixPlugin('clementine-spotifyblob', '.')
-   FixPlugin('clementine-tagreader', '.')
--except:
--  print 'Failed to find blob: %s' % traceback.format_exc()
- 
- for plugin in QT_PLUGINS:
-   FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-diff -rauN clementine-1.1.0/dist/windows/clementine.nsi clementine-libre-1.1.0/dist/windows/clementine.nsi
---- clementine-1.1.0/dist/windows/clementine.nsi	2012-10-22 04:27:00.000000000 -0200
-+++ clementine-libre-1.1.0/dist/windows/clementine.nsi	2012-10-26 02:07:20.551540003 -0200
-@@ -94,9 +94,6 @@
+diff --git a/dist/macdeploy.py b/dist/macdeploy.py
+index e054619..3568a6f 100755
+--- a/dist/macdeploy.py
++++ b/dist/macdeploy.py
+@@ -398,10 +398,7 @@ def main():
+   FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules')
+ 
+   try:
+-    FixPlugin('clementine-spotifyblob', '.')
+     FixPlugin('clementine-tagreader', '.')
+-  except:
+-    print 'Failed to find blob: %s' % traceback.format_exc()
+ 
+   for plugin in QT_PLUGINS:
+     FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
+diff --git a/dist/windows/clementine.nsi b/dist/windows/clementine.nsi
+index 82c0fc1..086bdc7 100644
+--- a/dist/windows/clementine.nsi
++++ b/dist/windows/clementine.nsi
+@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles
    Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
  
@@ -168,42 +171,43 @@ diff -rauN clementine-1.1.0/dist/windows/clementine.nsi clementine-libre-1.1.0/d
    ; 1.0
    Delete "$INSTDIR\libofa.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
-@@ -110,7 +107,6 @@
-   File "avutil-50.dll"
+@@ -128,7 +125,6 @@ Section "Clementine" Clementine
+   File "avutil-51.dll"
    File "clementine.exe"
    File "clementine-tagreader.exe"
 -  File "clementine-spotifyblob.exe"
    File "clementine.ico"
    File "glew32.dll"
    File "intl.dll"
-@@ -164,7 +160,6 @@
+@@ -181,7 +177,6 @@ Section "Clementine" Clementine
    File "libqjson.dll"
    File "libsoup-2.4-1.dll"
    File "libspeex-1.dll"
 -  File "libspotify.dll"
+   File "libstdc++-6.dll"
    File "libtag.dll"
    File "libtasn1-3.dll"
-   File "libusbmuxd.dll"
-@@ -957,7 +952,6 @@
+@@ -939,7 +934,6 @@ Section "Uninstall"
    Delete "$INSTDIR\clementine.ico"
    Delete "$INSTDIR\clementine.exe"
    Delete "$INSTDIR\clementine-tagreader.exe"
 -  Delete "$INSTDIR\clementine-spotifyblob.exe"
    Delete "$INSTDIR\glew32.dll"
    Delete "$INSTDIR\intl.dll"
-   Delete "$INSTDIR\libcdio-12.dll"
-@@ -1010,7 +1004,6 @@
+   Delete "$INSTDIR\libcdio-14.dll"
+@@ -992,7 +986,6 @@ Section "Uninstall"
    Delete "$INSTDIR\libqjson.dll"
    Delete "$INSTDIR\libsoup-2.4-1.dll"
    Delete "$INSTDIR\libspeex-1.dll"
 -  Delete "$INSTDIR\libspotify.dll"
+   Delete "$INSTDIR\libstdc++-6.dll"
    Delete "$INSTDIR\libtag.dll"
    Delete "$INSTDIR\libtasn1-3.dll"
-   Delete "$INSTDIR\libusbmuxd.dll"
-diff -rauN clementine-1.1.0/dist/windows/clementine.nsi.in clementine-libre-1.1.0/dist/windows/clementine.nsi.in
---- clementine-1.1.0/dist/windows/clementine.nsi.in	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/dist/windows/clementine.nsi.in	2012-10-26 02:08:02.052572234 -0200
-@@ -94,9 +94,6 @@
+diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in
+index 750b332..6bf47ff 100644
+--- a/dist/windows/clementine.nsi.in
++++ b/dist/windows/clementine.nsi.in
+@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles
    Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
  
@@ -213,70 +217,130 @@ diff -rauN clementine-1.1.0/dist/windows/clementine.nsi.in clementine-libre-1.1.
    ; 1.0
    Delete "$INSTDIR\libofa.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
-@@ -110,7 +107,6 @@
-   File "avutil-50.dll"
+@@ -128,7 +125,6 @@ Section "Clementine" Clementine
+   File "avutil-51.dll"
    File "clementine.exe"
    File "clementine-tagreader.exe"
 -  File "clementine-spotifyblob.exe"
    File "clementine.ico"
    File "glew32.dll"
    File "intl.dll"
-@@ -164,7 +160,6 @@
+@@ -181,7 +177,6 @@ Section "Clementine" Clementine
    File "libqjson.dll"
    File "libsoup-2.4-1.dll"
    File "libspeex-1.dll"
 -  File "libspotify.dll"
+   File "libstdc++-6.dll"
    File "libtag.dll"
    File "libtasn1-3.dll"
-   File "libusbmuxd.dll"
-@@ -957,7 +952,6 @@
+@@ -939,7 +934,6 @@ Section "Uninstall"
    Delete "$INSTDIR\clementine.ico"
    Delete "$INSTDIR\clementine.exe"
    Delete "$INSTDIR\clementine-tagreader.exe"
 -  Delete "$INSTDIR\clementine-spotifyblob.exe"
    Delete "$INSTDIR\glew32.dll"
    Delete "$INSTDIR\intl.dll"
-   Delete "$INSTDIR\libcdio-12.dll"
-@@ -1010,7 +1004,6 @@
+   Delete "$INSTDIR\libcdio-14.dll"
+@@ -992,7 +986,6 @@ Section "Uninstall"
    Delete "$INSTDIR\libqjson.dll"
    Delete "$INSTDIR\libsoup-2.4-1.dll"
    Delete "$INSTDIR\libspeex-1.dll"
 -  Delete "$INSTDIR\libspotify.dll"
+   Delete "$INSTDIR\libstdc++-6.dll"
    Delete "$INSTDIR\libtag.dll"
    Delete "$INSTDIR\libtasn1-3.dll"
-   Delete "$INSTDIR\libusbmuxd.dll"
-diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeLists.txt
---- clementine-1.1.0/src/CMakeLists.txt	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/CMakeLists.txt	2012-10-26 02:09:29.994361873 -0200
-@@ -630,7 +630,6 @@
+diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
+index 3c53d7a..49dd8cf 100644
+--- a/ext/libclementine-common/core/logging.cpp
++++ b/ext/libclementine-common/core/logging.cpp
+@@ -14,10 +14,6 @@
+    limitations under the License.
+ */
+ 
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+ #include <QtGlobal>
+ 
+ #include <cxxabi.h>
+diff --git a/ext/libclementine-common/core/logging.h b/ext/libclementine-common/core/logging.h
+index 3c582cf..4a3cea8 100644
+--- a/ext/libclementine-common/core/logging.h
++++ b/ext/libclementine-common/core/logging.h
+@@ -14,11 +14,6 @@
+    limitations under the License.
+ */
+ 
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+-
+ #ifndef LOGGING_H
+ #define LOGGING_H
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1104542..e7a8032 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -60,8 +60,6 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-tagreader)
+ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader)
+ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-remote)
+ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-remote)
+-include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob)
+-include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob)
+ 
+ cmake_policy(SET CMP0011 NEW)
+ include(../cmake/ParseArguments.cmake)
+@@ -157,7 +155,6 @@ set(SOURCES
+   globalsearch/simplesearchprovider.cpp
+   globalsearch/somafmsearchprovider.cpp
+   globalsearch/soundcloudsearchprovider.cpp
+-  globalsearch/spotifysearchprovider.cpp
+   globalsearch/suggestionwidget.cpp
+   globalsearch/urlsearchprovider.cpp
+ 
+@@ -195,9 +192,6 @@ set(SOURCES
+   internet/somafmservice.cpp
+   internet/somafmurlhandler.cpp
+   internet/soundcloudservice.cpp
+-  internet/spotifyserver.cpp
+-  internet/spotifyservice.cpp
+-  internet/spotifysettingspage.cpp
+   internet/subsonicservice.cpp
+   internet/subsonicsettingspage.cpp
+   internet/subsonicurlhandler.cpp
+@@ -461,7 +455,6 @@ set(HEADERS
+   globalsearch/searchprovider.h
+   globalsearch/simplesearchprovider.h
+   globalsearch/soundcloudsearchprovider.h
+-  globalsearch/spotifysearchprovider.h
+   globalsearch/suggestionwidget.h
+ 
+   internet/cloudfileservice.h
+@@ -494,9 +487,6 @@ set(HEADERS
+   internet/somafmservice.h
+   internet/somafmurlhandler.h
+   internet/soundcloudservice.h
+-  internet/spotifyserver.h
+-  internet/spotifyservice.h
+-  internet/spotifysettingspage.h
+   internet/subsonicservice.h
+   internet/subsonicsettingspage.h
+   internet/subsonicurlhandler.h
+@@ -685,7 +675,6 @@ set(UI
    internet/magnatunedownloaddialog.ui
    internet/magnatunesettingspage.ui
    internet/searchboxwidget.ui
 -  internet/spotifysettingspage.ui
+   internet/subsonicsettingspage.ui
  
    library/groupbydialog.ui
-   library/libraryfilterwidget.ui
-@@ -774,32 +773,6 @@
-     internet/lastfmstationdialog.ui
+@@ -836,15 +825,6 @@ optional_source(HAVE_LIBLASTFM
  )
  
--# Spotify
--optional_source(HAVE_SPOTIFY
--  SOURCES
--    globalsearch/spotifysearchprovider.cpp
--    internet/spotifyserver.cpp
--    internet/spotifyservice.cpp
--    internet/spotifysettingspage.cpp
--  HEADERS
--    globalsearch/spotifysearchprovider.h
--    internet/spotifyserver.h
--    internet/spotifyservice.h
--    internet/spotifysettingspage.h
--  INCLUDE_DIRECTORIES
--    ${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob
--    ${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob
--)
--
+ 
 -optional_source(HAVE_SPOTIFY_DOWNLOADER
 -  SOURCES
 -    internet/spotifyblobdownloader.cpp
@@ -289,16 +353,18 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL
  # Platform specific - OS X
  optional_source(APPLE
    INCLUDE_DIRECTORIES
-@@ -1141,19 +1114,6 @@
+@@ -1171,7 +1151,6 @@ add_dependencies(clementine_lib pot)
+ 
+ 
+ target_link_libraries(clementine_lib
+-  clementine-spotifyblob-messages
+   libclementine-common
+   libclementine-tagreader
+   libclementine-remote
+@@ -1240,13 +1219,6 @@ if(HAVE_BREAKPAD)
    endif (LINUX)
  endif(HAVE_BREAKPAD)
  
--if(HAVE_SPOTIFY)
--  target_link_libraries(clementine_lib
--    clementine-spotifyblob-messages
--  )
--endif(HAVE_SPOTIFY)
--
 -if(HAVE_SPOTIFY_DOWNLOADER)
 -  target_link_libraries(clementine_lib
 -    ${QCA_LIBRARIES}
@@ -309,7 +375,7 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL
  if (APPLE)
    target_link_libraries(clementine_lib
      ${GROWL}
-@@ -1231,16 +1191,6 @@
+@@ -1328,16 +1300,6 @@ target_link_libraries(clementine
    clementine_lib
  )
  
@@ -326,22 +392,78 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL
  if (APPLE)
    install(FILES ../dist/clementine.icns
      DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources")
-diff -rauN clementine-1.1.0/src/config.h.in clementine-libre-1.1.0/src/config.h.in
---- clementine-1.1.0/src/config.h.in	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/config.h.in	2012-10-26 02:10:01.735935822 -0200
-@@ -38,8 +38,6 @@
+diff --git a/src/analyzers/nyancatanalyzer.cpp b/src/analyzers/nyancatanalyzer.cpp
+index 39ea101..ab19341 100644
+--- a/src/analyzers/nyancatanalyzer.cpp
++++ b/src/analyzers/nyancatanalyzer.cpp
+@@ -23,13 +23,13 @@
+ #include <QTimerEvent>
+ #include <QBrush>
+ 
+-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat";
++const char* NyanCatAnalyzer::kName = "MooGNU";
+ const float NyanCatAnalyzer::kPixelScale = 0.02f;
+ 
+ 
+ NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
+   : Analyzer::Base(parent, 9),
+-    cat_(":/nyancat.png"),
++    cat_(":/moognu.png"),
+     timer_id_(startTimer(kFrameIntervalMs)),
+     frame_(0),
+     current_buffer_(0),
+diff --git a/src/config.h.in b/src/config.h.in
+index 6cac97e..90e4ee2 100644
+--- a/src/config.h.in
++++ b/src/config.h.in
+@@ -39,7 +39,6 @@
  #cmakedefine HAVE_QCA
- #cmakedefine HAVE_SAC
+ #cmakedefine HAVE_SKYDRIVE
  #cmakedefine HAVE_SPARKLE
--#cmakedefine HAVE_SPOTIFY
 -#cmakedefine HAVE_SPOTIFY_DOWNLOADER
  #cmakedefine HAVE_STATIC_SQLITE
+ #cmakedefine HAVE_UBUNTU_ONE
  #cmakedefine HAVE_WIIMOTEDEV
- #cmakedefine IMOBILEDEVICE_USES_UDIDS
-diff -rauN clementine-1.1.0/src/core/utilities.cpp clementine-libre-1.1.0/src/core/utilities.cpp
---- clementine-1.1.0/src/core/utilities.cpp	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/src/core/utilities.cpp	2012-10-26 02:10:38.303908540 -0200
-@@ -310,9 +310,6 @@
+diff --git a/src/core/backgroundstreams.cpp b/src/core/backgroundstreams.cpp
+index 347b959..b00cb87 100644
+--- a/src/core/backgroundstreams.cpp
++++ b/src/core/backgroundstreams.cpp
+@@ -9,7 +9,6 @@
+ 
+ const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams";
+ const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///";
+-const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood";
+ const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///";
+ 
+ BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent)
+@@ -28,7 +27,6 @@ void BackgroundStreams::LoadStreams() {
+   int version = s.value("version", 0).toInt();
+   if (version < 1) {
+     AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl));
+-    AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
+   }
+ 
+   if (version < kVersion) {
+diff --git a/src/core/timeconstants.h b/src/core/timeconstants.h
+index 96242d6..69196bd 100644
+--- a/src/core/timeconstants.h
++++ b/src/core/timeconstants.h
+@@ -14,10 +14,6 @@
+    limitations under the License.
+ */
+ 
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+ #ifndef TIMECONSTANTS_H
+ #define TIMECONSTANTS_H
+ 
+diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
+index 3fdc6be..e6a109f 100644
+--- a/src/core/utilities.cpp
++++ b/src/core/utilities.cpp
+@@ -340,9 +340,6 @@ QString GetConfigPath(ConfigPath config) {
          return QDir::homePath();
        #endif
  
@@ -351,30 +473,31 @@ diff -rauN clementine-1.1.0/src/core/utilities.cpp clementine-libre-1.1.0/src/co
      default:
        qFatal("%s", Q_FUNC_INFO);
        return QString::null;
-diff -rauN clementine-1.1.0/src/core/utilities.h clementine-libre-1.1.0/src/core/utilities.h
---- clementine-1.1.0/src/core/utilities.h	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/src/core/utilities.h	2012-10-26 02:11:04.965764358 -0200
-@@ -108,7 +108,6 @@
+diff --git a/src/core/utilities.h b/src/core/utilities.h
+index edaa545..ad2138c 100644
+--- a/src/core/utilities.h
++++ b/src/core/utilities.h
+@@ -111,7 +111,6 @@ namespace Utilities {
      Path_NetworkCache,
      Path_GstreamerRegistry,
      Path_DefaultMusicLibrary,
 -    Path_LocalSpotifyBlob,
      Path_MoodbarCache,
+     Path_CacheRoot,
    };
-   QString GetConfigPath(ConfigPath config);
-diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1.0/src/covers/albumcoverloader.cpp
---- clementine-1.1.0/src/covers/albumcoverloader.cpp	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/covers/albumcoverloader.cpp	2012-10-26 03:59:14.488394050 -0200
-@@ -29,17 +29,12 @@
- #include <QUrl>
- #include <QNetworkReply>
- 
--#ifdef HAVE_SPOTIFY
--# include "internet/spotifyservice.h"
--#endif
--
+diff --git a/src/covers/albumcoverloader.cpp b/src/covers/albumcoverloader.cpp
+index a4c4241..39dd101 100644
+--- a/src/covers/albumcoverloader.cpp
++++ b/src/covers/albumcoverloader.cpp
+@@ -30,7 +30,6 @@
+ #include "core/tagreaderclient.h"
+ #include "core/utilities.h"
+ #include "internet/internetmodel.h"
+-#include "internet/spotifyservice.h"
+ 
  
- AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
+ 
+@@ -38,8 +37,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
    : QObject(parent),
      stop_requested_(false),
      next_id_(1),
@@ -384,38 +507,34 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1
  {
  }
  
-@@ -167,30 +162,6 @@
+@@ -169,26 +167,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage(
  
      remote_tasks_.insert(reply, task);
      return TryLoadResult(true, false, QImage());
 -  } else if (filename.toLower().startsWith("spotify://image/")) {
 -    // HACK: we should add generic image URL handlers
--    #ifdef HAVE_SPOTIFY
--      SpotifyService* spotify = InternetModel::Service<SpotifyService>();
--
--      if (!connected_spotify_) {
--        connect(spotify, SIGNAL(ImageLoaded(QString,QImage)),
--                SLOT(SpotifyImageLoaded(QString,QImage)));
--        connected_spotify_ = true;
--      }
--
--      QString id = QUrl(filename).path();
--      if (id.startsWith('/')) {
--        id.remove(0, 1);
--      }
--      remote_spotify_tasks_.insert(id, task);
--
--      // Need to schedule this in the spotify service's thread
--      QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection,
--                                Q_ARG(QString, id));
--      return TryLoadResult(true, false, QImage());
--    #else
--      return TryLoadResult(false, false, QImage());
--    #endif
+-    SpotifyService* spotify = InternetModel::Service<SpotifyService>();
+-
+-    if (!connected_spotify_) {
+-      connect(spotify, SIGNAL(ImageLoaded(QString,QImage)),
+-              SLOT(SpotifyImageLoaded(QString,QImage)));
+-      connected_spotify_ = true;
+-    }
+-
+-    QString id = QUrl(filename).path();
+-    if (id.startsWith('/')) {
+-      id.remove(0, 1);
+-    }
+-    remote_spotify_tasks_.insert(id, task);
+-
+-    // Need to schedule this in the spotify service's thread
+-    QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection,
+-                              Q_ARG(QString, id));
+-    return TryLoadResult(true, false, QImage());
    }
  
    QImage image(filename);
-@@ -198,16 +169,6 @@
+@@ -196,16 +174,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage(
                         image.isNull() ? task.options.default_output_image_: image);
  }
  
@@ -429,21 +548,22 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1
 -  emit ImageLoaded(task.id, scaled, image);
 -}
 -
- void AlbumCoverLoader::RemoteFetchFinished() {
-   QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-   if (!reply)
-diff -rauN clementine-1.1.0/src/covers/albumcoverloader.h clementine-libre-1.1.0/src/covers/albumcoverloader.h
---- clementine-1.1.0/src/covers/albumcoverloader.h	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/covers/albumcoverloader.h	2012-10-26 02:13:19.304984280 -0200
-@@ -62,7 +62,6 @@
+ void AlbumCoverLoader::RemoteFetchFinished(QNetworkReply* reply) {
+   reply->deleteLater();
+ 
+diff --git a/src/covers/albumcoverloader.h b/src/covers/albumcoverloader.h
+index 987be66..5214e14 100644
+--- a/src/covers/albumcoverloader.h
++++ b/src/covers/albumcoverloader.h
+@@ -62,7 +62,6 @@ class AlbumCoverLoader : public QObject {
   protected slots:
    void ProcessTasks();
-   void RemoteFetchFinished();
+   void RemoteFetchFinished(QNetworkReply* reply);
 -  void SpotifyImageLoaded(const QString& url, const QImage& image);
  
   protected:
    enum State {
-@@ -102,13 +101,10 @@
+@@ -102,13 +101,10 @@ class AlbumCoverLoader : public QObject {
    QMutex mutex_;
    QQueue<Task> tasks_;
    QMap<QNetworkReply*, Task> remote_tasks_;
@@ -457,54 +577,47 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.h clementine-libre-1.1.0
    static const int kMaxRedirects = 3;
  };
  
-diff -rauN clementine-1.1.0/src/engines/gstenginepipeline.cpp clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp
---- clementine-1.1.0/src/engines/gstenginepipeline.cpp	2012-10-25 03:04:21.000000000 -0200
-+++ clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp	2012-10-26 02:14:35.834075631 -0200
-@@ -30,11 +30,6 @@
+diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp
+index 94f77a3..37c1cdf 100644
+--- a/src/engines/gstenginepipeline.cpp
++++ b/src/engines/gstenginepipeline.cpp
+@@ -29,8 +29,6 @@
+ #include "core/signalchecker.h"
  #include "core/utilities.h"
  #include "internet/internetmodel.h"
+-#include "internet/spotifyserver.h"
+-#include "internet/spotifyservice.h"
  
--#ifdef HAVE_SPOTIFY
--#  include "internet/spotifyserver.h"
--#  include "internet/spotifyservice.h"
--#endif
--
- const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
- const int GstEnginePipeline::kFaderFudgeMsec = 2000;
  
-@@ -139,42 +134,11 @@
+ const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
+@@ -141,37 +139,11 @@ bool GstEnginePipeline::ReplaceDecodeBin(GstElement* new_bin) {
  bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) {
    GstElement* new_bin = NULL;
  
 -  if (url.scheme() == "spotify") {
--    #ifdef HAVE_SPOTIFY
--      new_bin = gst_bin_new("spotify_bin");
+-    new_bin = gst_bin_new("spotify_bin");
 -
--      // Create elements
--      GstElement* src = engine_->CreateElement("tcpserversrc", new_bin);
--      GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin);
--      if (!src || !gdp)
--        return false;
+-    // Create elements
+-    GstElement* src = engine_->CreateElement("tcpserversrc", new_bin);
+-    GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin);
+-    if (!src || !gdp)
+-      return false;
 -
--      // Pick a port number
--      const int port = Utilities::PickUnusedPort();
--      g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL);
--      g_object_set(G_OBJECT(src), "port", port, NULL);
+-    // Pick a port number
+-    const int port = Utilities::PickUnusedPort();
+-    g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL);
+-    g_object_set(G_OBJECT(src), "port", port, NULL);
 -
--      // Link the elements
--      gst_element_link(src, gdp);
+-    // Link the elements
+-    gst_element_link(src, gdp);
 -
--      // Add a ghost pad
--      GstPad* pad = gst_element_get_static_pad(gdp, "src");
--      gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad));
--      gst_object_unref(GST_OBJECT(pad));
+-    // Add a ghost pad
+-    GstPad* pad = gst_element_get_static_pad(gdp, "src");
+-    gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad));
+-    gst_object_unref(GST_OBJECT(pad));
 -
--      // Tell spotify to start sending data to us.
--      InternetModel::Service<SpotifyService>()->server()->StartPlaybackLater(url.toString(), port);
--    #else // HAVE_SPOTIFY
--      qLog(Error) << "Tried to play a spotify:// url, but spotify support is not compiled in";
--      return false;
--    #endif
+-    // Tell spotify to start sending data to us.
+-    InternetModel::Service<SpotifyService>()->server()->StartPlaybackLater(url.toString(), port);
 -  } else {
      new_bin = engine_->CreateElement("uridecodebin");
      g_object_set(G_OBJECT(new_bin), "uri", url.toEncoded().constData(), NULL);
@@ -515,33 +628,31 @@ diff -rauN clementine-1.1.0/src/engines/gstenginepipeline.cpp clementine-libre-1
  
    return ReplaceDecodeBin(new_bin);
  }
-diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.0/src/internet/internetmodel.cpp
---- clementine-1.1.0/src/internet/internetmodel.cpp	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/internet/internetmodel.cpp	2012-10-26 02:15:18.005072563 -0200
-@@ -34,9 +34,6 @@
- #ifdef HAVE_LIBLASTFM
-   #include "lastfmservice.h"
- #endif
--#ifdef HAVE_SPOTIFY
--  #include "spotifyservice.h"
--#endif
- #ifdef HAVE_GOOGLE_DRIVE
-   #include "googledriveservice.h"
- #endif
-@@ -79,9 +76,6 @@
+diff --git a/src/internet/internetmodel.cpp b/src/internet/internetmodel.cpp
+index 289f591..ac9e3e0 100644
+--- a/src/internet/internetmodel.cpp
++++ b/src/internet/internetmodel.cpp
+@@ -30,7 +30,6 @@
+ #include "savedradio.h"
+ #include "somafmservice.h"
+ #include "soundcloudservice.h"
+-#include "spotifyservice.h"
+ #include "subsonicservice.h"
+ #include "core/closure.h"
+ #include "core/logging.h"
+@@ -94,7 +93,6 @@ InternetModel::InternetModel(Application* app, QObject* parent)
    AddService(new SkyFmService(app, this));
    AddService(new SomaFMService(app, this));
    AddService(new SoundCloudService(app, this));
--#ifdef HAVE_SPOTIFY
 -  AddService(new SpotifyService(app, this));
--#endif
- }
- 
- void InternetModel::AddService(InternetService *service) {
-diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about.cpp
---- clementine-1.1.1/src/ui/about.cpp		2012-10-11 09:16:40.000000000 -0200
-+++ clementine-libre-1.1.1/src/ui/about.cpp	2013-05-13 02:19:40.262472593 -0300
-@@ -75,16 +75,9 @@
+   AddService(new SubsonicService(app, this));
+ #ifdef HAVE_UBUNTU_ONE
+   AddService(new UbuntuOneService(app, this));
+diff --git a/src/ui/about.cpp b/src/ui/about.cpp
+index 53e42bd..49e7714 100644
+--- a/src/ui/about.cpp
++++ b/src/ui/about.cpp
+@@ -76,14 +76,9 @@ QString About::MakeHtml() const {
  
    ret += QString("<br />%1</p>").arg(tr("...and all the Amarok contributors"));
    ret += QString("<p><b>%1</b>").arg(tr("And:"));
@@ -549,44 +660,38 @@ diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about
    ret += QString("<br /><a href=\"http://www.smitelli.com/?page=blog&p=54\">Scott Smitelli</a>");
    ret += QString("<br /><a href=\"http://hyperboleandahalf.blogspot.com\">Allie Brosh</a></p>");
  
--#ifdef HAVE_SPOTIFY
--  ret += "<p>This product uses SPOTIFY(R) CORE but is not endorsed, certified "
--         "or otherwise approved in any way by Spotify. Spotify is the "
--         "registered trade mark of the Spotify Group.</p>";
--#endif // HAVE_SPOTIFY
+-  ret += "<p>This product uses Music by Spotify but is not endorsed, certified "
+-         "or otherwise approved in any way by Spotify. Spotify is the registered "
+-         "trade mark of the Spotify Group.</p>";
 -
    return ret;
  }
  
-diff -rauN clementine-1.1.0/src/ui/settingsdialog.cpp clementine-libre-1.1.0/src/ui/settingsdialog.cpp
---- clementine-1.1.0/src/ui/settingsdialog.cpp	2012-10-11 09:16:40.000000000 -0200
-+++ clementine-libre-1.1.0/src/ui/settingsdialog.cpp	2012-10-26 02:16:32.400950434 -0200
-@@ -55,10 +55,6 @@
- # include "wiimotedev/wiimotesettingspage.h"
+diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
+index dc0d84f..4a9335d 100644
+--- a/src/ui/settingsdialog.cpp
++++ b/src/ui/settingsdialog.cpp
+@@ -38,7 +38,6 @@
+ #include "internet/digitallyimportedsettingspage.h"
+ #include "internet/groovesharksettingspage.h"
+ #include "internet/magnatunesettingspage.h"
+-#include "internet/spotifysettingspage.h"
+ #include "internet/subsonicsettingspage.h"
+ #include "internet/ubuntuonesettingspage.h"
+ #include "library/librarysettingspage.h"
+@@ -174,7 +173,6 @@ SettingsDialog::SettingsDialog(Application* app, BackgroundStreams* streams, QWi
+   AddPage(Page_Box, new BoxSettingsPage(this), providers);
  #endif
  
--#ifdef HAVE_SPOTIFY
--# include "internet/spotifysettingspage.h"
--#endif
--
- #ifdef HAVE_GOOGLE_DRIVE
- # include "internet/googledrivesettingspage.h"
- #endif
-@@ -147,10 +143,6 @@
-   AddPage(Page_GoogleDrive, new GoogleDriveSettingsPage(this), providers);
- #endif
- 
--#ifdef HAVE_SPOTIFY
 -  AddPage(Page_Spotify, new SpotifySettingsPage(this), providers);
--#endif
--
    AddPage(Page_Magnatune, new MagnatuneSettingsPage(this), providers);
    AddPage(Page_DigitallyImported, new DigitallyImportedSettingsPage(this), providers);
    AddPage(Page_BackgroundStreams, new BackgroundStreamsSettingsPage(this), providers);
-diff -rauN clementine-1.1.0/src/ui/settingsdialog.h clementine-libre-1.1.0/src/ui/settingsdialog.h
---- clementine-1.1.0/src/ui/settingsdialog.h	2012-10-11 09:16:40.000000000 -0200
-+++ clementine-libre-1.1.0/src/ui/settingsdialog.h	2012-10-26 02:16:56.596276994 -0200
-@@ -67,7 +67,6 @@
+diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h
+index e9e709a..5485a37 100644
+--- a/src/ui/settingsdialog.h
++++ b/src/ui/settingsdialog.h
+@@ -69,7 +69,6 @@ public:
      Page_Library,
      Page_Lastfm,
      Page_Grooveshark,
@@ -594,84 +699,3 @@ diff -rauN clementine-1.1.0/src/ui/settingsdialog.h clementine-libre-1.1.0/src/u
      Page_Magnatune,
      Page_DigitallyImported,
      Page_BackgroundStreams,
-diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.cpp clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp
---- clementine-1.1.0/ext/libclementine-common/core/logging.cpp	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp	2012-10-26 02:20:08.682299778 -0200
-@@ -14,10 +14,6 @@
-    limitations under the License.
- */
- 
--// Note: this file is licensed under the Apache License instead of GPL because
--// it is used by the Spotify blob which links against libspotify and is not GPL
--// compatible.
--
- #include <QtGlobal>
- 
- #include <cxxabi.h>
-diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.h clementine-libre-1.1.0/ext/libclementine-common/core/logging.h
---- clementine-1.1.0/ext/libclementine-common/core/logging.h	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.h	2012-10-26 02:20:34.937511945 -0200
-@@ -14,11 +14,6 @@
-    limitations under the License.
- */
- 
--// Note: this file is licensed under the Apache License instead of GPL because
--// it is used by the Spotify blob which links against libspotify and is not GPL
--// compatible.
--
--
- #ifndef LOGGING_H
- #define LOGGING_H
- 
-diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/core/timeconstants.h
---- clementine-1.0.1/src/core/timeconstants.h	2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/timeconstants.h	2012-05-30 03:10:10.338953893 -0300
-@@ -14,10 +14,6 @@
-    limitations under the License.
- */
- 
--// Note: this file is licensed under the Apache License instead of GPL because
--// it is used by the Spotify blob which links against libspotify and is not GPL
--// compatible.
--
- #ifndef TIMECONSTANTS_H
- #define TIMECONSTANTS_H
- 
-diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.1/src/core/backgroundstreams.cpp
---- clementine-1.1.1/src/core/backgroundstreams.cpp		2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.1/src/core/backgroundstreams.cpp	2013-05-13 02:20:21.506864034 -0300
-@@ -9,7 +9,6 @@
- 
- const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams";
- const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///";
--const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood";
- const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///";
- 
- BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent)
-@@ -28,7 +27,6 @@
-   int version = s.value("version", 0).toInt();
-   if (version < 1) {
-     AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl));
--    AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
-   }
- 
-   if (version < kVersion) {
-diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp
---- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp	2012-10-16 08:17:37.000000000 -0200
-+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp	2013-08-02 00:16:25.974215711 -0300
-@@ -23,13 +23,13 @@
- #include <QTimerEvent>
- #include <QBrush>
- 
--const char* NyanCatAnalyzer::kName = "Nyanalyzer cat";
-+const char* NyanCatAnalyzer::kName = "MooGNU";
- const float NyanCatAnalyzer::kPixelScale = 0.02f;
- 
- 
- NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
-   : Analyzer::Base(parent, 9),
--    cat_(":/nyancat.png"),
-+    cat_(":/moognu.png"),
-     timer_id_(startTimer(kFrameIntervalMs)),
-     frame_(0),
-     current_buffer_(0),