clementine-libre: adding new changes reported from https://labs.parabola.nu/issues/328 and https://labs.parabola.nu/issues/329

3 files changed, 62 insertions, 13 deletions

diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 0daf90aec..cb1978d4f 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -10,7 +10,7 @@ _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
 pkgrel=8
-pkgdesc="A music player and library organizer, without spotify support"
+pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -27,7 +27,8 @@ conflicts=('clementine')
 provides=("clementine=$pkgver")
 source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
         'clementine-1.1.1-libimobiledevice-fix.patch'
-        'remove-and-disable-spotify.patch')
+        'remove-nonfree-artwork-and-spotify.patch'
+        'moognu.png')
 install=clementine.install
 
 build() {
@@ -35,18 +36,25 @@ build() {
 
    patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch
 
-   # Remove nonfree spotify references on files
-   patch -Np1 -i ../remove-and-disable-spotify.patch
+   # Remove nonfree nonfree artwork and spotify references on files
+   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
 
    # Remove nonfree spotifyblob folders
    rm -rv ext/{clementine-spotifyblob,libclementine-spotifyblob}
 
    # Remove nonfree spotify files
    rm -v cmake/SpotifyVersion.cmake
+   rm -v data/spotify-core-logo-128x128.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
+
+   ## Put moognu.png to the source code
+   cp -v "{srcdir}/moognu.png" data
+
    # Create a blank file due that is a dependency for clementine
    touch data/schema/schema-30.sql  
 
@@ -59,4 +67,6 @@ package() {
    make DESTDIR="${pkgdir}" install
 }
 md5sums=('28e4afb822388bd337a761db8f86febf'
-         '736df6cd828a3172701f63c8dc978cb9')
+         '736df6cd828a3172701f63c8dc978cb9'
+         '2ab57bff0ed8f7ba0d96d561ac54d1c2'
+         '59a8c0d7659898c457b95f877718cf1c')
diff --git a/libre/clementine-libre/moognu.png b/libre/clementine-libre/moognu.png
new file mode 100644
index 000000000..177041886
--- /dev/null
+++ b/libre/clementine-libre/moognu.png
diff --git a/libre/clementine-libre/remove-and-disable-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index a9352b275..ec4526422 100644
--- a/libre/clementine-libre/remove-and-disable-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -86,9 +86,9 @@ 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.0/data/data.qrc clementine-libre-1.1.0/data/data.qrc
---- clementine-1.1.0/data/data.qrc	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/data/data.qrc	2012-10-26 01:59:52.333078474 -0200
+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>
      <qresource prefix="/">
@@ -121,7 +121,19 @@ diff -rauN clementine-1.1.0/data/data.qrc clementine-libre-1.1.0/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>
-@@ -339,7 +334,6 @@
+@@ -261,10 +257,10 @@
+         <file>lumberjacksong.txt</file>
+         <file>lyrics/ultimate_providers.xml</file>
+         <file>mainwindow.css</file>
++        <file>moognu.png</file>
+         <file>nocover.png</file>
+         <file>nomusic.png</file>
+         <file>now_playing_tooltip.txt</file>
+-        <file>nyancat.png</file>
+         <file>osd_background.png</file>
+         <file>osd_shadow_corner.png</file>
+         <file>osd_shadow_edge.png</file>
+@@ -339,7 +335,6 @@
          <file>smartplaylistsearchterm.css</file>
          <file>songinfo.css</file>
          <file>spinner.gif</file>
@@ -526,10 +538,14 @@ diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.
  }
  
  void InternetModel::AddService(InternetService *service) {
-diff -rauN clementine-1.0.1/src/ui/about.cpp clementine-libre-1.0.1/src/ui/about.cpp
---- clementine-1.0.1/src/ui/about.cpp	2012-01-22 10:43:26.000000000 -0200
-+++ clementine-libre-1.0.1/src/ui/about.cpp	2012-05-28 19:44:38.760244927 -0300
-@@ -79,12 +79,6 @@
+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 @@
+ 
+   ret += QString("<br />%1</p>").arg(tr("...and all the Amarok contributors"));
+   ret += QString("<p><b>%1</b>").arg(tr("And:"));
+-  ret += QString("<br /><a href=\"http://rainymood.com\">Rainy Mood</a>");
    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>");
  
@@ -621,3 +637,26 @@ diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/
  #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)
+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-05-13 02:40:14.458716251 -0300
+@@ -29,7 +29,7 @@
+ 
+ NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
+   : Analyzer::Base(parent, 9),
+-    cat_(":/nyancat.png"),
++    cat_(":/moognu.png"),
+     timer_id_(startTimer(kFrameIntervalMs)),
+     frame_(0),
+     current_buffer_(0),