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

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

6 files changed, 60 insertions, 10 deletions

diff --git a/www-client/epiphany/ChangeLog b/www-client/epiphany/ChangeLog
index c28e695a0b33..abd56b700718 100644
--- a/www-client/epiphany/ChangeLog
+++ b/www-client/epiphany/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/epiphany
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.261 2011/01/30 19:12:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/ChangeLog,v 1.262 2011/02/05 16:13:05 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> epiphany-2.30.6.ebuild,
+  +files/epiphany-2.30.6-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   30 Jan 2011; Raúl Porcel <armin76@gentoo.org> epiphany-2.30.6.ebuild:
   alpha/ia64/sparc stable wrt #348987
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 4a9e69dedba3..9d263f1bb7bc 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -12,11 +12,12 @@ AUX epiphany-2.30.2-history-embed.patch 1961 RMD160 056be338f139a66dafd13ad4e53f
 AUX epiphany-2.30.2-leave-fullscreen.patch 865 RMD160 b8c8cd507da9b08eb68ac14e44abb26b8824ce7c SHA1 c9f01b1f32f6365f2afe143c8f044361fe38bb43 SHA256 9c02a1cf06c647c56d1c7a908b8a559fa4edc0ffccf717d2252a3a8a8b738ef8
 AUX epiphany-2.30.2-referer-downloads.patch 2230 RMD160 3609a8b336310000294fb443ae3c503c545926ae SHA1 ed9eff8c2b910f8f73154d867b76328152608879 SHA256 e6a85dfed6a5a83d559404d3f8ffcf6319a48a314b037b763e82684f8aad1122
 AUX epiphany-2.30.2-uri-crash.patch 782 RMD160 b5db55676c1c67582c8cfaad4f53cc19871e3f2c SHA1 4bf980a33f8864bd95ca83bd782e8edf661ab004 SHA256 3fa84fbaeaded14dae97be0c03cc1e42e85439259515bd4614b0452f5c52c3f4
+AUX epiphany-2.30.6-libnotify-0.7.patch 1048 RMD160 3607af827a5732561f2e89d9065f3549e14fcdb0 SHA1 2257b0ecd8916657402374265936706e42a1c9c6 SHA256 c1a59a9df78db07c2cf23d47d881d8d4edf6e55af3d655f8ec9870adf9255390
 DIST epiphany-2.26.3.tar.bz2 5655997 RMD160 ef2474c8523a6787227d3dfa5e8fc9d443708a0c SHA1 d1143fd2f287efe3eab648e1feded9f4911e3236 SHA256 bc3e79cb0d62c30ef32c7cf9eef563b1de1af60f31729dae43c3795d214880ad
 DIST epiphany-2.30.2.tar.bz2 5881032 RMD160 c0bb5e1a14ccbe72531cbf3f0f416c5172437a86 SHA1 76b55e002131ffc00f5b1f244d77e2b75e3fcf1b SHA256 cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
 DIST epiphany-2.30.6.tar.bz2 5927938 RMD160 60f2c7d699dd8728dc79cce012475972943c4007 SHA1 a4bde975f9b2b97d6aad14b4b8a715b40d19a155 SHA256 278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc
-EBUILD epiphany-2.26.3-r4.ebuild 3344 RMD160 36626fac6aee7092e34981c0acc4c0de0ef12b19 SHA1 01ac31f800d5ab13542beada8e9666b8dd3bf95c SHA256 01da9dc81e160dd7b83bd03dc392f6dc9c1bcd4ff7e2a8920479d98f955d267a
-EBUILD epiphany-2.30.2-r1.ebuild 2410 RMD160 206ec7409733bd1b9f9751f4988083129dfe2b44 SHA1 46a201a99525df33ec0cc42cce3ed32af6bd61c7 SHA256 fa914e918376d405f0e8d5398f9761842507d11b8c98974b2989e315968172ea
-EBUILD epiphany-2.30.6.ebuild 1882 RMD160 8a9170aa273993c78d4fa67a8c527384cb50910d SHA1 4df29b47a92124455b7f89469b22d644c1961856 SHA256 24b544939a01da5330731c23c3f7b9244167a5c0d60494332ff99c378651a556
-MISC ChangeLog 50906 RMD160 163dc67199ebd361420b861dd5ec71d557e827c9 SHA1 b6c8b2b8ad9dd2c76dfaeea8b530dc78c157db1d SHA256 a39d2ab52ae3902530f00ea1f9b3ed77bd7b2089ab7a271903f1942376d950aa
+EBUILD epiphany-2.26.3-r4.ebuild 3375 RMD160 fd0a7fef17847cba104c8f159f8252af94c5e96f SHA1 e98c98f7776b33e03d0dd89d9a9cfd4de6138812 SHA256 9e3f3fda0179ee5f54b3d5eb389c87e13a7942f5b873458e0c0afba66982dde0
+EBUILD epiphany-2.30.2-r1.ebuild 2437 RMD160 06791f67471a8d063d7c2d4ba0efbcff9a1313ed SHA1 1aa96b91dfb8bf0250ddc5c45bff1abab1fd4e1a SHA256 23c7bd2b9992d43a61e2fe4b09d9d2bd663df7bd841bafcd49d3d9b519d35643
+EBUILD epiphany-2.30.6.ebuild 1970 RMD160 9690b06e338cc4698c8ee901a76023b4a197276a SHA1 29959887a3598d79e771f63f2f3d30e7bca3d315 SHA256 cf81381e5e67c32b9ccaefe51e6b1efe70de6509571eb9dd95d72575e263ed0a
+MISC ChangeLog 51080 RMD160 4894066356774aa5db2211f2a6cef5de8111d474 SHA1 8a9f9300dcefc934cc0fff33e1a0743418d2fd79 SHA256 a7aa414f3f8fac872b0fcf475084b562e57bc2340e8323b9748596da32ba6acc
 MISC metadata.xml 276 RMD160 459f04368f1f1341a41c24a487a475b22e878228 SHA1 c296c95eafc63e398d5d203f4eaa26a3826b2b6c SHA256 9e2cf9fb8bee83947d19caa6b4610e82b916daa9f744661f19e4f8138e80490a
