Fix building with x11-libs/libnotify >= 0.7 wrt #354117 by Diego Elio Pettenò.

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

4 files changed, 66 insertions, 4 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index e340d7d318ee..d83dcd65137e 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.333 2011/01/18 14:19:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.334 2011/02/08 19:04:13 ssuominen Exp $
+
+  08 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-applets-2.32.1.1.ebuild,
+  +files/gnome-applets-2.32.1.1-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7 wrt #354117 by Diego Elio
+  Pettenò.
 
   18 Jan 2011; <nirbheek@gentoo.org> gnome-applets-2.32.1.1.ebuild:
   Fix accidental SLOT change in gnome-applets-2.32
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index c6e945f05082..87c431cd6110 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,6 +1,7 @@
+AUX gnome-applets-2.32.1.1-libnotify-0.7.patch 1431 RMD160 4c8edc49404fa45ce8e0c079e4f900a3ed7b1c45 SHA1 137d8b6e9c4f279fea6f81bd6d91928d10e1f8cd SHA256 1e0b1f9545029bda0f4aadc28ef6eba34a5dbd1c3d1e5cec45627be7b0c32eda
 DIST gnome-applets-2.30.0.tar.bz2 9919459 RMD160 ad3c2bb2062de7599a8a34403bf517be21f9abae SHA1 b6359ebe1991709c66709b108609fcb8cfae4b57 SHA256 41489fbb1f8352a306cde6676dfaf1e497bfbca960454f7251c4fd92920bba5d
 DIST gnome-applets-2.32.1.1.tar.bz2 10083534 RMD160 50c8e169b02aa002917f4c6ea0f575522e3ae984 SHA1 6edc3aea2bd2198b2bdbdb1fa63b481f724c8fe2 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327
 EBUILD gnome-applets-2.30.0-r1.ebuild 3644 RMD160 44f7811921220da5b13fa891a01f74230a593eac SHA1 398af037fc71b6806e20cdcbdb96ae0459bc58a6 SHA256 952b5099b85e048debf5e355a890b0969e09be3daa80b68ff8290a091ea4591a
-EBUILD gnome-applets-2.32.1.1.ebuild 3659 RMD160 f0cace3b786aa05ebd469e84e838bbc25d43e434 SHA1 008aec50676e6f61523d411b2be46d29c1186564 SHA256 b213b1320cedfd9293c3ea00ff2846c34ccf1069a2edbfefaf6af81e6c7de5f7
-MISC ChangeLog 48462 RMD160 5e1ad9b46f7e1825e872c3662527a7b0e9745264 SHA1 507b1bd13d6023741105fcce569545cda76c9a0c SHA256 79d10e93195991daebf1fa44e10e77bb6055b5a12a26e28d758806f1b35a5f03
+EBUILD gnome-applets-2.32.1.1.ebuild 3708 RMD160 476eaab02178417ab10fdc035896ff553d96e581 SHA1 cff550549123d748510ff7100f641c90952486dc SHA256 a43e40044d900207c532d547256d094335ecba357e129921a53c2915a4a40eff
+MISC ChangeLog 48688 RMD160 4b55ae7a58400c899cb39f7bd084ea5c1fc7a002 SHA1 c41aeec5445861227073937a93f32a978d1b9888 SHA256 92ba184938d319280963c1afcbb01961b8fae08f65edbd376ee203c91d10c1db
 MISC metadata.xml 313 RMD160 378fcac5ad9324a5f93413ddb9b73ff34ec7dbf3 SHA1 b1f8d11380da2ff0dd9927ac85345026facc1c96 SHA256 d54765f0855da98c60cd16672b306e2f0f8a17c4ee0a765e6d6653c47f75ee60
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..f2b889ec0324
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch
@@ -0,0 +1,53 @@
+--- battstat/battstat_applet.c
++++ battstat/battstat_applet.c
+@@ -42,6 +42,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #include "battstat.h"
+@@ -435,7 +438,12 @@
+ 			GTK_ICON_LOOKUP_USE_BUILTIN,
+ 			NULL);
+ 	
+-	NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet);
++	NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	);
++#else
++	, applet);
++#endif
+ 
+ 	/* XXX: it would be nice to pass this as a named icon */
+ 	notify_notification_set_icon_from_pixbuf (n, icon);
+--- gweather/gweather-applet.c
++++ gweather/gweather-applet.c
+@@ -30,6 +30,9 @@
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
+ #include <libnotify/notification.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
+@@ -471,8 +474,12 @@
+ 			 if (icon == NULL)
+ 				 icon = "stock-unknown";
+ 	           	 
+-			 n = notify_notification_new (message, detail, icon,
+-					 gw_applet->container);
++			 n = notify_notification_new (message, detail, icon
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++			 );
++#else
++			 , gw_applet->container);
++#endif
+ 	
+ 		   	 notify_notification_show (n, &error);
+ 			 if (error)
diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
index e9177f1c536b..ca26b1d35c1b 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.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/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.5 2011/01/18 14:19:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.6 2011/02/08 19:04:13 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -83,6 +83,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	gnome2_src_prepare
 
 	# disable pyc compiling