[gentoo-commits] gentoo-x86 commit in app-admin/collectd/files: collectd-4.10.2-libnotify-0.7.patch

[gentoo-commits] gentoo-x86 commit in app-admin/collectd/files: collectd-4.10.2-libnotify-0.7.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/02/06 12:25:42

  Added:                collectd-4.10.2-libnotify-0.7.patch
  Log:
  Fix building with x11-libs/libnotify >= 0.7.
  
  (Portage version: 2.2.0_alpha20/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch?rev=1.1&content-type=text/plain

Index: collectd-4.10.2-libnotify-0.7.patch
===================================================================
--- src/notify_desktop.c
+++ src/notify_desktop.c
@@ -31,6 +31,10 @@
 #include <glib.h>
 #include <libnotify/notify.h>
 
+#ifndef NOTIFY_CHECK_VERSION
+#define NOTIFY_CHECK_VERSION(x,y,z) 0
+#endif
+
 #define log_info(...) INFO ("notify_desktop: " __VA_ARGS__)
 #define log_warn(...) WARNING ("notify_desktop: " __VA_ARGS__)
 #define log_err(...) ERROR ("notify_desktop: " __VA_ARGS__)
@@ -95,7 +99,12 @@
 				: (NOTIF_WARNING == n->severity) ? "WARNING"
 				: (NOTIF_OKAY == n->severity) ? "OKAY" : "UNKNOWN");
 
-	notification = notify_notification_new (summary, n->message, NULL, NULL);
+	notification = notify_notification_new (summary, n->message, NULL
+#if NOTIFY_CHECK_VERSION (0, 7, 0)
+	);
+#else
+	, NULL);
+#endif
 	if (NULL == notification) {
 		log_err ("Failed to create a new notification.");
 		return -1;