summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schweizer <genstef@gentoo.org>2006-11-07 16:34:45 +0000
committerStefan Schweizer <genstef@gentoo.org>2006-11-07 16:34:45 +0000
commit294eebe7cece9ff4f967b6b06a1d18ab02fe1f31 (patch)
tree097c65d5abfef4649c1ce46304533eb7dd066b1b /x11-misc
parentagg for gnash (diff)
downloadgentoo-2-294eebe7cece9ff4f967b6b06a1d18ab02fe1f31.tar.gz
gentoo-2-294eebe7cece9ff4f967b6b06a1d18ab02fe1f31.tar.bz2
gentoo-2-294eebe7cece9ff4f967b6b06a1d18ab02fe1f31.zip
Fix patch thanks to brad walker <bradmwalker@cableone.net> and Jule Slootbeek <jslootbeek@gmail.com> in bug 154370
(Portage version: 2.1.2_rc1-r4)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/notification-daemon/ChangeLog7
-rw-r--r--x11-misc/notification-daemon/files/notification-daemon-0.3.6-binding-tool.patch28
2 files changed, 19 insertions, 16 deletions
diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog
index 18c24326651d..36e64fc88ffa 100644
--- a/x11-misc/notification-daemon/ChangeLog
+++ b/x11-misc/notification-daemon/ChangeLog
@@ -1,6 +1,11 @@
# 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.23 2006/11/07 08:24:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.24 2006/11/07 16:34:45 genstef Exp $
+
+ 07 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+ files/notification-daemon-0.3.6-binding-tool.patch:
+ Fix patch thanks to brad walker <bradmwalker@cableone.net> and Jule
+ Slootbeek <jslootbeek@gmail.com> in bug 154370
*notification-daemon-0.3.6-r1 (07 Nov 2006)
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
index 52b8c1e8b0ee..7651b2c1282e 100644
--- 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
@@ -1,17 +1,17 @@
-Index: trunk/notification-daemon/AUTHORS
+Index: AUTHORS
===================================================================
---- trunk/notification-daemon/AUTHORS (revision 2880)
-+++ trunk/notification-daemon/AUTHORS (revision 2938)
+--- AUTHORS (revision 2880)
++++ 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
+Index: ChangeLog
===================================================================
---- trunk/notification-daemon/ChangeLog (revision 2928)
-+++ trunk/notification-daemon/ChangeLog (revision 2938)
+--- ChangeLog (revision 2928)
++++ ChangeLog (revision 2938)
@@ -1,2 +1,9 @@
+Sun Nov 05 12:12:35 PST 2006 Christian Hammond <chipx86@chipx86.com>
+
@@ -22,10 +22,10 @@ Index: trunk/notification-daemon/ChangeLog
+
Sun Oct 08 17:10:57 EDT 2006 Christian Hammond <chipx86@chipx86.com>
-Index: trunk/notification-daemon/src/daemon/Makefile.am
+Index: src/daemon/Makefile.am
===================================================================
---- trunk/notification-daemon/src/daemon/Makefile.am (revision 2927)
-+++ trunk/notification-daemon/src/daemon/Makefile.am (revision 2938)
+--- src/Makefile.am (revision 2927)
++++ src/Makefile.am (revision 2938)
@@ -14,5 +14,5 @@
notificationdaemon-dbus-glue.h: notificationdaemon.xml
@@ -33,16 +33,14 @@ Index: trunk/notification-daemon/src/daemon/Makefile.am
+ dbus-binding-tool --mode=glib-server --prefix=notification_daemon \
$(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h
-Index: trunk/notification-daemon/src/daemon/daemon.c
+Index: src/daemon/daemon.c
===================================================================
---- trunk/notification-daemon/src/daemon/daemon.c (revision 2927)
-+++ trunk/notification-daemon/src/daemon/daemon.c (revision 2938)
+--- src/daemon.c (revision 2927)
++++ src/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);
++ &dbus_glib_notification_daemon_object_info);
bus_proxy = dbus_g_proxy_new_for_name(connection,
-