Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 71 insertions, 50 deletions

diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index f52891d3d..4cc986be1 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,72 +1,84 @@
-# $Id: PKGBUILD 90335 2013-05-11 16:04:01Z tomegun $
-#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-#Contributor: BlackEagle <ike.devolder@gmail.com>
-#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-#Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-#Contributor (Parabola): Kete <kete@ninthfloor.org>
-#Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# $Id: PKGBUILD 94971 2013-08-01 22:31:55Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: BlackEagle <ike.devolder@gmail.com>
+# Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): Kete <kete@ninthfloor.org>
+# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.1.1
-pkgrel=8
+pkgrel=9
 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')
-depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' 'projectm'
-         'libmtp' 'libplist' 'hicolor-icon-theme' 'qt4' 'libimobiledevice' 'chromaprint'
-         'sparsehash' 'qjson' 'libcdio-paranoia' 'protobuf' 'qca' 'qca-ossl' 'gvfs')
-makedepends=('cmake' 'boost' 'mesa')
-optdepends=('gstreamer0.10-base-plugins: for more open formats'
-            'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
-            'gstreamer0.10-bad-libre-plugins: for use with "Bad" plugin libraries'
-            'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
+depends=('chromaprint' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'projectm' 'protobuf' 'qca-ossl' 'qjson' 'taglib')
+makedepends=('cmake' 'boost' 'mesa' 'sparsehash')
+optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries'
+            'gstreamer0.10-good-plugins: "Good" plugin libraries'
+            'gstreamer0.10-bad-libre-plugins: "Bad" plugin libraries'
+            'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries'
+            'gvfs: Various devices support')
 replaces=('clementine')
 conflicts=('clementine')
 provides=("clementine=$pkgver")
-source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
+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')
-install=clementine.install
+md5sums=('28e4afb822388bd337a761db8f86febf'
+         '736df6cd828a3172701f63c8dc978cb9'
+         '9ccfe62f8784a1ccbe8c96f8cacad9d0'
+         '59a8c0d7659898c457b95f877718cf1c')
 
-build() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
+prepare() {
+  cd ${_pkgname}-${pkgver}
 
-   patch -Np1 < "$srcdir"/clementine-1.1.1-libimobiledevice-fix.patch
+  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
+  # 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 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 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
+  ## remove nonfree nyancat.png
+  rm -v data/nyancat.png
 
-   ## Put moognu.png to the source code
-   cp -v ../moognu.png data
+  ## rut moognu.png to the source code
+  install -m644 -v ../moognu.png data
 
-   # Create a blank file due that is a dependency for clementine
-   touch data/schema/schema-30.sql  
+  # create a blank file due which is a dependency for clementine
+  touch data/schema/schema-30.sql  
+}
 
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0
-   make
+build() {
+  cd ${_pkgname}-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0
+  make
 }
 
 package() {
-   cd "${srcdir}/${_pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
+  cd ${_pkgname}-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
 }
-md5sums=('28e4afb822388bd337a761db8f86febf'
-         '736df6cd828a3172701f63c8dc978cb9'
-         '5cc8f800dd4df7bd5548196009ab68e0'
-         '59a8c0d7659898c457b95f877718cf1c')
+
+# vim: ts=2 sw=2 et:
diff --git a/libre/clementine-libre/clementine.install b/libre/clementine-libre/clementine.install
index 2f0338d8a..927a10258 100644
--- a/libre/clementine-libre/clementine.install
+++ b/libre/clementine-libre/clementine.install
@@ -1,13 +1,15 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
   update-desktop-database -q
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 
 post_remove() {
-  post_install $1
+  post_install
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index 6008b2d28..3a948bf96 100644
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -658,8 +658,15 @@ diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.
    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-05-13 03:56:04.732771832 -0300
-@@ -29,7 +29,7 @@
++++ 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),