Patch from upstream to fix incorrect usage of dbus-binding-tool

(Portage version: 2.1.2_rc1-r3)

5 files changed, 109 insertions, 2 deletions

diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog
index 05d0a909b088..18c24326651d 100644
--- a/x11-misc/notification-daemon/ChangeLog
+++ b/x11-misc/notification-daemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/notification-daemon
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.22 2006/10/30 20:10:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.23 2006/11/07 08:24:02 cardoe Exp $
+
+*notification-daemon-0.3.6-r1 (07 Nov 2006)
+
+  07 Nov 2006; Doug Goldstein <cardoe@gentoo.org>
+  +files/notification-daemon-0.3.6-binding-tool.patch,
+  notification-daemon-0.3.6.ebuild, +notification-daemon-0.3.6-r1.ebuild:
+  Patch from upstream to fix incorrect usage of dbus-binding-tool
 
   30 Oct 2006; Jeroen Roovers <jer@gentoo.org>
   notification-daemon-0.3.6.ebuild:
diff --git a/x11-misc/notification-daemon/files/digest-notification-daemon-0.3.6-r1 b/x11-misc/notification-daemon/files/digest-notification-daemon-0.3.6-r1
new file mode 100644
index 000000000000..36df99fe7642
--- /dev/null
+++ b/x11-misc/notification-daemon/files/digest-notification-daemon-0.3.6-r1
@@ -0,0 +1,3 @@
+MD5 a5a9aa63205e624da8468e35722b08bf notification-daemon-0.3.6.tar.gz 402426
+RMD160 f673127a3724cebbf9c91a1e457b15288cd86cce notification-daemon-0.3.6.tar.gz 402426
+SHA256 a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13 notification-daemon-0.3.6.tar.gz 402426
diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.3.6-binding-tool.patch b/x11-misc/notification-daemon/files/notification-daemon-0.3.6-binding-tool.patch
new file mode 100644
index 000000000000..52b8c1e8b0ee
--- /dev/null
+++ b/x11-misc/notification-daemon/files/notification-daemon-0.3.6-binding-tool.patch
@@ -0,0 +1,48 @@
+Index: trunk/notification-daemon/AUTHORS
+===================================================================
+--- trunk/notification-daemon/AUTHORS (revision 2880)
++++ trunk/notification-daemon/AUTHORS (revision 2938)
+@@ -7,4 +7,5 @@
+ 	felix@hsgheli.de
+ 	Ed Catmur <ed@catmur.co.uk>
++	Pawel Worach <pawel.worach@gmail.com>
+ 
+ Translators:
+Index: trunk/notification-daemon/ChangeLog
+===================================================================
+--- trunk/notification-daemon/ChangeLog (revision 2928)
++++ trunk/notification-daemon/ChangeLog (revision 2938)
+@@ -1,2 +1,9 @@
++Sun Nov 05 12:12:35 PST 2006  Christian Hammond <chipx86@chipx86.com>
++
++	* src/daemon/Makefile.am:
++	* src/daemon/daemon.c:
++	  - Patch by Pawel Worach to fix the dbus-binding-tool usage to be
++	    compatible with dbus-glib 0.72. This closes bug #95.
++
+ Sun Oct 08 17:10:57 EDT 2006  Christian Hammond <chipx86@chipx86.com>
+ 
+Index: trunk/notification-daemon/src/daemon/Makefile.am
+===================================================================
+--- trunk/notification-daemon/src/daemon/Makefile.am (revision 2927)
++++ trunk/notification-daemon/src/daemon/Makefile.am (revision 2938)
+@@ -14,5 +14,5 @@
+ 
+ notificationdaemon-dbus-glue.h: notificationdaemon.xml
+-	dbus-binding-tool --mode=glib-server \
++	dbus-binding-tool --mode=glib-server --prefix=notification_daemon \
+ 		$(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h
+ 
+Index: trunk/notification-daemon/src/daemon/daemon.c
+===================================================================
+--- trunk/notification-daemon/src/daemon/daemon.c (revision 2927)
++++ trunk/notification-daemon/src/daemon/daemon.c (revision 2938)
+@@ -1090,5 +1090,5 @@
+ 
+ 	dbus_g_object_type_install_info(NOTIFY_TYPE_DAEMON,
+-									&dbus_glib__object_info);
++									
+&dbus_glib_notification_daemon_object_info);
+ 
+ 	bus_proxy = dbus_g_proxy_new_for_name(connection,
+
diff --git a/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild b/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild
new file mode 100644
index 000000000000..9e613928e0a2
--- /dev/null
+++ b/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.3.6-r1.ebuild,v 1.1 2006/11/07 08:24:02 cardoe Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Notifications daemon"
+HOMEPAGE="http://www.galago-project.org/"
+SRC_URI="http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/glib-2.4.0
+		>=x11-libs/gtk+-2.4.0
+		>=gnome-base/gconf-2.4.0
+		>=x11-libs/libsexy-0.1.3
+		||	(
+				>=dev-libs/dbus-glib-0.71
+				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+			)
+		x11-libs/libwnck
+		dev-libs/popt"
+RDEPEND="${DEPEND}
+		 >=sys-devel/gettext-0.14"
+
+DOCS="AUTHORS ChangeLog NEWS"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix for dbus-binding-tool now requireding --prefix
+	# previous behavior just left "anonymous" names which was bad
+	# so this is a needed fix
+	epatch "${FILESDIR}"/${PN}-0.3.6-binding-tool.patch
+}
diff --git a/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild b/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild
index 7734298a871c..e8c44716069d 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild,v 1.4 2006/10/30 20:10:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.3.6.ebuild,v 1.5 2006/11/07 08:24:02 cardoe Exp $
 
 inherit gnome2 eutils
 
@@ -27,3 +27,13 @@ RDEPEND="${DEPEND}
 		 >=sys-devel/gettext-0.14"
 
 DOCS="AUTHORS ChangeLog NEWS"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# fix for dbus-binding-tool now requireding --prefix
+	# previous behavior just left "anonymous" names which was bad
+	# so this is a needed fix
+	epatch "${FILESDIR}"/${PN}-0.3.6-binding-tool.patch
+}