From 14d1956e0bc3b5d1da3ad5701031efdfde243d62 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Sun, 12 Aug 2012 22:37:15 -0300
Subject: clementine-libre-1.0.1-7: updating revision

---
 libre/clementine-libre/PKGBUILD            |  7 ++++-
 libre/clementine-libre/imobiledevice.patch | 50 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 libre/clementine-libre/imobiledevice.patch

diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index d0a7e0d8d..473fd3cce 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -8,7 +8,7 @@
 _pkgname=clementine
 pkgname=clementine-libre
 pkgver=1.0.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A music player and library organizer, without spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
@@ -27,11 +27,13 @@ provides=("clementine=$pkgver")
 source=(http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz
         clementine-fix-albumcoverfetch-crash.patch
         clementine-fresh-start.patch
+        imobiledevice.patch
         remove-and-disable-spotify.patch
         remove-nonfree-references-on-translations.patch)
 sha1sums=('e05320da689e2fad744fd3e68518bc4103ecf0fd'
           'fddd2e784181ce1dcc7809e7122cbade0af7b01f'
           'd8abab4b8fb2d5284a2f43107505325e62d4af5f'
+          'a04cec00e38651de78bfaa6b6d73532c3786de11'
           '2fef46eaffa7b5cd61afbf19b1dc909d11972a34'
           '745bc4fd639d7ef3230592c6275fb43b8956f3d5')
 install=clementine.install
@@ -45,6 +47,9 @@ build() {
    # http://code.google.com/p/clementine-player/issues/detail?id=2752
    patch -Np1 -i ../clementine-fix-albumcoverfetch-crash.patch
 
+   # Use libimobiledevice new "udid" field instead of "uuid".
+   patch -Np1 -i ../imobiledevice.patch
+
    # https://labs.parabola.nu/issues/99
    patch -Np1 -i ../remove-and-disable-spotify.patch
    patch -Np1 -i ../remove-nonfree-references-on-translations.patch
diff --git a/libre/clementine-libre/imobiledevice.patch b/libre/clementine-libre/imobiledevice.patch
new file mode 100644
index 000000000..9d387fd2f
--- /dev/null
+++ b/libre/clementine-libre/imobiledevice.patch
@@ -0,0 +1,50 @@
+--- clementine-1.0.1/src/CMakeLists.txt.orig	2012-04-12 09:26:47.932990539 +0100
++++ clementine-1.0.1/src/CMakeLists.txt	2012-04-12 09:28:40.553993173 +0100
+@@ -17,6 +17,10 @@
+   include_directories(../3rdparty/qtwin)
+ endif(WIN32)
+ 
++if(ENABLE_IMOBILEDEVICE AND IMOBILEDEVICE_VERSION VERSION_GREATER 1.1.1)
++  set(IMOBILEDEVICE_USES_UDIDS ON)
++endif()
++
+ include_directories(${CMAKE_BINARY_DIR})
+ include_directories(${GLIB_INCLUDE_DIRS})
+ include_directories(${LIBXML_INCLUDE_DIRS})
+@@ -1008,6 +1012,7 @@
+     ${USBMUXD_LIBRARIES}
+     gstafcsrc
+   )
++  link_directories(${IMOBILEDEVICE_LIBRARY_DIRS})
+   link_directories(${USBMUXD_LIBRARY_DIRS})
+ endif(HAVE_IMOBILEDEVICE)
+ 
+--- clementine-1.0.1/src/config.h.in.orig	2011-12-02 21:24:43.000000000 +0000
++++ clementine-1.0.1/src/config.h.in	2012-04-12 09:28:40.554993154 +0100
+@@ -38,6 +38,7 @@
+ #cmakedefine HAVE_SPOTIFY
+ #cmakedefine HAVE_STATIC_SQLITE
+ #cmakedefine HAVE_WIIMOTEDEV
++#cmakedefine IMOBILEDEVICE_USES_UDIDS
+ #cmakedefine LEOPARD
+ #cmakedefine SNOW_LEOPARD
+ #cmakedefine USE_INSTALL_PREFIX
+--- clementine-1.0.1/src/devices/ilister.cpp.orig	2012-04-12 09:28:38.407993781 +0100
++++ clementine-1.0.1/src/devices/ilister.cpp	2012-04-12 09:28:40.554993154 +0100
+@@ -1,3 +1,4 @@
++#include "config.h"
+ #include "ilister.h"
+ #include "imobiledeviceconnection.h"
+ 
+@@ -17,7 +18,11 @@
+ void iLister::EventCallback(const idevice_event_t* event, void* context) {
+   iLister* me = reinterpret_cast<iLister*>(context);
+ 
++#ifdef IMOBILEDEVICE_USES_UDIDS
++  const char* uuid = event->udid;
++#else
+   const char* uuid = event->uuid;
++#endif
+ 
+   switch (event->event) {
+     case IDEVICE_DEVICE_ADD:
-- 
cgit v1.2.3