[clementine/f19] fix compile against new libimobiledevice

Tom Callaway spot at fedoraproject.org
Tue Apr 23 19:03:08 UTC 2013


commit fc01ae6693c5ad4fadcc423bb252cf073baa4035
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Tue Apr 23 15:02:30 2013 -0400

    fix compile against new libimobiledevice

 clementine-1.1.1-libimobiledevice-fix.patch |   12 ++++++++++++
 clementine.spec                             |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/clementine-1.1.1-libimobiledevice-fix.patch b/clementine-1.1.1-libimobiledevice-fix.patch
new file mode 100644
index 0000000..da7722f
--- /dev/null
+++ b/clementine-1.1.1-libimobiledevice-fix.patch
@@ -0,0 +1,12 @@
+diff -up clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix clementine-1.1.1/src/devices/imobiledeviceconnection.h
+--- clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix	2013-04-23 14:44:56.932661018 -0400
++++ clementine-1.1.1/src/devices/imobiledeviceconnection.h	2013-04-23 14:46:44.033657190 -0400
+@@ -51,7 +51,7 @@ private:
+   idevice_t device_;
+   afc_client_t afc_;
+ 
+-  uint16_t afc_port_;
++  lockdownd_service_descriptor_t afc_port_;
+ };
+ 
+ #endif // IMOBILEDEVICECONNECTION_H
diff --git a/clementine.spec b/clementine.spec
index aff305e..f82d454 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,6 +1,6 @@
 Name:           clementine
 Version:        1.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A music player and library organizer
 
 Group:          Applications/Multimedia
@@ -13,6 +13,8 @@ Patch0:         clementine-mygpo.patch
 # Desktop file fixes. Sent upstream
 # http://code.google.com/p/clementine-player/issues/detail?id=2690
 Patch1:         clementine-desktop.patch
+# Fix for newer libimobiledevice
+Patch2:		clementine-1.1.1-libimobiledevice-fix.patch
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -64,6 +66,7 @@ music.
 %setup -q
 %patch0 -p1 -b .mygpo
 %patch1 -p1
+%patch2 -p1 -b .fix
 
 # Remove all 3rdparty libraries exceph universalchardet
 # as it is not available as a separate library.
@@ -136,6 +139,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/kde4/services/clementine-zune.protocol
 
 %changelog
+* Tue Apr 23 2013 Tom Callaway <spot at fedoraproject.org> - 1.1.1-3
+- fix compile against new libimobiledevice
+
 * Wed Mar 20 2013 Peter Robinson <pbrobinson at fedoraproject.org> 1.1.1-2
 - Rebuild for new libimobiledevice
 


More information about the scm-commits mailing list