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

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

4 files changed, 43 insertions, 18 deletions

diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog
index b4c82bddaca2..785d49252953 100644
--- a/media-sound/gejengel/ChangeLog
+++ b/media-sound/gejengel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gejengel
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.16 2010/10/03 20:11:48 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.17 2011/02/05 11:59:36 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> gejengel-0.1.4.ebuild,
+  +files/gejengel-0.1.4-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
   03 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
   -files/gejengel-0.1.2-plugin.patch, -files/gejengel-0.1.2_64bit_fix.patch,
diff --git a/media-sound/gejengel/Manifest b/media-sound/gejengel/Manifest
index 8d1d0a4f2ae1..a7c1eb52e70a 100644
--- a/media-sound/gejengel/Manifest
+++ b/media-sound/gejengel/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gejengel-0.1.4-libnotify-0.7.patch 683 RMD160 3eee4f00e583562265e314c7fcabb3276204e594 SHA1 cbb4e8d8e9cb28a00b478bdcab180e52532c834d SHA256 6aa63dc74e335a806f35376b75a72beee06df9dedafcfef7d8b1afc035ffcdd5
 DIST gejengel-0.1.4.tar.gz 473674 RMD160 380070e12e527e69fc4c233c524dbc81e496f46b SHA1 c45b0d0b09592f21f9be7a8a1f8c13b4a1ebe9da SHA256 036a4ff2520b6ff9f73fc3012d8810939583f0dc25be6bac28689dffb6e9023b
-EBUILD gejengel-0.1.4.ebuild 1668 RMD160 d7e5f1784ee1c8dbcc7a9f6457914097fddffca3 SHA1 c764dd5f748fd529dcedd48ffea354228f7d91dd SHA256 53d79bbc49dece5373ab29f2cc6c679db7f202aa7688424a0b893a9c96606336
-MISC ChangeLog 2587 RMD160 d8b0ce6db1b1d6cfd45999d53a527de5ac77da77 SHA1 fc1da7041c84a8e080bcae592e73ae920ed311db SHA256 1ac856f5eeb21b5f7c30f7fc95470304526889d919ae56bf06c0c028a30af146
+EBUILD gejengel-0.1.4.ebuild 1730 RMD160 2ff7271dddde247518551f8e171d6012ee40ab53 SHA1 78cd24113f3ec31b03b0386baa65d294b04c1f40 SHA256 bc092fad88384548ec5154d3996b56a20277aa2117bc03598cb4da136e45eb4f
+MISC ChangeLog 2758 RMD160 d9e1fbaf21c238c0cbee8b40df7b54cecb167ac6 SHA1 205812987153260f79352d51c84ecfc7afe7a6b8 SHA256 b9b5da64233f3595795504d959ab80acc41347632091f4ada07b1d1fb0044484
 MISC metadata.xml 561 RMD160 fa1cd6eae8181d8de7776f3766ab04b2fb4f8327 SHA1 7434df6d71d08be1838f006715454ba105eea6b1 SHA256 c536a2322d23676f2c59c1ccf080671e24d9a1950c9b334b1daf67231ebcc574
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyo44IACgkQ9/cejkQaxBC3ugCeL1XSKMd3/wpksavS/jtCNXxP
-bMAAnRGhzXgxgxVY+CM7RLlm9wnc95Ni
-=GHbi
------END PGP SIGNATURE-----
diff --git a/media-sound/gejengel/files/gejengel-0.1.4-libnotify-0.7.patch b/media-sound/gejengel/files/gejengel-0.1.4-libnotify-0.7.patch
new file mode 100644
index 000000000000..8026d89725c5
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.4-libnotify-0.7.patch
@@ -0,0 +1,26 @@
+--- src/Plugins/notificationplugin.cpp
++++ src/Plugins/notificationplugin.cpp
+@@ -33,6 +33,10 @@
+ #include "ui/sharedfunctions.h"
+ #include "MusicLibrary/album.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ using namespace std;
+ using namespace Gtk;
+ 
+@@ -85,7 +89,12 @@
+         }
+     }
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    m_pNotification = notify_notification_new("dummy", "", NULL);
++#else
+     m_pNotification = notify_notification_new("dummy", "", NULL, NULL);
++#endif
++
+     notify_notification_set_timeout (m_pNotification, NOTIFY_EXPIRES_DEFAULT);
+     notify_notification_set_urgency (m_pNotification, NOTIFY_URGENCY_NORMAL);
+ 
diff --git a/media-sound/gejengel/gejengel-0.1.4.ebuild b/media-sound/gejengel/gejengel-0.1.4.ebuild
index ff5ceadfdc93..f101ee2753d4 100644
--- a/media-sound/gejengel/gejengel-0.1.4.ebuild
+++ b/media-sound/gejengel/gejengel-0.1.4.ebuild
@@ -1,9 +1,9 @@
-# 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/media-sound/gejengel/gejengel-0.1.4.ebuild,v 1.3 2010/08/31 12:56:14 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.4.ebuild,v 1.4 2011/02/05 11:59:36 ssuominen Exp $
 
-EAPI=2
-inherit base eutils multilib
+EAPI=3
+inherit eutils multilib
 
 DESCRIPTION="Lightweight audio player"
 HOMEPAGE="http://code.google.com/p/gejengel"
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
 	dev-libs/libxdg-basedir
 	>=sys-devel/automake-1.11"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \