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

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

4 files changed, 68 insertions, 17 deletions

diff --git a/net-im/twittare/ChangeLog b/net-im/twittare/ChangeLog
index bf11a6f409c7..f3a84a70c976 100644
--- a/net-im/twittare/ChangeLog
+++ b/net-im/twittare/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/twittare
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twittare/ChangeLog,v 1.4 2010/06/29 08:42:20 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/twittare/ChangeLog,v 1.5 2011/02/05 13:20:07 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> twittare-0.7.42.ebuild,
+  +files/twittare-0.7.42-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   29 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
   twittare-0.7.42.ebuild:
diff --git a/net-im/twittare/Manifest b/net-im/twittare/Manifest
index f7368aebcdab..0e2489613b12 100644
--- a/net-im/twittare/Manifest
+++ b/net-im/twittare/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX twittare-0.7.42-libnotify-0.7.patch 1449 RMD160 c311d8d11bd3ad761476baadd72508d645f41bf6 SHA1 f25cd90ca05b037e1c75c0a440e1effb73ff139b SHA256 1389fdb869f97266391962252d59e2689f3e3667219856fffb7e9d1f7afdf913
 AUX twittare-gcc-4.4-glibc-2.10.patch 409 RMD160 3b81ca2cf6f1374c3516971062b7941ec900cc6a SHA1 5d5edf661d8c69a38038fb326d284f56cd7df39c SHA256 dfdc52e8a4b2d4470a79ad529b814d5cfcd0c5f0e991f70f51d206fbd55bc648
 DIST twittare-0.7.42.tar.gz 207842 RMD160 ce6b66fb45ce84db573e8c8bbbe39dd80ddac1fe SHA1 e0e159a6a1ff169395defa453b256d955624def9 SHA256 1e603328250160bb0bea015a6cfa6dd9c1eb44eaaa2618282d4f5088f4b38809
-EBUILD twittare-0.7.42.ebuild 1485 RMD160 6168e96125be924015236ec3dbf26e0d8b6b1697 SHA1 757447e4f25d4761b92103532ba27df144ebcb24 SHA256 6026df51cd57634697c1d0f4c17eaefac160ca2dd97bf9f47b28e9d4f9e9f03e
-MISC ChangeLog 895 RMD160 c522a8302336a5d7fd930b12903ccd2e604b4a83 SHA1 8889b2ee6bfad3dc1e36ee9a0d516888cb5255e1 SHA256 8343620a660dd939ef76fe4bf06a655232a52bd15ca760655b3ea7980cf05c03
+EBUILD twittare-0.7.42.ebuild 1544 RMD160 5942a7172ebf73343695577029966b0f0940764a SHA1 a3c37b9f46dd19358030d288db2d517e3e0b1918 SHA256 09252e68f436c0c7fe6af169643bfb9a36b392cc416ae9c4205ddb87090fd920
+MISC ChangeLog 1071 RMD160 ebcd646a42acb7dd86da57ea0d6a7a1604e0bc45 SHA1 a359c39f5354b528a14c883e05583bea1c69239a SHA256 1dceae577e910032d376f61fb8e3cdfa5a48c359983ec7c9f5e67be305fbd83a
 MISC metadata.xml 294 RMD160 ac4e1baa0a1839ae0a807a9d4b915134788d6aa1 SHA1 82865de14486cb30dc9ebfe6f1aecc9c86c0075b SHA256 209af586ae032f00659b69da17d4186854660be14b244d31aa0bea2005c2c5ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwpsi0ACgkQNQqtfCuFneO7LgCfSh4/GY5/J9qSzIGn3wpls2Q8
-rWUAn1A7Y0m2IcIfHWQfk1rjjDiSo0lp
-=Kp9p
------END PGP SIGNATURE-----
diff --git a/net-im/twittare/files/twittare-0.7.42-libnotify-0.7.patch b/net-im/twittare/files/twittare-0.7.42-libnotify-0.7.patch
new file mode 100644
index 000000000000..5026e724a8f2
--- /dev/null
+++ b/net-im/twittare/files/twittare-0.7.42-libnotify-0.7.patch
@@ -0,0 +1,54 @@
+--- libtwnotification/main.cpp
++++ libtwnotification/main.cpp
+@@ -2,6 +2,10 @@
+ #include <iostream>
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ using namespace std;
+ 
+ int main(int argv, char* argc[])
+@@ -9,7 +13,12 @@
+     cout << "HOLA" << endl;
+     notify_init("Twittaré");
+ 
+-    NotifyNotification* nots = notify_notification_new("New twitt", "Tabaré Caorsi:\nEsto es un twit de prueba", "", 0);
++    NotifyNotification* nots = notify_notification_new("New twitt", "Tabaré Caorsi:\nEsto es un twit de prueba", ""
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    );
++#else
++    , 0);
++#endif
+     GError* error = 0;
+     notify_notification_show(nots, &error);
+ 
+--- libtwnotification/twnotification.cpp
++++ libtwnotification/twnotification.cpp
+@@ -1,6 +1,10 @@
+ #include "twnotification.h"
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ TwNotification::TwNotification()
+ {
+         notify_init("Twittaré");
+@@ -8,7 +12,12 @@
+ 
+ void TwNotification::notify(const char * title, const char * text, const char * icon)
+ {
+-    NotifyNotification* nots = notify_notification_new(title, text, icon, 0);
++    NotifyNotification* nots = notify_notification_new(title, text, icon
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    );
++#else
++    , 0);
++#endif
+     GError* error = 0;
+     notify_notification_show(nots, &error);
+ }
diff --git a/net-im/twittare/twittare-0.7.42.ebuild b/net-im/twittare/twittare-0.7.42.ebuild
index c9ebf5bc5bb6..298d8d58f55d 100644
--- a/net-im/twittare/twittare-0.7.42.ebuild
+++ b/net-im/twittare/twittare-0.7.42.ebuild
@@ -1,10 +1,10 @@
-# 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/net-im/twittare/twittare-0.7.42.ebuild,v 1.4 2010/06/29 08:42:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twittare/twittare-0.7.42.ebuild,v 1.5 2011/02/05 13:20:07 ssuominen Exp $
 
 EAPI="2"
 
-inherit qt4
+inherit eutils qt4
 
 DESCRIPTION="Twitter client for Linux using Qt4"
 HOMEPAGE="http://www.twittare.com"
@@ -25,6 +25,8 @@ PATCHES=(
 )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	# fix LDFLAGS issue
 	sed -i "s/-fpic/${LDFLAGS}\ -fpic/" "${S}"/libtwnotification/makefile || die "sed failed"
 	sed -i "s/-shared/${LDFLAGS}\ -shared/" "${S}"/libtwnotification/makefile || die "sed failed"