Fix building with x11-libs/libnotify wrt #354131 (imported Fedora patch) by Diego Elio Pettenò.

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

4 files changed, 49 insertions, 15 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index bb9005b79ce4..414f8e685a20 100644
--- a/gnome-extra/gnome-user-share/ChangeLog
+++ b/gnome-extra/gnome-user-share/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-user-share
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.11 2011/02/08 22:41:35 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.12 2011/02/13 10:22:29 ssuominen Exp $
+
+  13 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-user-share-2.30.1.ebuild,
+  +files/gnome-user-share-2.30.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify wrt #354131 (imported Fedora patch) by
+  Diego Elio Pettenò.
 
   08 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-user-share-2.30.0.ebuild, gnome-user-share-2.30.1.ebuild:
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
index de6a0d7fe0be..62885cebe7cc 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gnome-user-share-2.30.1-libnotify-0.7.patch 1340 RMD160 b184eb99c4d595c8c28693d92174adfa1faa15a4 SHA1 98e1cb208d54ba5a8e837695493dbc25e83468f5 SHA256 60fcfe4a7120b7a917e2aec227f3a40fe4993bc9c80f2722f856fbe4e6e4994e
 DIST gnome-user-share-2.30.0.tar.bz2 944583 RMD160 183320310031bdc7c65da45a3a8882673ec2aff2 SHA1 56c7a2a77065039bd0e10f3c497b0be7deba4c6d SHA256 75f5424d7062c8ee82c2a65f6c952a04aca92070134de4a69c9e2e5ec50d4163
 DIST gnome-user-share-2.30.1.tar.bz2 959747 RMD160 f54ba99544bbf3f8a71486462837f99afb24de97 SHA1 1051de28334991f270b4abb67a2e7ddb01bc80ea SHA256 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
 EBUILD gnome-user-share-2.30.0.ebuild 1407 RMD160 d94f55861667dfd1689e6ea631b4e00ddf4e3868 SHA1 7c0e8464696abd40baa358b839bebade954a7692 SHA256 72a8f4b7ad53b56b7063185bd586cd32a247a0e2585822113cd6a5f43605c11f
-EBUILD gnome-user-share-2.30.1.ebuild 1537 RMD160 f29b873b920171fc067adb6019a821bf107695e8 SHA1 386e2c3fd1fdf0786b3604202d796a745a40ae83 SHA256 0896044a709941a8dcafff428bfc34b694ebb5e58fc4f0dce390928631621244
-MISC ChangeLog 2218 RMD160 66477cbb02712f61f6ef77d3b681c5ae75557732 SHA1 97aec775f1d7187a7b5582560453beeb134d9232 SHA256 9db1e774512270428eb3c94032ab751109bc504f18ef15fa18c51be16617d3b0
+EBUILD gnome-user-share-2.30.1.ebuild 1682 RMD160 0d128231587b3aace7cbbc513b8cd0c59e278895 SHA1 8ebc145a6251b3b5ff20dc828ee89b982f1b7b71 SHA256 554a0a216429c63ab5efd835daed638ef6cfa619fc5346e95e4d69cdfa1082c6
+MISC ChangeLog 2468 RMD160 eaf9b98baa36ceef9c8fa10a40a11522b6be99cc SHA1 c052ff64dba166359a65923d83b55c3cae32ed58 SHA256 156004ccb1778fe8b56c6370d2f3597259fb81ae41af56c155c967bee469a13f
 MISC metadata.xml 306 RMD160 1b5f520dd385288193c3cfa5f2977f5c8cd36246 SHA1 b7b6d50b01bbe9ab5d9159239b89332186063335 SHA256 185c811ac4adbf390d2d997eaba05f7a5115bc35e1b1baa5e75165a9afe1cb18
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk1RxqkACgkQ1fmVwcYIWAZTgACgz/5lGa6fjKV4lZ5K2szLdezq
-C1sAoLzyMw+Po+wNRyexEdBmYK8nU2oC
-=poQP
------END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-2.30.1-libnotify-0.7.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-2.30.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..73c5a9ab8f01
--- /dev/null
+++ b/gnome-extra/gnome-user-share/files/gnome-user-share-2.30.1-libnotify-0.7.patch
@@ -0,0 +1,31 @@
+http://pkgs.fedoraproject.org/gitweb/?p=gnome-user-share.git;a=blob;f=notify.patch;hb=HEAD
+
+--- src/obexpush.c
++++ src/obexpush.c
+@@ -139,10 +139,9 @@ show_notification (const char *filename)
+ 	/* Translators: %s is the name of the filename received */
+ 	notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display);
+ 	g_free (display);
+-	notification = notify_notification_new_with_status_icon (_("You received a file"),
+-								 notification_text,
+-								 "dialog-information",
+-								 GTK_STATUS_ICON (statusicon));
++	notification = notify_notification_new (_("You received a file"),
++					         notification_text,
++					         "dialog-information");
+ 
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ 
+@@ -218,10 +217,10 @@ device_is_authorised (const char *bdaddr
+ 		char *device_path;
+ 		GHashTable *props;
+ 
+-		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
++		g_message ("checking adapter %s", (char *)g_ptr_array_index (adapters, i));
+ 
+ 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
+-						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
++						    (char *)g_ptr_array_index (adapters, i), "org.bluez.Adapter");
+ 
+ 		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
+ 				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
index 5ffed83911cf..4d1addd4144c 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.2 2011/02/08 22:41:35 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.3 2011/02/13 10:22:29 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit gnome2 multilib
+inherit eutils gnome2 multilib
 
 DESCRIPTION="Personal file sharing for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -47,6 +47,12 @@ pkg_setup() {
 		--with-modules-path=/usr/$(get_libdir)/apache2/modules/"
 }
 
+src_prepare() {
+	has_version ">=x11-libs/libnotify-0.7" && epatch \
+		"${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 	# nautilus does not need la files