clementine: 1.2.3 -> 1.3.1 new dependencies: gst-plugins-bad gst-plugins-good gst-plugins-ugly crypto++ chromaprint libechonest

4 files changed, 18 insertions, 49 deletions

diff --git a/clementine/.footprint b/clementine/.footprint
index b3b93fe6a..0b648960a 100644
--- a/clementine/.footprint
+++ b/clementine/.footprint
@@ -3,6 +3,8 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/clementine
 -rwxr-xr-x	root/root	usr/bin/clementine-tagreader
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/appdata/
+-rw-r--r--	root/root	usr/share/appdata/clementine.appdata.xml
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/clementine.desktop
 drwxr-xr-x	root/root	usr/share/clementine/
@@ -580,12 +582,15 @@ drwxr-xr-x	root/root	usr/share/clementine/projectm-presets/
 -rw-r--r--	root/root	usr/share/clementine/projectm-presets/shifter - escape the worm - Eo.S. + Phat 5362.milk
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/clementine.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/application-x-clementine.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/clementine.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
--rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/application-x-clementine.svg
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/clementine.svg
 drwxr-xr-x	root/root	usr/share/kde4/
 drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/clementine-feed.protocol
diff --git a/clementine/.md5sum b/clementine/.md5sum
index faef4a50e..4888e437e 100644
--- a/clementine/.md5sum
+++ b/clementine/.md5sum
@@ -1,2 +1 @@
-725b92ad4699de1b2ffdf48fe01ed092  1.2.3.tar.gz
-2384a994ecce0823a2bf57a9a5a5bd8b  udisks-namespace.patch
+04ce1c102841282e620d4caae2a897a2  1.3.1.tar.gz
diff --git a/clementine/Pkgfile b/clementine/Pkgfile
index f611bad2e..8f3467050 100644
--- a/clementine/Pkgfile
+++ b/clementine/Pkgfile
@@ -2,20 +2,23 @@
 # URL: http://www.clementine-player.org/
 # Packager: Chris Farrell, timcowchip at gmail dot com
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: boost glew gst-plugins-bad-compat gst-plugins-good-compat gst-plugins-ugly-compat protobuf qca qjson glu
+# Depends on: boost chromaprint crypto++ glew gst-plugins-bad gst-plugins-good gst-plugins-ugly libechonest protobuf qca
 
 name=clementine
-version=1.2.3
-release=2
-source=(https://github.com/clementine-player/Clementine/archive/$version.tar.gz
-	udisks-namespace.patch)
+version=1.3.1
+release=1
+source=(https://github.com/clementine-player/Clementine/archive/$version.tar.gz)
 
 build() {
 	cd Clementine-$version
 
-	patch -p1 -i $SRC/udisks-namespace.patch
+	install -d build
+	cd build
+
+	cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE='Release'
 
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_WERROR=OFF
 	make
 	make DESTDIR=$PKG install
 }
diff --git a/clementine/udisks-namespace.patch b/clementine/udisks-namespace.patch
deleted file mode 100644
index e74889e78..000000000
--- a/clementine/udisks-namespace.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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)
--- 
-2.0.3