Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/audacious-plugins/files: 2.4.3-libnotify-0.7.patch
Date: Sun, 06 Feb 2011 17:21:30
Message-Id: 20110206172056.3302820054@flycatcher.gentoo.org
1 ssuominen 11/02/06 17:20:56
2
3 Added: 2.4.3-libnotify-0.7.patch
4 Log:
5 Fix building with x11-libs/libnotify >= 0.7 wrt #353859.
6
7 (Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 media-plugins/audacious-plugins/files/2.4.3-libnotify-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/audacious-plugins/files/2.4.3-libnotify-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/audacious-plugins/files/2.4.3-libnotify-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: 2.4.3-libnotify-0.7.patch
16 ===================================================================
17 --- src/notify/libnotify-aosd_osd.c
18 +++ src/notify/libnotify-aosd_osd.c
19 @@ -22,6 +22,10 @@
20 #include <libnotify/notify.h>
21 #include "libnotify-aosd_common.h"
22
23 +#ifndef NOTIFY_CHECK_VERSION
24 +#define NOTIFY_CHECK_VERSION(x,y,z) 0
25 +#endif
26 +
27 NotifyNotification *notification = NULL;
28
29 gboolean osd_init() {
30 @@ -55,7 +59,12 @@
31 GError *error = NULL;
32
33 if(notification == NULL) {
34 - notification = notify_notification_new(title, message, pb == NULL ? icon : NULL, NULL);
35 + notification = notify_notification_new(title, message, pb == NULL ? icon : NULL
36 +#if NOTIFY_CHECK_VERSION (0, 7, 0)
37 + );
38 +#else
39 + , NULL);
40 +#endif
41 g_signal_connect(notification, "closed", G_CALLBACK(osd_closed_handler), NULL);
42 AUDDBG("new osd created! (notification=%p)\n", notification);
43 } else {