Fix building with x11-libs/libnotify >= 0.7.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 44 insertions, 6 deletions

diff --git a/net-misc/dhcpcd-ui/ChangeLog b/net-misc/dhcpcd-ui/ChangeLog
index e13c95e89bf0..a82b165ce783 100644
--- a/net-misc/dhcpcd-ui/ChangeLog
+++ b/net-misc/dhcpcd-ui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dhcpcd-ui
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd-ui/ChangeLog,v 1.3 2010/12/12 02:27:39 darkside Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd-ui/ChangeLog,v 1.4 2011/02/05 16:34:01 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> dhcpcd-ui-0.5.1.ebuild,
+  +files/dhcpcd-ui-0.5.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
 *dhcpcd-ui-0.5.1 (12 Dec 2010)
 
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index 017aaddea5fb..23b11525b4aa 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,4 +1,5 @@
+AUX dhcpcd-ui-0.5.1-libnotify-0.7.patch 790 RMD160 f7d663d934c0c5fd088b9abc3284fa9ce40d81f3 SHA1 4b9625893b2e32c1762ddd047d5479c079693227 SHA256 2d5b53a716d5dba7ed5df3b05830ca0a6f459ca9d98f0b14ca1edc599acb7372
 DIST dhcpcd-ui-0.5.1.tar.bz2 142969 RMD160 104ef3c1a2efd72555ee743164de4be9becf04a4 SHA1 da78f549651e1d85a8f452fb41f872f95ae8d834 SHA256 1d9990deb0dac8e51b48267fe9eb17ae4869fda04ff5c4d9174fa8155fd757c4
-EBUILD dhcpcd-ui-0.5.1.ebuild 601 RMD160 45113de6468eccd89105a2aa6f854c53de9fd6ae SHA1 840a5e406f0bebfd722ee2f9ec25a48402904256 SHA256 4200935599ccff3361e7decbd876adb729a8e127e19f01b5ef7c98a567af6505
-MISC ChangeLog 609 RMD160 c5857391732c351633d0681777cb945af77ab242 SHA1 b7222343bcf13c2906bf8b4dba7dce25d4cf18d7 SHA256 b86837eb169b76ca14dd675de624dcaf798e05f5fb2fc0895d6ea6c5a17b9fe7
+EBUILD dhcpcd-ui-0.5.1.ebuild 683 RMD160 96e327d542a3a7865c54cadb6d15ee1f84e209d7 SHA1 1719e59e3ccab14e2a3eb023e55676237b56b421 SHA256 4530f3928d9743d44294231a82894aa3a1bdaa357f859b3a363d77799d741d05
+MISC ChangeLog 782 RMD160 2eba0ef3f37e68038f0481cb1584ec6c6fe5b2f6 SHA1 9478d8b107bb5283a03a0d6650b5c93b108c76d6 SHA256 9e9d41899290c75a75b75e640e64a107a20cb956306ff25156a9f6aee77ec746
 MISC metadata.xml 224 RMD160 ef4cc3054936a3572ec992bcceee2519eddcba46 SHA1 3b0afde57f521aa4f834fed82806e79be3530c3e SHA256 fc3ff3b3ec6fac6a93feff4a2692f42f8abd9e7b5741d81a272a820d40092b73
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.5.1.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.5.1.ebuild
index 0a3726cd10a3..c11bc802e617 100644
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.5.1.ebuild
+++ b/net-misc/dhcpcd-ui/dhcpcd-ui-0.5.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd-ui/dhcpcd-ui-0.5.1.ebuild,v 1.1 2010/12/12 02:27:39 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpcd-ui/dhcpcd-ui-0.5.1.ebuild,v 1.2 2011/02/05 16:34:01 ssuominen Exp $
 
 EAPI=3
+inherit eutils
 
 DESCRIPTION="Desktop notification and configuration for dhcpcd"
 HOMEPAGE="http://roy.marples.name/projects/dhcpcd-ui/"
@@ -17,6 +18,10 @@ DEPEND="net-libs/dhcpcd-dbus
 	>=x11-libs/libnotify-0.4.4
 	x11-libs/gtk+:2"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die
 }
diff --git a/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.5.1-libnotify-0.7.patch b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.5.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..e7d1fc4ffa52
--- /dev/null
+++ b/net-misc/dhcpcd-ui/files/dhcpcd-ui-0.5.1-libnotify-0.7.patch
@@ -0,0 +1,28 @@
+--- src/dhcpcd-gtk/main.c
++++ src/dhcpcd-gtk/main.c
+@@ -31,6 +31,9 @@
+ 
+ #ifdef NOTIFY
+ #  include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ static NotifyNotification *nn;
+ #endif
+ 
+@@ -194,11 +197,15 @@
+ 	g_strfreev(msgs);
+ 	if (nn != NULL)
+ 		notify_notification_close(nn, NULL);
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	nn = notify_notification_new(title, msg, icon);
++#else
+ 	if (gtk_status_icon_get_visible(status_icon))
+ 		nn = notify_notification_new_with_status_icon(title,
+ 		    msg, icon, status_icon);
+ 	else
+ 		nn = notify_notification_new(title, msg, icon, NULL);
++#endif
+ 	notify_notification_set_timeout(nn, 5000);
+ 	g_signal_connect(nn, "closed", G_CALLBACK(notify_closed), NULL);
+ 	notify_notification_show(nn, NULL);