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

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

4 files changed, 38 insertions, 16 deletions

diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index df2661ee9d09..68a9918d8b3a 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ogmrip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.43 2010/12/06 23:46:17 hanno Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.44 2011/02/06 17:01:45 ssuominen Exp $
+
+  06 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> ogmrip-0.13.6.ebuild,
+  +files/ogmrip-0.13.6-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7.
 
 *ogmrip-0.13.6 (06 Dec 2010)
 
diff --git a/media-video/ogmrip/Manifest b/media-video/ogmrip/Manifest
index 5e46de45e5c9..7a8c6060d0e5 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX ogmrip-0.13.4-gtk.patch 2539 RMD160 fad5278ae198c0ba36800a7519c69788ce7410a5 SHA1 92e745d7d0197dac4ac242b782034cd322bd8c2b SHA256 71d4845d7b3500958ee94a7551b1af4806f4d9e21c3e70c280f4fdc54723e6b4
 AUX ogmrip-0.13.4-suboptions.patch 2728 RMD160 94427aaef912fe0c679e33985246091605b59f0a SHA1 5de9d36a754b2496d34f9b93436ef7731337bcb7 SHA256 a101765ea13f0e3942450d5eebd5734d65694d5c916671439f8ca7b70c46305f
+AUX ogmrip-0.13.6-libnotify-0.7.patch 892 RMD160 0864b2428eb934b9a70481004c7a91cc4af538fb SHA1 0268af409a9468efcd4c044cd191d8759512a6e4 SHA256 afb800738373a540be287287990bf84ac03cb398856b689e1b9f8043b1757b71
 DIST ogmrip-0.13.4.tar.gz 3322432 RMD160 62951486f4bcfcdcf7075efb203ed4c620b259ec SHA1 dfe48d174107ff4d2b55e69b82fbf84e37498ab2 SHA256 b954bb2b990933a7abbb6fab8fcf7d7edd1cde8b0a9c790806cd16ddc9c4b068
 DIST ogmrip-0.13.5.tar.gz 3342721 RMD160 8cd9dbbe0786c1ec8cd8af3cce4a0babed562a69 SHA1 bc9c718d81f26b048849590e9aedbac4e03ed55e SHA256 b8d60b25ab6484c07f5e764a10076679da39b325bba17fa5d52a3cf8dc3f447f
 DIST ogmrip-0.13.6.tar.gz 3242380 RMD160 6116e7c22e747bd8ecd6444575537f2ebc16d062 SHA1 41917a11a44fb73c73daaa8ac29ae3dddb478b67 SHA256 f1b70fc68951401dbd43c9b1016fd2c37b1fda004d76cf6bb82c8a44742a5d24
 EBUILD ogmrip-0.13.4.ebuild 2424 RMD160 5c5fe832089625a558ee16f4b235b3312b01e4b8 SHA1 b1ef9235b3a2b20ed69ab4120f0f181ee3357705 SHA256 d5a9552782bc17d7a1cd497b4d9e34e88a743210d20d290a96d04593d847834c
 EBUILD ogmrip-0.13.5.ebuild 2392 RMD160 f2ad914a11edd137cc73ac160940ff3e5d988a66 SHA1 d7bb3cd88e747c42eb5c1a92486d482da430676c SHA256 7f4cc053dc490fd56516a370e69a788a1ba29ce142580b94c64a2848cedb2fde
-EBUILD ogmrip-0.13.6.ebuild 2388 RMD160 57787e8a0d860a17f46ca017d5b6a72a1626d2b4 SHA1 597ca0d4767c492cebed63b25c21436c3d985673 SHA256 190d70cb4e829f5fd00d42489ed9bd3916171f8f2d8fca504604b3c0df480edf
-MISC ChangeLog 7975 RMD160 50535273fcd4daa544c00fdc3a25ba8bd3a70af9 SHA1 d80b5c7b255c777cdea60ac8dfbde8eff67e687b SHA256 95073561854f84be33af1aa18c7f7b74f183eee642776739baa43cf94fb97c35
+EBUILD ogmrip-0.13.6.ebuild 2440 RMD160 0887b7fb928a1f7b25e9feeef3f27af467194d01 SHA1 29cd7bcdd8c92bf460765f3421535d313b05e98b SHA256 cbcc475678acd52123469f938f415268b5e5e9a77112f9f3881b1428d6cd53a9
+MISC ChangeLog 8147 RMD160 a839537a2fa76bce64d7b90f9a0a0cc822e92396 SHA1 3facc88687d1cdba5a9844c67c6b72554e30e8dc SHA256 3b082e9ef36fe6794376b35928e50d51184f90599706b761e081221dff0e7d5e
 MISC metadata.xml 449 RMD160 b535f21bb82fe18f270c623e9246fada5d4f389a SHA1 d45301a60016eeda1698a9b02de8326ef4bbbeeb SHA256 7ddfc7f6e9ffd1f154c7bfad79dba0672cfc3da9d369d09175d06106eb345d36
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkz9dc8ACgkQr2QksT29OyCsrgCfbh8A4RG29bofzce5VPQ0QLk/
-v8IAoKOS32ICHdrVm+ri3MSFkRt6Y0f8
-=iu6e
------END PGP SIGNATURE-----
diff --git a/media-video/ogmrip/files/ogmrip-0.13.6-libnotify-0.7.patch b/media-video/ogmrip/files/ogmrip-0.13.6-libnotify-0.7.patch
new file mode 100644
index 000000000000..64cfbf0ff6a5
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.13.6-libnotify-0.7.patch
@@ -0,0 +1,25 @@
+--- src/ogmrip-progress-dialog.c
++++ src/ogmrip-progress-dialog.c
+@@ -32,6 +32,9 @@
+ 
+ #ifdef HAVE_LIBNOTIFY_SUPPORT
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif /* HAVE_LIBNOTIFY_SUPPORT */
+ 
+ #define OGMRIP_PROGRESS_DIALOG_GET_PRIVATE(o) \
+@@ -418,8 +421,12 @@
+   g_signal_connect_swapped (dialog->priv->status_icon, "popup_menu",
+       G_CALLBACK (ogmrip_progress_dialog_status_icon_popup_menu), dialog);
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++  /* notify_notification_new_with_status_icon was removed */
++#else
+   dialog->priv->notification = notify_notification_new_with_status_icon ("Dummy", "Dummy",
+       OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE, dialog->priv->status_icon);
++#endif
+   g_signal_connect (dialog, "window-state-event",
+       G_CALLBACK (ogmrip_progress_dialog_state_changed), NULL);
+ 
diff --git a/media-video/ogmrip/ogmrip-0.13.6.ebuild b/media-video/ogmrip/ogmrip-0.13.6.ebuild
index 9d3e93985a5a..1fbe11e33dc8 100644
--- a/media-video/ogmrip/ogmrip-0.13.6.ebuild
+++ b/media-video/ogmrip/ogmrip-0.13.6.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/media-video/ogmrip/ogmrip-0.13.6.ebuild,v 1.1 2010/12/06 23:46:17 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.13.6.ebuild,v 1.2 2011/02/06 17:01:45 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
@@ -78,6 +78,8 @@ src_prepare() {
 		-e '/DISABLE_DEPRECATED/d' \
 		configure || die
 
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+
 	gnome2_src_prepare
 }