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

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

4 files changed, 49 insertions, 20 deletions

diff --git a/x11-misc/notification-daemon/ChangeLog b/x11-misc/notification-daemon/ChangeLog
index c35f50c42b2a..929b53c4442a 100644
--- a/x11-misc/notification-daemon/ChangeLog
+++ b/x11-misc/notification-daemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/notification-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.72 2011/01/24 23:22:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/ChangeLog,v 1.73 2011/02/05 10:48:18 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  notification-daemon-0.5.0.ebuild,
+  +files/notification-daemon-0.5.0-libnotify-0.7.patch:
+  Fix compability with x11-libs/libnotify >= 0.7.
 
 *notification-daemon-0.5.0 (24 Jan 2011)
 
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index a44d85e24859..aa653b095280 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX notification-daemon-0.4.0-report-sound-capability.patch 820 RMD160 f76bb8e8e495077216576b69d38d6714c9757298 SHA1 a55d4296987d4e0da052de65be01976002ed034d SHA256 ead94f505f0eda55964d1004477840ea16a5a586e6d1da29f93f48d071067269
+AUX notification-daemon-0.5.0-libnotify-0.7.patch 1219 RMD160 0ff997cf9bb795c5b4026e465fd990965160c6f7 SHA1 a208aab3bdd3865a680c8c4438c14782b41707a9 SHA256 da873bc586e5ad5ad2972b0a55161d4ed58c0df5aa0dbf6de75549c9cd11220b
 DIST notification-daemon-0.4.0.tar.gz 404178 RMD160 349ea655b4fd0a2b5987b59a5d1241158f20f9d5 SHA1 c978d780588f31f4e5b75487ad1f1b7498e51a07 SHA256 0c0c90ec7f2fc7fc5cbefba2e04df6ae311abc7ace23dd34f21dc063e119d808
 DIST notification-daemon-0.5.0.tar.bz2 330034 RMD160 835bd1704797852d810f1812f4564e38d4def621 SHA1 1dfea9c637717f993099cfca564e700776083854 SHA256 aa1d3546fd1d5c51087317f4921c419927b644c12c39b557c959c9b45deb1475
 EBUILD notification-daemon-0.4.0-r1.ebuild 1208 RMD160 e8bdabe71a1af450f716246a64588628f5f7f1b9 SHA1 619a8418d574bb5da75c8140d4e9b54b5d39523e SHA256 d553bf0f3230cf1e5f83b6bc1abb703e1c95d63e5bc4786ddee5a2ff241430d0
-EBUILD notification-daemon-0.5.0.ebuild 1050 RMD160 c6949cfc7d7ea689d46e81b739107122a0bc7650 SHA1 e7a8a8d5f4ff28877737ba025b5798d7ce79aa59 SHA256 7eebb2a6dcd0f4b083d43a3818ca7a4936418fc39e1c4a35baff510dff99274f
-MISC ChangeLog 10839 RMD160 845178d554f5e07ed6c86f3b7f4419546a500648 SHA1 bb1d109821598b58562f84062fc71d60749d382f SHA256 9dd1e859a498060ff91c0d2f820e94f632631a84b66d67d02a2f92477497d5bf
+EBUILD notification-daemon-0.5.0.ebuild 1110 RMD160 e107eac2653ee038752dc0385deca6281f83f9d5 SHA1 ee3f4a578f1c6332675847e9ab71399c6bc4c1d8 SHA256 f6b735b40323b2c0815d2bfc436796972696cb495e2213b275530ac85708ae60
+MISC ChangeLog 11042 RMD160 6d1fb8f787c6c426f9c207961797a70664ef7080 SHA1 9004933b75087e0af81c807761ba5815d30aaa5c SHA256 c1484e4acdc0ee5e84a100303adaf6394a63e3c2b22a0d867e2117bc2b20fbc6
 MISC metadata.xml 165 RMD160 f8f7dd761c5475651b8e04512e4f3dd043c41984 SHA1 47939c027699c5810cd3f25b4698719e9bd183d2 SHA256 dc2ad50713441100082e32ba283e9dd807b8fc46f69a5b9221fb9b89064deb31
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk0+CbwACgkQ1fmVwcYIWAZxcgCgvzy8WNM9AnmuHAfVGrpv/6pF
-IrkAoJw1jSEZ3XQhQo+063oGh7aN62qw
-=B9U2
------END PGP SIGNATURE-----
diff --git a/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch
new file mode 100644
index 000000000000..fb457d498194
--- /dev/null
+++ b/x11-misc/notification-daemon/files/notification-daemon-0.5.0-libnotify-0.7.patch
@@ -0,0 +1,29 @@
+diff -ur notification-daemon-0.5.0.orig/src/capplet/notification-properties.c notification-daemon-0.5.0/src/capplet/notification-properties.c
+--- notification-daemon-0.5.0.orig/src/capplet/notification-properties.c	2010-05-28 17:41:17.000000000 +0300
++++ notification-daemon-0.5.0/src/capplet/notification-properties.c	2011-02-05 12:47:22.000000000 +0200
+@@ -27,6 +27,10 @@
+ #include <string.h>
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include "stack.h"
+ 
+ #define GCONF_KEY_DAEMON         "/apps/notification-daemon"
+@@ -402,8 +406,12 @@
+ 
+         dialog->preview = notify_notification_new (_("Notification Test"),
+                                                    _("Just a test"),
+-                                                   "gnome-util",
+-                                                   NULL);
++                                                   "gnome-util"
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++                                                   );
++#else
++                                                   , NULL);
++#endif
+ 
+         if (!notify_notification_show (dialog->preview, &error)) {
+                 char *message;
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
index b5d8d27a216d..efeb8cfbd147 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild,v 1.1 2011/01/24 23:22:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild,v 1.2 2011/02/05 10:48:18 ssuominen Exp $
 
-EAPI="3"
-GCONF_DEBUG="no"
+EAPI=3
+GCONF_DEBUG=no
+inherit eutils gnome2
 
-inherit gnome2
-
-DESCRIPTION="Notifications daemon"
+DESCRIPTION="Notification daemon"
 HOMEPAGE="http://www.galago-project.org/"
 
 LICENSE="GPL-2"
@@ -35,7 +34,12 @@ pkg_setup() {
 	G2CONF="${G2CONF} --disable-static"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "la files removal failed"
+	find "${ED}" -name "*.la" -delete
 }