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

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

4 files changed, 44 insertions, 17 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index bd07ac004408..746060c9ae5e 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/zenity
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.195 2010/11/29 18:40:56 pacho Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.196 2011/02/05 13:49:01 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> zenity-2.32.1.ebuild,
+  +files/zenity-2.32.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
 *zenity-2.32.1 (29 Nov 2010)
 
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index 2183e2729493..f98fa439a572 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX zenity-2.32.1-libnotify-0.7.patch 746 RMD160 cd2eed097c232a5c4c84da574a8a2aac2785ca9d SHA1 9212bdff8f0684128dcad89765a5d7ba179402c5 SHA256 98bf6ca77f0fef14a5f0b8788595710b7eb88db121103a72c4a38bb912038431
 DIST zenity-2.30.0.tar.bz2 3095111 RMD160 aa5e482a669fc317e5e0a561f855accdc2c6a173 SHA1 a55b0c7e251cdf835dd03b545aa7c96f7ef02384 SHA256 d42a9be6f77eb018fb8c5967094db86604271f342dd15b6e6101338d82f923ff
 DIST zenity-2.32.1.tar.bz2 3128666 RMD160 30b19230d9e1ed478cfd17d2a6942863bcda6763 SHA1 5e75e9200768ecf9eb7f1e6edac7a395ddb47947 SHA256 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac
 EBUILD zenity-2.30.0.ebuild 1297 RMD160 6a0197e14600accfc4e6207b3323e3d613838263 SHA1 b08073f11a097d6f482e08e9b5134838f22b2676 SHA256 e229ebe9ef464489d91c1d9042fd129768cf372935fadd95e5be003b3280306c
-EBUILD zenity-2.32.1.ebuild 1186 RMD160 9d59ab3e8002f92dd662ab766764155744f456e6 SHA1 e8e0370030f288da6c62ac074aff0b17b729a673 SHA256 9dc3f83733110ba24a4db49b2872b06bb3f05240cf3394c2753fa6953002d839
-MISC ChangeLog 22423 RMD160 bc8d2a26adcdf37bf58bffcd82c70c988ab12fce SHA1 83e3c5d842edb243cbbbace952726e108ba84fe8 SHA256 e695f4a25f6b10e7967cd647aa328bca067f8f7b853ac56dcd29c3f5ad06b0c5
+EBUILD zenity-2.32.1.ebuild 1283 RMD160 ae3baaccccd59fdb58e02af5a5a090551d895f09 SHA1 bfbef3e30ebce5b596940c2c5919c2b7a648b8cb SHA256 14502b919bbcd71d30ac676f721dc24d518aa3c13ee37d63abb33f20af514126
+MISC ChangeLog 22595 RMD160 4ed87227a10cd98ba23e6386e92f95839bd818af SHA1 bbf694d9d23ae4c021a4d6d36763f2353339ecb6 SHA256 a576ae69238c9b7fea68d312ee00c270534c5f4710bb11e6712a369f29720e58
 MISC metadata.xml 302 RMD160 bde33bbd14d8085f9c4a63abf344904951e87f2f SHA1 421c8f95533baed57a7b116cce8b6b7a8121a4ff SHA256 b52e3b6c6080efd1fedb03fe6136d89d74f1e58896ae8d6f075622bf6806e200
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzz874ACgkQCaWpQKGI+9R+UACeNekc8mlMltVQwySQSXhwCuyK
-7t4An2am+bbIJJHIyqTW8H6t34JaLY+w
-=qzju
------END PGP SIGNATURE-----
diff --git a/gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch b/gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..4d5bf7447b58
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-2.32.1-libnotify-0.7.patch
@@ -0,0 +1,27 @@
+--- src/notification.c
++++ src/notification.c
+@@ -30,6 +30,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #include "zenity.h"
+@@ -184,10 +187,14 @@
+             icon = freeme = g_filename_to_uri (icon_file, NULL, NULL);
+           }
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++          /* notify_notification_new_with_status_icon was removed */
++#else
+           notif = notify_notification_new_with_status_icon (
+                               message[0] /* title */,
+                               message[1] /* summary */,
+                               icon, status_icon);
++#endif
+ 
+           g_strfreev (message);
+           g_free (freeme);
diff --git a/gnome-extra/zenity/zenity-2.32.1.ebuild b/gnome-extra/zenity/zenity-2.32.1.ebuild
index e18efa0f3ff3..ba7dbab9fed4 100644
--- a/gnome-extra/zenity/zenity-2.32.1.ebuild
+++ b/gnome-extra/zenity/zenity-2.32.1.ebuild
@@ -1,11 +1,11 @@
-# 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/gnome-extra/zenity/zenity-2.32.1.ebuild,v 1.1 2010/11/29 18:40:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-2.32.1.ebuild,v 1.2 2011/02/05 13:49:01 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
 HOMEPAGE="http://live.gnome.org/Zenity"
@@ -37,6 +37,11 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install