diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-06 12:25:42 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-06 12:25:42 +0000 |
| commit | 31a469663503a2e6fb5ae1481f90a37104bca715 (patch) | |
| tree | 140f1a2f6f0d824f3a5722aa6034cc72af52b1e6 /app-admin | |
| parent | Drop to ~mips (diff) | |
| download | gentoo-2-31a469663503a2e6fb5ae1481f90a37104bca715.tar.gz gentoo-2-31a469663503a2e6fb5ae1481f90a37104bca715.tar.bz2 gentoo-2-31a469663503a2e6fb5ae1481f90a37104bca715.zip | |
Fix building with x11-libs/libnotify >= 0.7.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/collectd/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/collectd/collectd-4.10.2-r2.ebuild | 8 | ||||
| -rw-r--r-- | app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch | 27 |
3 files changed, 37 insertions, 4 deletions
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index 17511b146ca9..a6fb95c6dc99 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/collectd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.13 2011/01/28 21:34:21 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/ChangeLog,v 1.14 2011/02/06 12:25:42 ssuominen Exp $ + + 06 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> + collectd-4.10.2-r2.ebuild, +files/collectd-4.10.2-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7. 28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org> collectd-4.10.2-r2.ebuild: diff --git a/app-admin/collectd/collectd-4.10.2-r2.ebuild b/app-admin/collectd/collectd-4.10.2-r2.ebuild index 7759e0df5fce..0976f45ecc1c 100644 --- a/app-admin/collectd/collectd-4.10.2-r2.ebuild +++ b/app-admin/collectd/collectd-4.10.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.2-r2.ebuild,v 1.2 2011/01/28 21:34:21 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.2-r2.ebuild,v 1.3 2011/02/06 12:25:42 ssuominen Exp $ EAPI="2" @@ -99,8 +99,10 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} collectd_plugins_syslog? ( virtual/logger )" -PATCHES=( "${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch - "${FILESDIR}/${P}"-libocci.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-4.10.1-{libperl,libiptc,noowniptc}.patch + "${FILESDIR}"/${PN}-4.10.2-{libocci,libnotify-0.7}.patch + ) # @FUNCTION: collectd_plugin_kernel_linux # @DESCRIPTION: diff --git a/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch b/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch new file mode 100644 index 000000000000..92b01b1ff95d --- /dev/null +++ b/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch @@ -0,0 +1,27 @@ +--- 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; |