diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 20:19:40 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-29 20:19:40 +0000 |
| commit | edd39f92cee6249f239ce11b924cdc8e0911f351 (patch) | |
| tree | 6409b78bbef3ebaa4b707c78cda2a292871b4caa /media-sound/lxmusic | |
| parent | Attempt to fix parallel issues once and for all, wrt #296174 c#14 (diff) | |
| download | historical-edd39f92cee6249f239ce11b924cdc8e0911f351.tar.gz historical-edd39f92cee6249f239ce11b924cdc8e0911f351.tar.bz2 historical-edd39f92cee6249f239ce11b924cdc8e0911f351.zip | |
Fix building with x11-libs/libnotify >= 0.7.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'media-sound/lxmusic')
| -rw-r--r-- | media-sound/lxmusic/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/lxmusic/Manifest | 5 | ||||
| -rw-r--r-- | media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch | 32 | ||||
| -rw-r--r-- | media-sound/lxmusic/lxmusic-0.4.4.ebuild | 13 |
4 files changed, 50 insertions, 8 deletions
diff --git a/media-sound/lxmusic/ChangeLog b/media-sound/lxmusic/ChangeLog index 747d48de7801..45b7eefc95a8 100644 --- a/media-sound/lxmusic/ChangeLog +++ b/media-sound/lxmusic/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/lxmusic -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/lxmusic/ChangeLog,v 1.2 2010/08/07 17:30:24 vostorga Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/lxmusic/ChangeLog,v 1.3 2011/01/29 20:19:40 ssuominen Exp $ + + 29 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> lxmusic-0.4.4.ebuild, + +files/lxmusic-0.4.4-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7. 07 Aug 2010; Víctor Ostorga <vostorga@gentoo.org> lxmusic-0.4.4.ebuild: Adding x11-libs/libnotify as RDEPEND and fixing typo diff --git a/media-sound/lxmusic/Manifest b/media-sound/lxmusic/Manifest index bdddeeb341a8..cabd697c6deb 100644 --- a/media-sound/lxmusic/Manifest +++ b/media-sound/lxmusic/Manifest @@ -1,4 +1,5 @@ +AUX lxmusic-0.4.4-libnotify-0.7.patch 909 RMD160 96190f15121b5b874c9c9a473014e3a56ac9210f SHA1 d58eabd162175a1ba6295a1f211bf4b39a13065f SHA256 d25d338de76e488873907ee7742690fb8884c06967dce84c627367ae869af3f8 DIST lxmusic-0.4.4.tar.gz 271331 RMD160 17e6efe788b43af9f02a546cfa7b9d7f4b2e5860 SHA1 e5687f01b874d48658489c721e1f1e506baa8506 SHA256 6815bf5717a07bec29737f1160f6973c86677e68c1126c56ea4affd6b9e6faac -EBUILD lxmusic-0.4.4.ebuild 677 RMD160 0d5b0048337f1536a266b930fb70a7067dbef134 SHA1 42e6a3ca53336c46be872fdca1e3a641f5093783 SHA256 fdbd2af00876d91528c3c36f2f1b74c5c38642ce15c996d15d6d0e22ab573698 -MISC ChangeLog 496 RMD160 e6e08f8723db78ec57d0832222992ed9cf1515e1 SHA1 345175b7451c557d1a37918cff54ef83fc2e3de6 SHA256 134b1df67189138bff3b466c271e968c915084f6d93344cd5b348e27f398a0f1 +EBUILD lxmusic-0.4.4.ebuild 714 RMD160 0dbf183d5b0b4bd0b7f57abc52bda68faa2cc953 SHA1 3071ee126a6feca511bbf4d8e7ad5b067e6aee3d SHA256 140ff9ba7becafa2a4ef13c1bfd382d3f76a4027cf7f331ae21b31c6c092681e +MISC ChangeLog 665 RMD160 d89424217191d9b47f1acfb367d31d1dd17f2a8c SHA1 573a1ffaf9c92601c605898a40d64a39f488e902 SHA256 bc37c51bf67e4884090551d4b6364ac8dc3a7a9c2a78992ca6804a5291baeb9b MISC metadata.xml 308 RMD160 31afa72ee59907ea83f9dcdaaa3d8b0517bbb718 SHA1 6b642b5c85b8778d1462729d3feccab1b08cdf66 SHA256 8696e687e1fb24195881901b0aa72834427650be1313f7e595d62db3a4256ba7 diff --git a/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch b/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch new file mode 100644 index 000000000000..62868c909856 --- /dev/null +++ b/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch @@ -0,0 +1,32 @@ +--- src/lxmusic-notify.c ++++ src/lxmusic-notify.c +@@ -56,12 +56,26 @@ + g_return_if_fail (message != NULL); + + lxmusic_clear_notify (n); +- +- notify = notify_notification_new (summary, message, +- "lxmusic", NULL); ++#ifdef NOTIFY_CHECK_VERSION ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ notify = notify_notification_new (summary, message, "lxmusic"); ++#else ++ notify = notify_notification_new (summary, message, "lxmusic", NULL); ++#endif ++#else ++ notify = notify_notification_new (summary, message, "lxmusic", NULL); ++#endif + n->notification = notify; + ++#ifdef NOTIFY_CHECK_VERSION ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++/* lazy */ ++#else ++/* lazy */ ++#endif ++#else + notify_notification_attach_to_status_icon (notify, n->status_icon); ++#endif + notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); + notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); + diff --git a/media-sound/lxmusic/lxmusic-0.4.4.ebuild b/media-sound/lxmusic/lxmusic-0.4.4.ebuild index ac129bab1881..06bf1bd3e509 100644 --- a/media-sound/lxmusic/lxmusic-0.4.4.ebuild +++ b/media-sound/lxmusic/lxmusic-0.4.4.ebuild @@ -1,8 +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/lxmusic/lxmusic-0.4.4.ebuild,v 1.2 2010/08/07 17:30:24 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/lxmusic/lxmusic-0.4.4.ebuild,v 1.3 2011/01/29 20:19:40 ssuominen Exp $ EAPI=2 +inherit eutils DESCRIPTION="A simple GUI XMMS2 client with minimal functionality" HOMEPAGE="http://lxde.sourceforge.net/" @@ -19,7 +20,11 @@ RDEPEND="x11-libs/gtk+:2 DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-libnotify-0.7.patch +} + src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS README || die "dodoc failed" + emake DESTDIR="${D}" install || die + dodoc AUTHORS README } |