Fix building against >=libimobiledevice-1.1.2 (bug #410411, thanks to Leo Laursen for reporting).

Package-Manager: portage-2.2.0_alpha98/cvs/Linux x86_64

5 files changed, 109 insertions, 12 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index eb8df88ff53d..f8a1bdbd7c42 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.170 2012/03/28 01:03:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.171 2012/04/02 07:34:47 tetromino Exp $
+
+  02 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gvfs-1.10.1.ebuild,
+  +files/gvfs-1.10.1-libimobiledevice-1.1.2.patch, gvfs-1.12.0.ebuild:
+  Fix building against >=libimobiledevice-1.1.2 (bug #410411, thanks to Leo
+  Laursen for reporting).
 
 *gvfs-1.12.0 (28 Mar 2012)
 
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 6fc479c76c98..c10039b3c20c 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gvfs-1.10.1-libimobiledevice-1.1.2.patch 2813 RMD160 84bdfa6b681cb7eb57a0220caecf35491a2cbe42 SHA1 0e9090a65236fa0e49a7927c1839e3bacdc5d646 SHA256 db8bc868fb74f470b4a91ee4eed6e4f327a64b5a666a37c915ef504ace1258e8
 AUX gvfs-1.10.1-unneeded-include.patch 706 RMD160 e6e911fb43aa24201422f3ced7d03d753ce7bc99 SHA1 b180b53b35b8191c0a75795ab40ffec32d4c78ec SHA256 7271536185ad468c39474b8eea387af7038a974c60964b5d8d4f6bac0cc96969
 AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
 AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
 DIST gvfs-1.10.1.tar.xz 1295236 RMD160 e50d96fc0b6aa9d2ab50a3cfc5c161be5d6e6e16 SHA1 d564d9934191342e6421cd038fc0674f8dd27eae SHA256 cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288
 DIST gvfs-1.12.0.tar.xz 1342208 RMD160 8a423a8b9eb988946802502299b0194e3a17a52e SHA1 372f5ca24ff419e5d278ba47165f0be760d32e33 SHA256 87ffb27fd884be65570d64530c3121f9e49848070b62a26e39cd363f6a6bd555
 DIST libgcrypt.m4.bz2 1526 RMD160 6149f51c00e1e21d85187136f7682e41271fed40 SHA1 1731ae882cdc7c53efeef2e23e0d2d9791c6d739 SHA256 ce9d04f9cbd5417e4d4ba91095c06cea4852c70d75716311e82dfc243d2f0128
-EBUILD gvfs-1.10.1.ebuild 3328 RMD160 dd66cec85dfd82f0460317e900fed5985327261a SHA1 26c6046165204b8f01bf4a44154dd4ff7fc5dfd5 SHA256 003db9fb83a0e9576d31c0f277449441b6fdc2f0ea57788c820e9830b3c745e5
-EBUILD gvfs-1.12.0.ebuild 3301 RMD160 fbd91fe16f540bda14fe459a956af5aed79061c1 SHA1 8faca13213cbe947a41bb1e283adf19f263946a8 SHA256 514277c1c5a07be70874376a1c306d1c96baaa722e58ee2e0f438c2620d83e19
-MISC ChangeLog 23708 RMD160 ec5532dbf194fa7a2a4a2595e6b48f00daa453a4 SHA1 759c1e96ceedde22bde71ff5331a2793b3bdc3e7 SHA256 11775dbfcd69eb413d5f26824a44f0987ddff9d9cce4e0fe5819dee76516140f
+EBUILD gvfs-1.10.1.ebuild 3483 RMD160 4b309e542f4e2ab44dd04e61d9828ca88991cebe SHA1 2175a76c09fbfc879fcec48293fe9b843639eef9 SHA256 d26360f45bdf34ae5ef62fd4f7f369a7444670626c45a8f97aaefb332525f234
+EBUILD gvfs-1.12.0.ebuild 3454 RMD160 ab71073587554f3009b25caa7090d403b644555c SHA1 fa13b24099e7a355f0259cfde5e0b579e510d488 SHA256 5257094c51be46a9fb0ec3ebf6274945311bc0c59e86b1b7d3c7bd08a876ad63
+MISC ChangeLog 23961 RMD160 f6aaddb3b2b358ab44303002a2f8957a5e694e54 SHA1 a2dc1b178e1f6aa1385f0893f03157d6819e591b SHA256 2766b8c6fb56c5fdc124ebb49023b4b948d28203a1079cccf984bd657b0faf31
 MISC metadata.xml 1315 RMD160 58c1f8a1d25d892346632ae34a9a3b58288cd029 SHA1 2dd23a67b1cfdffcf1729bf2963893d743859e8c SHA256 79981750cbbf2fd42c086917b23562c668ea309acd311ae4c613b9ff29f7d65a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9yY3EACgkQdjK8w9WeBnAaxwD+InbaIHSg9EbhZYPxuZEkM8N4
-m91Z53aUR6rhB4jT0U4A/RtACIo5i4WiHD7shWIMmOC03IyN21wJdMcuSEDAYprS
-=EVh8
+iF4EAREIAAYFAk95Vp0ACgkQdjK8w9WeBnA51wEAtLJ2t9c1knjm0iB5kmYgk4V8
+RlvYzISwrQx6tWkjSMMA/0BcB7SfseMi6o6boIsN/9rJwQvjtzuolupBniHHtoX0
+=poxD
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch b/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
new file mode 100644
index 000000000000..ab6b82228b49
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.10.1-libimobiledevice-1.1.2.patch
@@ -0,0 +1,85 @@
+From 9668b2601e43a7a32471383c63cd3839aa721c51 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 2 Apr 2012 03:15:30 -0400
+Subject: [PATCH] afc: Fix building against libimobiledevice-1.1.2
+
+In 1.1.2, the struct idevice_event_t uuid field was renamed to udid.
+Since libimobiledevice lacks a library version macro, we are forced
+to check for the pkgconfig version in configure.
+---
+ configure.ac                   |    3 +++
+ daemon/gvfsbackendafc.c        |   10 +++++++++-
+ monitor/afc/afcvolumemonitor.c |   11 +++++++++--
+ 3 files changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e31fb50..081cc09 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -327,6 +327,9 @@ if test "x$enable_afc" != "xno" ; then
+   if test "x$msg_afc" = "xyes"; then
+     PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist)
+     AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built])
++    PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2,
++                     [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1,
++                                [Define to 1 if libimobiledevice-1.1.2 found])])
+   fi
+ fi
+ 
+diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c
+index ab7094f..a62a197 100644
+--- a/daemon/gvfsbackendafc.c
++++ b/daemon/gvfsbackendafc.c
+@@ -339,11 +339,19 @@ static void
+ _idevice_event_cb (const idevice_event_t *event, void *user_data)
+ {
+   GVfsBackendAfc *afc_backend = G_VFS_BACKEND_AFC (user_data);
++  gchar *event_udid;
+ 
+   g_return_if_fail (afc_backend->uuid != NULL);
+   if (event->event != IDEVICE_DEVICE_REMOVE)
+     return;
+-  if (g_str_equal (event->uuid, afc_backend->uuid) == FALSE)
++
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
++  event_udid = event->udid;
++#else
++  event_udid = event->uuid;
++#endif
++
++  if (g_str_equal (event_udid, afc_backend->uuid) == FALSE)
+     return;
+ 
+   g_print ("Shutting down AFC backend for device uuid %s\n", afc_backend->uuid);
+diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c
+index dfc3fa5..9f24753 100644
+--- a/monitor/afc/afcvolumemonitor.c
++++ b/monitor/afc/afcvolumemonitor.c
+@@ -83,15 +83,22 @@ static void
+ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data)
+ {
+   GVfsAfcVolumeMonitor *self;
++  gchar *event_udid;
+ 
+   g_return_if_fail (event != NULL);
+ 
+   self = G_VFS_AFC_VOLUME_MONITOR(user_data);
+ 
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2
++  event_udid = event->udid;
++#else
++  event_udid = event->uuid;
++#endif
++
+   if (event->event == IDEVICE_DEVICE_ADD)
+-    g_vfs_afc_monitor_create_volume (self, event->uuid);
++    g_vfs_afc_monitor_create_volume (self, event_udid);
+   else
+-    g_vfs_afc_monitor_remove_volume (self, event->uuid);
++    g_vfs_afc_monitor_remove_volume (self, event_udid);
+ }
+ 
+ static GObject *
+-- 
+1.7.8.5
+
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
index cd8f9e34c5ed..86d231ed6f0f 100644
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.12 2012/03/25 16:26:39 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.10.1.ebuild,v 1.13 2012/04/02 07:34:47 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -105,7 +105,10 @@ src_prepare() {
 		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
 	fi
 
-	if use gphoto2 || use archive || use prefix; then
+	# bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693
+	use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch"
+
+	if use gphoto2 || use archive || use prefix || use ios; then
 		# libgcrypt.m4 needed for eautoreconf, bug #399043
 		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
 
diff --git a/gnome-base/gvfs/gvfs-1.12.0.ebuild b/gnome-base/gvfs/gvfs-1.12.0.ebuild
index 4c256371ae84..f83fc02f8d9c 100644
--- a/gnome-base/gvfs/gvfs-1.12.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.1 2012/03/28 01:03:40 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.12.0.ebuild,v 1.2 2012/04/02 07:34:47 tetromino Exp $
 
 EAPI=4
 GCONF_DEBUG=no
@@ -104,7 +104,10 @@ src_prepare() {
 		sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
 	fi
 
-	if use gphoto2 || use archive || use prefix; then
+	# bug #410411, https://bugzilla.gnome.org/show_bug.cgi?id=672693
+	use ios && epatch "${FILESDIR}/${PN}-1.10.1-libimobiledevice-1.1.2.patch"
+
+	if use gphoto2 || use archive || use prefix || use ios; then
 		# libgcrypt.m4 needed for eautoreconf, bug #399043
 		mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die