diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-05 11:27:08 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-05 11:27:08 +0000 |
| commit | b336c4d85be95f50a80e50eec20acec9508de10e (patch) | |
| tree | 2a5ccd3dcc646df08deecba80b0398831d55e69e /media-video | |
| parent | stable amd64, bug 353642 (diff) | |
| download | historical-b336c4d85be95f50a80e50eec20acec9508de10e.tar.gz historical-b336c4d85be95f50a80e50eec20acec9508de10e.tar.bz2 historical-b336c4d85be95f50a80e50eec20acec9508de10e.zip | |
Fix building with x11-libs/libnotify >= 0.7.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/parole/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/parole/Manifest | 5 | ||||
| -rw-r--r-- | media-video/parole/files/parole-0.2.0.2-libnotify-0.7.patch | 25 | ||||
| -rw-r--r-- | media-video/parole/parole-0.2.0.2-r1.ebuild | 9 |
4 files changed, 41 insertions, 6 deletions
diff --git a/media-video/parole/ChangeLog b/media-video/parole/ChangeLog index 50fe96af0890..1373fb890f2b 100644 --- a/media-video/parole/ChangeLog +++ b/media-video/parole/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/parole -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/parole/ChangeLog,v 1.14 2010/11/05 17:19:16 phajdan.jr Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/parole/ChangeLog,v 1.15 2011/02/05 11:27:08 ssuominen Exp $ + + 05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> parole-0.2.0.2-r1.ebuild, + +files/parole-0.2.0.2-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7. 05 Nov 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> parole-0.2.0.2-r1.ebuild: diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest index 34ef6b0f724a..dcd6e9b847e0 100644 --- a/media-video/parole/Manifest +++ b/media-video/parole/Manifest @@ -1,5 +1,6 @@ AUX parole-0.2.0.2-64bit.patch 762 RMD160 dafc468e604adfd0223fccefe77d6dae4001cb3d SHA1 9839a02425440bcf20e8e5dc3a7f600e179357f6 SHA256 19ad7008eeada50d794e2166abb122bb0b2355572c7c57431912a4ebd5395c06 +AUX parole-0.2.0.2-libnotify-0.7.patch 650 RMD160 d38cc032a94cebd34946278457b43d3680bd96c4 SHA1 57cf366d9d2bd3670994ef6e4a613ed9fc8fef83 SHA256 1692c2a6c98cb3870c429e5d98b92017f2fb4a19b90224385fa595e970bd0df5 DIST parole-0.2.0.2.tar.bz2 644981 RMD160 6d2b5162107a15a8965d1693d33c6ad2e2b8c440 SHA1 4c5b640876c9c4ecd4fc96c29a8b29ae19d61f7a SHA256 c6b669cda652ccfb4b5c6c4aab882bf67bb0a8bd3ee4abe42a9b8fb3e6860195 -EBUILD parole-0.2.0.2-r1.ebuild 1308 RMD160 78049eed9409953c5436c43b0eeb80e2b96ecb85 SHA1 ca5649346610799a01c7177941d2279c631d39d9 SHA256 7576bb24c1e3b9c15198d53feca155a662a3668d3b3f557a7a4c3dd083a88856 -MISC ChangeLog 2449 RMD160 77ba838e9b0180c9128fbd83a33b8e05c3feb229 SHA1 6d9060ba91dd249a5bd3281908be7c3fc387bea4 SHA256 8f55873258d3d13d124b6d3cb53615deee59a2e2eca4776e7f0b257b8fed5acb +EBUILD parole-0.2.0.2-r1.ebuild 1355 RMD160 1b7e42e5511edd954199bcaaa29b3baa8666ce8a SHA1 3055667da3d42e06cfd0b1a172e36dd9035f324e SHA256 066515b1a59b34c626b59f75c9a8be9c5cfdc52f47d4b9c5d0b60d3043de6ca0 +MISC ChangeLog 2621 RMD160 046c8dfa352fdb10dab131ac2312002f0f1592f7 SHA1 39cb652ff117cce9d3d2c2401d7594850ed1d2e2 SHA256 470139083fdd3e4cf4ef61c3b91bdecbc22356aacd3fff2f5d9444a53a94dde0 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/media-video/parole/files/parole-0.2.0.2-libnotify-0.7.patch b/media-video/parole/files/parole-0.2.0.2-libnotify-0.7.patch new file mode 100644 index 000000000000..a6fbecafb066 --- /dev/null +++ b/media-video/parole/files/parole-0.2.0.2-libnotify-0.7.patch @@ -0,0 +1,25 @@ +--- plugins/tray/tray-provider.c ++++ plugins/tray/tray-provider.c +@@ -29,6 +29,9 @@ + + #ifdef HAVE_LIBNOTIFY + #include <libnotify/notify.h> ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif + #endif + + #include <libxfcegui4/libxfcegui4.h> +@@ -260,8 +263,11 @@ + } + + message = g_strdup_printf ("%s %s %s %s", _("<b>Playing:</b>"), title, _("<b>Duration:</b>"), timestring); +- ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ tray->n = notify_notification_new (title, message, NULL); ++#else + tray->n = notify_notification_new (title, message, NULL, NULL); ++#endif + g_free (title); + g_free (message); + diff --git a/media-video/parole/parole-0.2.0.2-r1.ebuild b/media-video/parole/parole-0.2.0.2-r1.ebuild index 5d54b34933d5..ba5e2f7c5973 100644 --- a/media-video/parole/parole-0.2.0.2-r1.ebuild +++ b/media-video/parole/parole-0.2.0.2-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/media-video/parole/parole-0.2.0.2-r1.ebuild,v 1.4 2011/02/04 18:06:35 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/parole/parole-0.2.0.2-r1.ebuild,v 1.5 2011/02/05 11:27:08 ssuominen Exp $ EAPI=3 inherit multilib nsplugins xfconf @@ -32,7 +32,11 @@ DEPEND="${RDEPEND} pkg_setup() { export BROWSER_PLUGIN_DIR="/usr/$(get_libdir)/${PLUGINS_DIR}" #333517 - PATCHES=( "${FILESDIR}"/${P}-64bit.patch ) + PATCHES=( + "${FILESDIR}"/${P}-64bit.patch + "${FILESDIR}"/${P}-libnotify-0.7.patch + ) + XFCONF=( --disable-dependency-tracking $(use_enable libnotify) @@ -40,5 +44,6 @@ pkg_setup() { $(use_enable nsplugin browser-plugin) $(xfconf_use_debug) ) + DOCS="AUTHORS ChangeLog README THANKS TODO" } |