Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package xchat. Version 2.8.8-7.1 fixes important bug #682599. The debdiff is attached. Regards, -- .''`. Sébastien Villemot : :' : Debian Developer `. `' http://www.dynare.org/sebastien `- GPG Key: 4096R/381A7594
diff -Nru xchat-2.8.8/debian/changelog xchat-2.8.8/debian/changelog --- xchat-2.8.8/debian/changelog 2012-09-30 17:19:00.000000000 +0200 +++ xchat-2.8.8/debian/changelog 2012-12-08 15:16:28.000000000 +0100 @@ -1,3 +1,16 @@ +xchat (2.8.8-7.1) unstable; urgency=low + + * Non-maintainer upload. + * Dynamically load libnotify.so.4 (instead of libnotify.so.1, which is + no longer in sid) when sending notifications to the system tray, for + better integration with Gnome 3. (Closes: #682599) + + debian/control: recommend libnotify4 instead of libnotify1 + + debian/patches/66_load_libnotify4.patch: new patch + A better fix would be to link against libnotify, but Bart Martens prefers + to delay this until Jessie (it will be a larger diff). + + -- Sébastien Villemot <sebast...@debian.org> Sat, 08 Dec 2012 15:06:39 +0100 + xchat (2.8.8-7) unstable; urgency=low * The "Just Married" release. diff -Nru xchat-2.8.8/debian/control xchat-2.8.8/debian/control --- xchat-2.8.8/debian/control 2010-10-07 12:30:37.000000000 +0200 +++ xchat-2.8.8/debian/control 2012-12-08 15:00:43.000000000 +0100 @@ -12,7 +12,7 @@ Provides: irc Replaces: xchat-gnome (<< 1:0.11-1), xchat-common (<< 1.6.0-1) Depends: ${shlibs:Depends}, xchat-common (= ${source:Version}), ${misc:Depends} -Recommends: ${shlibs:Recommends}, esound-clients | alsa-utils, libnotify1 | libnotify-bin, xdg-utils +Recommends: ${shlibs:Recommends}, esound-clients | alsa-utils, libnotify4 | libnotify-bin, xdg-utils Conflicts: xchat-gnome (<< 1:0.11-1) Description: IRC client for X similar to AmIRC XChat is a graphical IRC Client with a GTK+ GUI. It has a look and feel diff -Nru xchat-2.8.8/debian/patches/66_load_libnotify4.patch xchat-2.8.8/debian/patches/66_load_libnotify4.patch --- xchat-2.8.8/debian/patches/66_load_libnotify4.patch 1970-01-01 01:00:00.000000000 +0100 +++ xchat-2.8.8/debian/patches/66_load_libnotify4.patch 2012-12-08 15:51:37.000000000 +0100 @@ -0,0 +1,49 @@ +Description: Dynamically load libnotify.so.4 instead of libnotify.so.1 + Dynamically load libnotify.so.4 (instead of libnotify.so.1, which is no longer + in sid) when sending notifications to the system tray, for better integration + with Gnome 3. This patch also adapts for the new libnotify API. +Origin: http://xchat.svn.sourceforge.net/viewvc/xchat/src/fe-gtk/plugin-tray.c?r1=1453&r2=1470 +Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=3109838&group_id=239&atid=100239 +Bug-Debian: http://bugs.debian.org/682599 +Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=693362 +Reviewed-by: Sébastien Villemot <sebast...@debian.org> +Last-Update: 2012-12-08 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/fe-gtk/plugin-tray.c ++++ b/src/fe-gtk/plugin-tray.c +@@ -125,8 +125,9 @@ + /* 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); + +@@ -148,20 +149,14 @@ + + if (!nn_mod) + { +- nn_mod = g_module_open ("libnotify", G_MODULE_BIND_LAZY); ++ nn_mod = g_module_open ("libnotify.so.4", G_MODULE_BIND_LAZY); + if (!nn_mod) +- { +- nn_mod = g_module_open ("libnotify.so.1", G_MODULE_BIND_LAZY); +- if (!nn_mod) +- return FALSE; +- } ++ return FALSE; + + if (!g_module_symbol (nn_mod, "notify_init", (gpointer)&nn_init)) + 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 -Nru xchat-2.8.8/debian/patches/series xchat-2.8.8/debian/patches/series --- xchat-2.8.8/debian/patches/series 2012-09-30 16:28:29.000000000 +0200 +++ xchat-2.8.8/debian/patches/series 2012-12-08 15:05:13.000000000 +0100 @@ -23,3 +23,4 @@ 63_save_keybindings.patch 64_save_pevents.patch 65_save_sound.patch +66_load_libnotify4.patch