diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-06 17:01:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-06 17:01:45 +0000 |
| commit | 6d46271368f4f1995db8d9547278be59beb7142d (patch) | |
| tree | 87bee0d480a7d71df3516c1652f42f61bb7b7658 | |
| parent | Add ruby-glib2 as a dependency of rcairo (it uses pkg-config to look it up); ... (diff) | |
| download | gentoo-2-6d46271368f4f1995db8d9547278be59beb7142d.tar.gz gentoo-2-6d46271368f4f1995db8d9547278be59beb7142d.tar.bz2 gentoo-2-6d46271368f4f1995db8d9547278be59beb7142d.zip | |
Fix building with x11-libs/libnotify >= 0.7.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
| -rw-r--r-- | media-video/ogmrip/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/ogmrip/files/ogmrip-0.13.6-libnotify-0.7.patch | 25 | ||||
| -rw-r--r-- | media-video/ogmrip/ogmrip-0.13.6.ebuild | 6 |
3 files changed, 35 insertions, 4 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/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 } |