diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-02-28 17:45:20 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-28 17:45:20 +0000 |
| commit | 9e0f1e162e09fa8d56b7666d819862b7c34407f3 (patch) | |
| tree | 3f6c8dfd1676645c1235358a9743a75a744bcd7d /x11-plugins | |
| parent | New release on the 1.6.2 branch. This is a bugfix release, the official chang... (diff) | |
| download | historical-9e0f1e162e09fa8d56b7666d819862b7c34407f3.tar.gz historical-9e0f1e162e09fa8d56b7666d819862b7c34407f3.tar.bz2 historical-9e0f1e162e09fa8d56b7666d819862b7c34407f3.zip | |
Fix building with x11-libs/libnotify >= 0.7 wrt #354761 by Diego Elio Pettenò.
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64
Diffstat (limited to 'x11-plugins')
4 files changed, 43 insertions, 11 deletions
diff --git a/x11-plugins/compiz-plugins-extra/ChangeLog b/x11-plugins/compiz-plugins-extra/ChangeLog index 6fb3e61c828c..e835b0da1d65 100644 --- a/x11-plugins/compiz-plugins-extra/ChangeLog +++ b/x11-plugins/compiz-plugins-extra/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-plugins/compiz-plugins-extra # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/ChangeLog,v 1.14 2011/02/26 22:49:51 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/ChangeLog,v 1.15 2011/02/28 17:45:20 ssuominen Exp $ + + 28 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> + compiz-plugins-extra-0.8.6-r1.ebuild, + files/compiz-plugins-extra-0.8.6-libnotify.patch: + Fix building with x11-libs/libnotify >= 0.7 wrt #354761 by Diego Elio + Pettenò. 26 Feb 2011; Kevin McCarthy <signals@gentoo.org> compiz-plugins-extra-0.8.4-r1.ebuild, compiz-plugins-extra-0.8.6-r1.ebuild: diff --git a/x11-plugins/compiz-plugins-extra/Manifest b/x11-plugins/compiz-plugins-extra/Manifest index 8c6f76e03336..f8c43d287dfb 100644 --- a/x11-plugins/compiz-plugins-extra/Manifest +++ b/x11-plugins/compiz-plugins-extra/Manifest @@ -1,8 +1,8 @@ -AUX compiz-plugins-extra-0.8.6-libnotify.patch 1022 RMD160 cd5d07e9cfbfa2a0845d279f08889a8adb2d9ae6 SHA1 bb63195178ae0f495d55f1cd37efff117d4f3961 SHA256 116e4cb3fb9039feea742d20c0bd2ce282d331db8960cc9f20bae54719976d5a +AUX compiz-plugins-extra-0.8.6-libnotify.patch 1412 RMD160 a4e1a09e293c5e1a16bf3b0fd7710d7440c12bcc SHA1 c9201df9851f3ef325fe6b2f612097bc10723b1b SHA256 864971c7f1ad664d64c4cfcca527c2a9788f95a2b030b2cc94f1d2ad9332c106 AUX compiz-plugins-extra-no-gconf.patch 585 RMD160 bb3b291eab783be7f9754d724d3a96618fe2e614 SHA1 564d6614cc157397ae24347a731a9f4d65bf30f8 SHA256 0567850b07c3973f1b4bfd5c36a1e240a57e45a1714b63637ecec577febfc13f DIST compiz-plugins-extra-0.8.4.tar.bz2 2678694 RMD160 10daaaed686e803fb7be27ebe61ff6adaf036c38 SHA1 eb05e8b60c5d1e22a007979d652ef92c23b7bd21 SHA256 a874903d07eb54c3bf210a322275a972cef7f47ccf4c2d2e307c31d73c57d952 DIST compiz-plugins-extra-0.8.6.tar.bz2 2699385 RMD160 cd8d26902d38ee7fb42fe2077e483f92fc458929 SHA1 66c571c64910aa21808aedaee8c8ceb4c4a82c78 SHA256 e111beecd9e563065448aae81002fd6cb644b3cd0e11a8406d6a2d3146747de1 EBUILD compiz-plugins-extra-0.8.4-r1.ebuild 1366 RMD160 869a65b931f2b6df50f8c10930ccf33f95c84f14 SHA1 2419de409054a8ce98ae3bb2092e1ef80694ea21 SHA256 6581ad3c56a593ff97da15d1097c15f75e7db12d1f9715cc8f597bdae681f82c -EBUILD compiz-plugins-extra-0.8.6-r1.ebuild 1562 RMD160 f32ae0232b674cffa48913206b9525438484acb1 SHA1 f17b0ca013c0fe0be0e545196130d76e41449769 SHA256 fe8418fa390bddf0b90700350f5c05e84512809653626c30e24dcb5c0f821d59 -MISC ChangeLog 3157 RMD160 fa35ba9c4efe8aa778c1274902b831aa84d23ebc SHA1 f7d413a9f040dceac8f991e3e100bbe6af446c9e SHA256 9c3f0fbb7cda76b0fc51583a26b4ee7e2c4a22d5cf1b1d13eaeff1a2304fd160 +EBUILD compiz-plugins-extra-0.8.6-r1.ebuild 1559 RMD160 8f82035c08f3fd0d1332ecdf725de55ab90059fd SHA1 af3a5dfabf723eefa74df818fce0242cdc143075 SHA256 305659a8ebf262b853c61fee4d38bdb1035a6061aa525b0a98408cbed0be646e +MISC ChangeLog 3390 RMD160 fb1fb17c417e1bc0308c1e9118ec17f7f3f943b6 SHA1 9aead2a31fc8774277fdcf071f5d0cccd4f21758 SHA256 e2b7b0226b6d5ae20f1217558698cade5fe37023758da9813ce3fd98472cf5a2 MISC metadata.xml 635 RMD160 254ac795726f3ed90c85945f1c3bca9597cfc1d2 SHA1 cae4d4184b4530628dac878f077bca339b2fec24 SHA256 e2023c254ee05395db536f19d88d1735ddcec97e260a50a5db717249e0f3ba93 diff --git a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild index 24cd0c532c3f..6705a80c46f2 100644 --- a/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild +++ b/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-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/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild,v 1.3 2011/02/26 22:49:51 signals Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/compiz-plugins-extra-0.8.6-r1.ebuild,v 1.4 2011/02/28 17:45:20 ssuominen Exp $ EAPI="2" @@ -23,7 +23,7 @@ RDEPEND=" >=x11-libs/compiz-bcop-${MY_PV} >=x11-plugins/compiz-plugins-main-${PV} >=x11-wm/compiz-${PV}[gconf?] - libnotify? ( <x11-libs/libnotify-0.7 ) + libnotify? ( x11-libs/libnotify ) " DEPEND="${RDEPEND} diff --git a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch index 5392fa00d021..967abc4e2044 100644 --- a/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch +++ b/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch @@ -1,8 +1,6 @@ -Index: compiz-plugins-extra-0.8.6/configure.ac -=================================================================== ---- compiz-plugins-extra-0.8.6.orig/configure.ac -+++ compiz-plugins-extra-0.8.6/configure.ac -@@ -136,9 +136,12 @@ AM_CONDITIONAL(THREED_PLUGIN, test "x$ha +--- configure.ac ++++ configure.ac +@@ -136,9 +136,12 @@ PKG_CHECK_MODULES(COMPIZMOUSEPOLL, compiz-mousepoll, [have_compiz_mousepoll=yes], [have_compiz_mousepoll=no]) AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" = "xyes") @@ -17,3 +15,31 @@ Index: compiz-plugins-extra-0.8.6/configure.ac AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin]) fi +--- src/notification/notification.c ++++ src/notification/notification.c +@@ -21,6 +21,11 @@ + + + #include <libnotify/notify.h> ++ ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include <stdio.h> + #include <stdarg.h> + #include <string.h> +@@ -103,7 +108,12 @@ + + n = notify_notification_new (logLevel, + message, +- iconUri, NULL); ++ iconUri ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + + notify_notification_set_timeout (n, nd->timeout); + |