update gnome-bluetooth

4 files changed, 73 insertions, 6 deletions

diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index 77a6d150..58f33c82 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -1,2 +1,4 @@
-EBUILD gnome-bluetooth-2.30.0.ebuild 1133 RMD160 f5b744526f04d0bc755d9157d4c78140c8546da3 SHA1 a2bdcf7d836b6b54d1806d2b64fbf2ae36a0905c SHA256 ff5aa83d4899e6439ed28cf76b7a118fc1ff6422c3adb8b057169c3a65fd0311
+AUX gnome-bluetooth-2.30.0-add-pin.patch 838 RMD160 38f83f8aaba9cb8f45f42b0ac7b943eba9234dda SHA1 e03d3a7bcb28d3bb8af59b60a1ec8c76d8bf2613 SHA256 43a9fabca0daf02cf7908d47c7cab5ee3a687d7241adc5af440bc7f593c400f1
+AUX gnome-bluetooth-2.30.0-mounted-failure.patch 1053 RMD160 3f1cceadb563c4fe9672fbe9c6a4dda3926c1c61 SHA1 b1308644e93b691c4e3875407c88c3cad0a34896 SHA256 3da63558ec863549c37f4388c51c5bab31bf2c3d8e68512d49bd69d2eab9626d
+EBUILD gnome-bluetooth-2.30.0-r1.ebuild 1307 RMD160 90170344859e5031e18940e368d093748b9e3321 SHA1 fc87ba9c14a9797c0928c5951e6aa0b1d89ed9f0 SHA256 5ce5fbea005e21f31beef4c8c5d50be5c4e67087ff364150c34d39a4a520042d
 DIST gnome-bluetooth-2.30.0.tar.bz2 1015602 RMD160 cc13229f22a09cb72fd1325d0f08bd69f42766e8 SHA1 76183906a0d644547bd4192a43908cdd00292ece SHA256 4caafa8c28195c81d8c51414f3a64489f81b9b46cac56979aeaaff8c9ebb78d4
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-add-pin.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-add-pin.patch
new file mode 100644
index 00000000..dc55eb65
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-add-pin.patch
@@ -0,0 +1,23 @@
+From fff176c2b14516bc572576199490a0f526999b24 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 02 May 2010 17:45:21 +0000
+Subject: Add pin code for BT-GPS8 JENTRO
+
+https://bugzilla.gnome.org/show_bug.cgi?id=617371
+---
+diff --git a/wizard/pin-code-database.xml b/wizard/pin-code-database.xml
+index 8f9e9a3..8a73d65 100644
+--- a/wizard/pin-code-database.xml
++++ b/wizard/pin-code-database.xml
+@@ -65,6 +65,9 @@
+ 	<device oui="00:19:1D:" name="Nintendo RVL-CNT-01" pin="NULL"/>
+ 	<device oui="00:1F:C5:" name="Nintendo RVL-CNT-01" pin="NULL"/>
+ 
++	<!-- BT-GPS8 JENTRO, GPS mouse -->
++	<device oui="00:0D:B5:" name="BT-GPS8 JENTRO" pin="0000"/>
++
+ <!-- GPS devices -->
+ 	<device oui="00:0D:B5:" name="TomTom Wireless GPS MkII" pin="0000"/>
+ 	<device oui="00:0D:B5:" name="GPS-GW-005" pin="0000"/>
+--
+cgit v0.8.3.1
diff --git a/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-mounted-failure.patch b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-mounted-failure.patch
new file mode 100644
index 00000000..90e5da5d
--- /dev/null
+++ b/net-wireless/gnome-bluetooth/files/gnome-bluetooth-2.30.0-mounted-failure.patch
@@ -0,0 +1,34 @@
+From 49c9ab7ddd8c20ad1722d20185a0fc3e71ce2d20 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Wed, 26 May 2010 14:24:15 +0000
+Subject: Don't fail to browse the device if already mounted
+
+We don't need to have an error if the device is already mounted,
+just show it already!
+---
+diff --git a/applet/main.c b/applet/main.c
+index 5655a75..dd517c8 100644
+--- a/applet/main.c
++++ b/applet/main.c
+@@ -114,9 +114,16 @@ mount_finish_cb (GObject *source_object,
+ 
+ 	if (g_file_mount_enclosing_volume_finish (G_FILE (source_object),
+ 						  res, &error) == FALSE) {
+-		g_printerr ("Failed to mount OBEX volume: %s", error->message);
+-		g_error_free (error);
+-		return;
++		/* Ignore "already mounted" error */
++		if (error->domain == G_IO_ERROR &&
++		    error->code == G_IO_ERROR_ALREADY_MOUNTED) {
++			g_error_free (error);
++			error = NULL;
++		} else {
++			g_printerr ("Failed to mount OBEX volume: %s", error->message);
++			g_error_free (error);
++			return;
++		}
+ 	}
+ 
+ 	uri = g_file_get_uri (G_FILE (source_object));
+--
+cgit v0.8.3.1
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.30.0.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.30.0-r1.ebuild
index 0bbf4bbd..4ddd767f 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-2.30.0.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-2.30.0-r1.ebuild
@@ -9,15 +9,16 @@ DESCRIPTION="Fork of bluez-gnome focused on integration with GNOME"
 HOMEPAGE="http://live.gnome.org/GnomeBluetooth"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="2"
-IUSE="doc introspection nautilus-sendto"
+IUSE="doc introspection nautilus"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-2.18
+COMMON_DEPEND=">=dev-libs/glib-2.19.1
+	>=x11-libs/gtk+-2.19.1
 	>=x11-libs/libnotify-0.4.3
 	>=gnome-base/gconf-2.6
 	>=dev-libs/dbus-glib-0.74
-	dev-libs/libunique"
+	dev-libs/libunique
+	nautilus? ( >=gnome-extra/nautilus-sendto-2.28.0.1[-bluetooth] )"
 RDEPEND="${COMMON_DEPEND}
 	>=net-wireless/bluez-4.34
 	app-mobilephone/obexd"
@@ -29,10 +30,11 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig
 	sys-devel/gettext
+	x11-libs/libX11
+	x11-libs/libXi
 	x11-proto/xproto
 	gnome-base/gnome-common
 	dev-util/gtk-doc-am
-	nautilus-sendto? ( gnome-extra/nautilus-sendto )
 	introspection? ( dev-libs/gobject-introspection )
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
@@ -42,3 +44,9 @@ G2CONF="${G2CONF}
 --disable-icon-update
 $(use_enable nautilus-sendto)
 $(use_enable introspection)"
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}/${P}-add-pin.patch"
+	epatch "${FILESDIR}/${P}-mounted-failure.patch"
+}
\ No newline at end of file