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

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

5 files changed, 40 insertions, 8 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index 61e6c679ec4c..210ad6d0503a 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.46 2011/01/16 18:32:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.47 2011/01/30 21:19:32 ssuominen Exp $
+
+  30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> midori-0.2.9-r1.ebuild,
+  +files/midori-0.2.9-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
 *midori-0.2.9-r1 (16 Jan 2011)
 
diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 115852e0fffd..7763df0d2bd4 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,6 +1,7 @@
+AUX midori-0.2.9-libnotify-0.7.patch 642 RMD160 952a008f284fe80bcbf02eaf667fee5860865093 SHA1 2c5b66ebbe557abf97f1ef0a6a8defe5c7e95712 SHA256 d7bf64dc702979c949fd0e43aee6d542869a136225507f8bbb95d08fefe287e2
 DIST midori-0.2.9.tar.bz2 802627 RMD160 3b8f2f8fa55f10e80a9e769e4085f96b7fa769ab SHA1 3329c3b9cbe1d2fa0cb94e3f864802fae4fc5e9b SHA256 803bf534ab73cf7a50ddd38bbd68976258c36f335a3f1dc1880f53915c7fdf78
-EBUILD midori-0.2.9-r1.ebuild 2313 RMD160 39a505e91970f0b8a9a55613ed9f82e004ae1818 SHA1 7dd933e1bb3e6980075e69eaf4a7d72a4378bea2 SHA256 e01150d3b03fc7cfa89080cdf4f38c3f74f3cad63be98714decda0f3d4702db1
-EBUILD midori-0.2.9.ebuild 2362 RMD160 d5feb65f7afe6dd96ef18bb2a1323e2308ebbdab SHA1 959a2cb7790d836619ae92881b352e122ef7a24e SHA256 f19af53e5ee3cef03f7c39427a3589e5e8fc498fb95abe155aba3f1eb565ab4c
+EBUILD midori-0.2.9-r1.ebuild 2361 RMD160 15b17219d123166112f4fb3bbbc3269a1cecc77d SHA1 38cad7b2840c6dd2479a91afc28bde9b1984eee8 SHA256 b3db67808a80b7000261373b63c684790ed8492c5b5c8b140d645dbb573ce780
+EBUILD midori-0.2.9.ebuild 2367 RMD160 6931420a9205f21e432d5c5a33842173533ab227 SHA1 662f647254d0fdae3e2797cd4cabb6d75904cef0 SHA256 f94995cc4586ce41a6c5e5454e7b0e24302a4730d640dddd0d9800a2067bb053
 EBUILD midori-9999.ebuild 2189 RMD160 c40897a617bbad156b4ccf6a0ae8aaf1540e1526 SHA1 1d383e04f6c9c824e7348ddd4dc248031671a9b6 SHA256 37ace29c694359b8b7c7544246f5ae3cc3298e19f6c53f6976e8aa76eb3fc8d8
-MISC ChangeLog 7548 RMD160 acbc52fa9dcef6eab2f2ba067d47f78635cdd481 SHA1 093c7148ee47509a83e41f42659162afd1adf827 SHA256 66e9fce5affcd9a81d1b2247e1662e0d3d4d650719e80f26f4fa632b7b24c478
+MISC ChangeLog 7717 RMD160 7c152740b08266219a2c40336058333ad2580415 SHA1 fad32e796a3bf5f7c663bac57811402e4bc5b160 SHA256 471d207d5391feb336cb658487c264cc96fa5eb2ae908dbf6d19084c0059c96c
 MISC metadata.xml 421 RMD160 6cfe519ed62f8c3bf6061b0b263e59d7cea5e7b7 SHA1 ab68b240603bd56ea6d93521b50f58f150d9bf73 SHA256 f018e2038f1bcab47a1d1bd0acfb1f8f309481e70dbee9693b7605b9f4cebdfd
diff --git a/www-client/midori/files/midori-0.2.9-libnotify-0.7.patch b/www-client/midori/files/midori-0.2.9-libnotify-0.7.patch
new file mode 100644
index 000000000000..d1e604ab6da6
--- /dev/null
+++ b/www-client/midori/files/midori-0.2.9-libnotify-0.7.patch
@@ -0,0 +1,25 @@
+--- midori/midori-app.c
++++ midori/midori-app.c
+@@ -42,6 +42,9 @@
+ 
+ #if HAVE_LIBNOTIFY
+     #include <libnotify/notify.h>
++    #ifndef NOTIFY_CHECK_VERSION
++    #define NOTIFY_CHECK_VERSION(x,y,z) 0
++    #endif
+ #endif
+ 
+ struct _MidoriApp
+@@ -1203,8 +1206,11 @@
+     if (notify_is_initted ())
+     {
+         NotifyNotification* note;
+-
++        #if NOTIFY_CHECK_VERSION(0, 7, 0)
++        note = notify_notification_new (title, message, "midori");
++        #else
+         note = notify_notification_new (title, message, "midori", NULL);
++        #endif
+         notify_notification_show (note, NULL);
+         g_object_unref (note);
+     }
diff --git a/www-client/midori/midori-0.2.9-r1.ebuild b/www-client/midori/midori-0.2.9-r1.ebuild
index d9678e897572..fb7a18e4b6e4 100644
--- a/www-client/midori/midori-0.2.9-r1.ebuild
+++ b/www-client/midori/midori-0.2.9-r1.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/midori/midori-0.2.9-r1.ebuild,v 1.1 2011/01/16 18:32:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9-r1.ebuild,v 1.2 2011/01/30 21:19:32 ssuominen Exp $
 
 EAPI=2
 inherit eutils multilib python xfconf
@@ -36,6 +36,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	# moving docs to version-specific directory
 	sed -i -e "s:/${PN}/user/midori.html:/user/midori.html:g" midori/midori-browser.c || die
 }
diff --git a/www-client/midori/midori-0.2.9.ebuild b/www-client/midori/midori-0.2.9.ebuild
index e37e53839894..3e303259f184 100644
--- a/www-client/midori/midori-0.2.9.ebuild
+++ b/www-client/midori/midori-0.2.9.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/midori/midori-0.2.9.ebuild,v 1.2 2010/12/18 18:02:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.2.9.ebuild,v 1.3 2011/01/30 21:19:32 ssuominen Exp $
 
 EAPI=2
 inherit pax-utils eutils multilib python xfconf
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
 IUSE="doc gnome +html idn libnotify nls +unique"
 
-RDEPEND="libnotify? ( x11-libs/libnotify )
+RDEPEND="libnotify? ( <x11-libs/libnotify-0.7 )
 	>=net-libs/libsoup-2.25.2
 	>=net-libs/webkit-gtk-1.1.1
 	>=dev-db/sqlite-3.0