clementine: 1.2.3 -> 1.3.1

diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt

--- clementine-1.2.1-a/CMakeLists.txt	2013-11-25 15:16:24.000000000 -0600

+++ clementine-1.2.1-b/CMakeLists.txt	2013-12-30 17:01:48.470011058 -0600

@@ -158,6 +158,10 @@

 include_directories(${TAGLIB_INCLUDE_DIRS})

 include_directories(${QJSON_INCLUDE_DIRS})

 include_directories(${GSTREAMER_INCLUDE_DIRS})

+include_directories(${GSTREAMER_APP_INCLUDE_DIRS})

+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS})

+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS})

+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS})

 include_directories(${GLIB_INCLUDE_DIRS})

 include_directories(${GLIBCONFIG_INCLUDE_DIRS})

 include_directories(${LIBXML_INCLUDE_DIRS})

From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001

From: Chocobozzz <florian.chocobo@gmail.com>

Date: Wed, 16 Jul 2014 15:57:25 +0200

Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401

---

 src/CMakeLists.txt | 9 ++++-----

 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

index 650fa74..775b0a5 100644

--- a/src/CMakeLists.txt

+++ b/src/CMakeLists.txt

@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)

 if(HAVE_DBUS)

   file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)

-  # Hack to get it to generate interfaces without namespaces - required

-  # because otherwise org::freedesktop::UDisks and

-  # org::freedesktop::UDisks::Device conflict.

-  list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)

-

   # MPRIS DBUS interfaces

   qt4_add_dbus_adaptor(SOURCES

       dbus/org.freedesktop.MediaPlayer.player.xml

@@ -964,6 +959,10 @@ if(HAVE_DBUS)

   # DeviceKit DBUS interfaces

   if(HAVE_DEVICEKIT)

+    set_source_files_properties(dbus/org.freedesktop.UDisks.xml

+        PROPERTIES NO_NAMESPACE dbus/udisks)

+    set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml

+        PROPERTIES NO_NAMESPACE dbus/udisksdevice)

     qt4_add_dbus_interface(SOURCES

         dbus/org.freedesktop.UDisks.xml

         dbus/udisks)

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 23070d9..83b6772 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"

 optional_component(VISUALISATIONS ON "Visualisations")

 if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)

-  message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "

-          "code must be compiled in")

 elseif(CRYPTOPP_FOUND)

   set(HAVE_CRYPTOPP ON)

   set(HAVE_SPOTIFY_DOWNLOADER ON)

@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD)

 endif(HAVE_BREAKPAD)

 if(HAVE_SPOTIFY_BLOB)

-  add_subdirectory(ext/clementine-spotifyblob)

 endif(HAVE_SPOTIFY_BLOB)

 if(HAVE_MOODBAR)

From d9ebe7ec09a48b1ea505ccc33686b72642f083f4 Mon Sep 17 00:00:00 2001

From: Thomas Tuegel <ttuegel@gmail.com>

Date: Mon, 4 May 2015 19:59:38 -0500

Subject: [PATCH] Runtime selection of Spotify blob

---

 src/internet/spotifyservice.cpp | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp

index 543744e..d987a36 100644

--- a/src/internet/spotifyservice.cpp

+++ b/src/internet/spotifyservice.cpp

@@ -65,7 +65,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)

diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp

index 88c7383..6e0893c 100644

--- a/src/internet/spotify/spotifyservice.cpp

+++ b/src/internet/spotify/spotifyservice.cpp

@@ -94,7 +94,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)

   system_blob_path_ = QCoreApplication::applicationDirPath() +

                       "/../PlugIns/clementine-spotifyblob";

 #else

                       "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;

 #endif

-- 

2.3.6

{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base

, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist

, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig

, sparsehash, config, makeWrapper, runCommand, gst_plugins }:

{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm

, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp

, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf

, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:

let

  withSpotify = config.clementine.spotify or false;

  withCD = config.clementine.cd or true;

  withCloud = config.clementine.cloud or true;

  version = "1.2.3";

  version = "1.3.1";

  exeName = "clementine";

  src = fetchurl {

    url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;

    sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";

    url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz;

    sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq";

  };

  patches = [

    ./clementine-1.2.1-include-paths.patch

    ./clementine-dbus-namespace.patch

    ./clementine-spotify-blob.patch

    # Required so as to avoid adding libspotify as a build dependency (as it is 

    # unfree and thus would prevent us from having a free package).

    ./clementine-spotify-blob-remove-from-build.patch

  ];

  buildInputs = [

    boost

    cmake

    chromaprint

    fftw

    gettext

    glew

    gst-plugins-base

    gstreamer

    gst_all_1.gst-plugins-base

    gst_all_1.gstreamer

    gvfs

    libechonest

    liblastfm

    libpulseaudio

    pcre

    pkgconfig

    protobuf

    qca2

  blob = stdenv.mkDerivation {

    name = "clementine-blob-${version}";

    # Use the same patches and sources as Clementine

    inherit patches src;

    inherit src;

    patches = [

      ./clementine-spotify-blob.patch

    ];

    buildInputs = buildInputs ++ [ libspotify ];

    # Only build and install the Spotify blob

    preBuild = ''

  mkdir -p $out/bin

  makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \

      ${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \

      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"

      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"

  mkdir -p $out/share

  for dir in applications icons kde4; do