Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in xfce-extra/xfce4-sensors-plugin/files: xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
Date: Sat, 29 Jan 2011 15:15:04
Message-Id: 20110129151435.9F22F20057@flycatcher.gentoo.org
1 ssuominen 11/01/29 15:14:35
2
3 Added: xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
4 Log:
5 Fix building with x11-libs/libnotify >= 0.7.
6
7 (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch?rev=1.1&content-type=text/plain
14
15 Index: xfce4-sensors-plugin-1.0.0-libnotify-0.7.patch
16 ===================================================================
17 http://bugzilla.xfce.org/show_bug.cgi?id=6785
18
19 --- lib/hddtemp.c
20 +++ lib/hddtemp.c
21 @@ -102,7 +102,12 @@
22 if (!notify_is_initted())
23 notify_init(PACKAGE); /* NOTIFY_APPNAME */
24
25 - nn = notify_notification_new (summary, body, icon, NULL);
26 + nn = notify_notification_new (summary, body, icon
27 + #ifdef HAVE_LIBNOTIFY_07
28 + );
29 + #else
30 + , NULL);
31 + #endif
32 /* FIXME: Use channels or propagate private object or use static global variable */
33 //notify_notification_add_action (nn,
34 //"confirmed",
35 --- lib/sensors-interface.c
36 +++ lib/sensors-interface.c
37 @@ -105,7 +105,12 @@
38 if (!notify_is_initted())
39 notify_init(PACKAGE); /* NOTIFY_APPNAME */
40
41 - nn = notify_notification_new(summary, body, icon, NULL);
42 + nn = notify_notification_new(summary, body, icon
43 + #ifdef HAVE_LIBNOTIFY_07
44 + );
45 + #else
46 + , NULL);
47 + #endif
48 notify_notification_show(nn, &error);
49 #else
50 DBG("%s\n%s", summary, body);