diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-01-30 09:04:13 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-30 09:04:13 +0000 |
| commit | 36cea25e33f22d796f5b40264620bd3f57861249 (patch) | |
| tree | 1ba092834429df9dbc9f090349bf413615f8e037 /x11-plugins | |
| parent | x86 stable wrt bug #353039 (diff) | |
| download | historical-36cea25e33f22d796f5b40264620bd3f57861249.tar.gz historical-36cea25e33f22d796f5b40264620bd3f57861249.tar.bz2 historical-36cea25e33f22d796f5b40264620bd3f57861249.zip | |
Fix building with x11-libs/libnotify >= 0.7.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'x11-plugins')
4 files changed, 37 insertions, 13 deletions
diff --git a/x11-plugins/pidgin-libnotify/ChangeLog b/x11-plugins/pidgin-libnotify/ChangeLog index 9c63f8f435d6..26df2d990b90 100644 --- a/x11-plugins/pidgin-libnotify/ChangeLog +++ b/x11-plugins/pidgin-libnotify/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-plugins/pidgin-libnotify -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-libnotify/ChangeLog,v 1.22 2010/07/22 20:19:32 pva Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-libnotify/ChangeLog,v 1.23 2011/01/30 09:04:13 ssuominen Exp $ + + 30 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> + pidgin-libnotify-0.14.ebuild, + +files/pidgin-libnotify-0.14-libnotify-0.7.patch: + Fix building with x11-libs/libnotify >= 0.7. 22 Jul 2010; Peter Volkov <pva@gentoo.org> pidgin-libnotify-0.14.ebuild: Don't build static libs: for plugins they are useless, bug #327237, thank diff --git a/x11-plugins/pidgin-libnotify/Manifest b/x11-plugins/pidgin-libnotify/Manifest index d59f17622ba1..a0e118abeb69 100644 --- a/x11-plugins/pidgin-libnotify/Manifest +++ b/x11-plugins/pidgin-libnotify/Manifest @@ -1,5 +1,6 @@ +AUX pidgin-libnotify-0.14-libnotify-0.7.patch 555 RMD160 0149a70ace08e3a4d32d937789fd49bc61e0823a SHA1 809802a899144d07ce4ea6e1379a36b270609ae8 SHA256 e9c8d71b74985e11ef2939033fc2feeac037eb6553272a11ddc8417a79baafda AUX pidgin-libnotify-showbutton.patch 425 RMD160 6713fe0e16ad1d444a6f212d7f8c1972aa1659fa SHA1 7fe8bd4cf83b789b1da53af4ec81221667d8a3c2 SHA256 897a1f99255476110dd3d5e888134f255e60e9539f65e8c3c516640a0790838b DIST pidgin-libnotify-0.14.tar.gz 316365 RMD160 39d3f1a6339bb76c774273367b4a2e67c2a4b375 SHA1 005e9663c7a36f68b9572341654818720a1e571a SHA256 74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe -EBUILD pidgin-libnotify-0.14.ebuild 988 RMD160 02554c2a735d51187f32df2dbeef5cc1c78de901 SHA1 6d9709411057d662a854506c000b179d2168be84 SHA256 4a0a1332d79600f87dd730bf9027d5689baeb70debd05139225aea8612d9b48c -MISC ChangeLog 3016 RMD160 129e75fe12c5c69b5846ffbd3f432c285ee466b3 SHA1 b5f553cb2647ffb5fbdfd2c067834a254096bbd2 SHA256 d47cfd6c385b34900b5a99051c3fcea92db1c5fcbf2136abd8a798a0855ecb40 +EBUILD pidgin-libnotify-0.14.ebuild 1005 RMD160 8344637b5919779e91fa33180132558727027d77 SHA1 98218e8892648d01ef18a4e79faaca37e96205a9 SHA256 220cb4ed0d9c674d2a274a7a3ac9f3afcc27edd5663128850c8fe6f8f7cecd43 +MISC ChangeLog 3208 RMD160 a1beab7fba223eff5a43b622770eea6aac96b479 SHA1 364130852bc1deeed58812931c670e6040e4a6f4 SHA256 c58a628823747c4781b91b876eb2f8441a1f61e74c157cbbb5a0ceac756f63ad MISC metadata.xml 159 RMD160 3e0df024f9705f0cd1798f45cd4b0698e183ee87 SHA1 08e27d5a696205dc5c9992d4f3b647cd609ec139 SHA256 bb3130d2515d5b2e4ff19aff2199bb00ac7c350bf78b34bbec55268bf1013908 diff --git a/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch new file mode 100644 index 000000000000..40e6c02b8152 --- /dev/null +++ b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch @@ -0,0 +1,18 @@ +--- src/pidgin-libnotify.c ++++ src/pidgin-libnotify.c +@@ -286,7 +286,15 @@ + g_free (tr_body); + return; + } ++#ifdef NOTIFY_CHECK_VERSION ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ notification = notify_notification_new (title, tr_body, NULL); ++#else + notification = notify_notification_new (title, tr_body, NULL, NULL); ++#endif ++#else ++ notification = notify_notification_new (title, tr_body, NULL, NULL); ++#endif + purple_debug_info (PLUGIN_ID, "notify(), new: " + "title: '%s', body: '%s', buddy: '%s'\n", + title, tr_body, best_name (buddy)); diff --git a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14.ebuild b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14.ebuild index c802e4bc8aed..26d991abad9c 100644 --- a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14.ebuild +++ b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14.ebuild @@ -1,9 +1,8 @@ -# 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/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14.ebuild,v 1.7 2010/07/22 20:19:32 pva Exp $ - -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14.ebuild,v 1.8 2011/01/30 09:04:13 ssuominen Exp $ +EAPI=2 inherit eutils DESCRIPTION="pidgin-libnotify provides popups for pidgin via a libnotify interface" @@ -17,13 +16,14 @@ IUSE="nls debug" RDEPEND=">=x11-libs/libnotify-0.3.2 net-im/pidgin[gtk] - >=x11-libs/gtk+-2" - + x11-libs/gtk+:2" DEPEND="${RDEPEND} dev-util/pkgconfig" src_prepare() { - epatch "${FILESDIR}"/pidgin-libnotify-showbutton.patch + epatch \ + "${FILESDIR}"/pidgin-libnotify-showbutton.patch \ + "${FILESDIR}"/${P}-libnotify-0.7.patch } src_configure() { @@ -34,7 +34,7 @@ src_configure() { } src_install() { - emake install DESTDIR="${D}" || die "make install failed" + emake install DESTDIR="${D}" || die find "${D}" -name '*.la' -delete - dodoc AUTHORS ChangeLog INSTALL NEWS README TODO VERSION || die + dodoc AUTHORS ChangeLog NEWS README TODO VERSION || die } |