diff --git a/www-client/epiphany/epiphany-2.26.3-r4.ebuild b/www-client/epiphany/epiphany-2.26.3-r4.ebuild
index 4b7a166bd7cb..40bcb0792165 100644
--- a/www-client/epiphany/epiphany-2.26.3-r4.ebuild
+++ b/www-client/epiphany/epiphany-2.26.3-r4.ebuild
@@ -1,6 +1,6 @@
-# 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/www-client/epiphany/epiphany-2.26.3-r4.ebuild,v 1.8 2010/07/20 15:46:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.26.3-r4.ebuild,v 1.9 2011/02/05 16:13:05 ssuominen Exp $
 
 EAPI="2"
 
@@ -24,6 +24,7 @@ RDEPEND=">=dev-libs/glib-2.18.0
 	>=gnome-base/gnome-desktop-2.9.91
 	>=x11-libs/startup-notification-0.5
 	>=x11-libs/libnotify-0.4
+	<x11-libs/libnotify-0.7
 	>=media-libs/libcanberra-0.3[gtk]
 	>=dev-libs/dbus-glib-0.71
 	>=gnome-base/gconf-2
diff --git a/www-client/epiphany/epiphany-2.30.2-r1.ebuild b/www-client/epiphany/epiphany-2.30.2-r1.ebuild
index 43463aa7853a..acf30a04ed65 100644
--- a/www-client/epiphany/epiphany-2.30.2-r1.ebuild
+++ b/www-client/epiphany/epiphany-2.30.2-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/www-client/epiphany/epiphany-2.30.2-r1.ebuild,v 1.8 2010/10/17 15:38:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.2-r1.ebuild,v 1.9 2011/02/05 16:13:05 ssuominen Exp $
 
 EAPI="2"
 
@@ -23,6 +23,7 @@ RDEPEND=">=dev-libs/glib-2.19.7
 	>=dev-libs/libxslt-1.1.7
 	>=x11-libs/startup-notification-0.5
 	>=x11-libs/libnotify-0.4
+	<x11-libs/libnotify-0.7
 	>=dev-libs/dbus-glib-0.71
 	>=gnome-base/gconf-2
 	>=app-text/iso-codes-0.35
diff --git a/www-client/epiphany/epiphany-2.30.6.ebuild b/www-client/epiphany/epiphany-2.30.6.ebuild
index 96644c7db778..209d72082176 100644
--- a/www-client/epiphany/epiphany-2.30.6.ebuild
+++ b/www-client/epiphany/epiphany-2.30.6.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/www-client/epiphany/epiphany-2.30.6.ebuild,v 1.6 2011/01/30 19:12:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-2.30.6.ebuild,v 1.7 2011/02/05 16:13:05 ssuominen Exp $
 
 EAPI="2"
 
@@ -62,6 +62,11 @@ pkg_setup() {
 		$(use_enable test tests)"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	gnome2_src_prepare
+}
+
 src_compile() {
 	# Fix sandbox error with USE="introspection" and "doc"
 	# https://bugs.webkit.org/show_bug.cgi?id=35471
diff --git a/www-client/epiphany/files/epiphany-2.30.6-libnotify-0.7.patch b/www-client/epiphany/files/epiphany-2.30.6-libnotify-0.7.patch
new file mode 100644
index 000000000000..a0c5f8ee1e7c
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-2.30.6-libnotify-0.7.patch
@@ -0,0 +1,38 @@
+--- embed/downloader-view.c
++++ embed/downloader-view.c
+@@ -36,6 +36,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ enum
+@@ -337,7 +340,12 @@
+ 	g_object_ref (dv);
+ 
+ 	notification = notify_notification_new (title, msg,
+-						GTK_STOCK_INFO, NULL);
++						GTK_STOCK_INFO
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++						);
++#else
++						, NULL);
++#endif
+ 
+ 	g_signal_connect_after (notification, "closed",
+ 				G_CALLBACK (notification_closed_cb), dv);
+@@ -346,7 +354,11 @@
+ 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
+ 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	/* notify_notification_attach_to_status_icon was removed */
++#else
+ 	notify_notification_attach_to_status_icon (notification, status_icon);
++#endif
+ 
+ 	/* There are some visual glitches when the notification is shown and
+ 	 * the GtkStatusIcon is still not visible. To avoid that, we delay the