[xchat] Add patch to work with libnotify-0.7

[Owen Taylor]

commit 08a899eb7a51d39915473e75da9655f08d768e9c
Author: Owen W. Taylor <otaylor at fishsoup.net>
Date:   Mon Nov 15 18:31:05 2010 -0500

    Add patch to work with libnotify-0.7

 xchat-2.8.8-libnotify07.patch |   24 ++++++++++++++++++++++++
 xchat.spec                    |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/xchat-2.8.8-libnotify07.patch b/xchat-2.8.8-libnotify07.patch
new file mode 100644
index 0000000..2a6dce9
--- /dev/null
+++ b/xchat-2.8.8-libnotify07.patch
@@ -0,0 +1,24 @@
+diff -up xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07 xchat-2.8.8/src/fe-gtk/plugin-tray.c
+--- xchat-2.8.8/src/fe-gtk/plugin-tray.c.libnotify07	2010-11-15 17:32:15.708325783 -0500
++++ xchat-2.8.8/src/fe-gtk/plugin-tray.c	2010-11-15 18:05:17.322141789 -0500
+@@ -125,8 +125,9 @@ static void *nn_mod = NULL;
+ /* prototypes */
+ static gboolean (*nn_init) (char *);
+ static void (*nn_uninit) (void);
+-static void *(*nn_new_with_status_icon) (const gchar *summary, const gchar *message, const gchar *icon, GtkStatusIcon *status_icon);
+-static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, GtkWidget *attach);
++/* recent versions of libnotify don't take the fourth GtkWidget argument, but passing an
++ * extra NULL argument will be fine */
++static void *(*nn_new) (const gchar *summary, const gchar *message, const gchar *icon, gpointer dummy);
+ static gboolean (*nn_show) (void *noti, GError **error);
+ static void (*nn_set_timeout) (void *noti, gint timeout);
+ 
+@@ -160,8 +161,6 @@ libnotify_notify_new (const char *title,
+ 			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_uninit", (gpointer)&nn_uninit))
+ 			goto bad;
+-		if (!g_module_symbol (nn_mod, "notify_notification_new_with_status_icon", (gpointer)&nn_new_with_status_icon))
+-			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_notification_new", (gpointer)&nn_new))
+ 			goto bad;
+ 		if (!g_module_symbol (nn_mod, "notify_notification_show", (gpointer)&nn_show))
diff --git a/xchat.spec b/xchat.spec
index 3cf460b..016901b 100644
--- a/xchat.spec
+++ b/xchat.spec
@@ -4,7 +4,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.8
-Release:   4%{?dist}
+Release:   5%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -28,6 +28,9 @@ Patch41: xchat-2.8.6-default-utf8.patch
 Patch50: xchat-2.8.6-change-page-activity.patch
 # add port numbers for Freenode (Debarshi Ray)
 Patch51: xchat-2.8.6-freenode-ports.patch
+# work with libnotify 0.7
+# https://sourceforge.net/tracker/?func=detail&aid=3109838&group_id=239&atid=100239
+Patch52: xchat-2.8.8-libnotify07.patch
 
 BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
@@ -75,6 +78,7 @@ This package contains the X-Chat plugin providing the Tcl scripting interface.
 %patch41 -p1 -b .default-utf8
 %patch50 -p1 -b .active-channel-switch
 %patch51 -p1 -b .freenode-ports
+%patch52 -p1 -b .libnotify07
 
 sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
 
@@ -167,6 +171,9 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
+* Mon Nov 15 2010 Owen Taylor <otaylor at redhat.com> - 1:2.8.8-5
+- Add patch to work with libnotify-0.7
+
 * Tue Jul 27 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:2.8.8-4
 - Rebuild against python 2.7