Merged, thanks On Wed, Jul 27, 2011 at 9:43 AM, Guido Trentalancia <[email protected]> wrote: > Hi ! > > A minor thing, but I experienced problems building compiz-plugins-extra > because of improper checking of libnotify version (for a function which > lost one of its arguments in version >= 0.6.1). > > I have created two very simple patches that I propose. The first one is > against compiz-plugins-extra version 0.8.8 (latest stable) and the > second one is against compiz-plugins-extra version 0.9.5.0 (unstable). > > Thanks. > > --- compiz-plugins-extra-0.8.8/src/notification/notification.c.orig > 2011-07-27 03:07:06.740915041 +0200 > +++ compiz-plugins-extra-0.8.8/src/notification/notification.c 2011-07-27 > 03:28:35.465618685 +0200 > @@ -36,6 +36,13 @@ > #define NOTIFY_TIMEOUT_DEFAULT -1 > #define NOTIFY_TIMEOUT_NEVER 0 > > +/* libnotify 0.7 introduced proper NOTIFY_CHECK_VERSION macro */ > +#ifdef NOTIFY_CHECK_VERSION > +#if NOTIFY_CHECK_VERSION(0,6,1) > +#define HAVE_LIBNOTIFY_0_6_1 > +#endif > +#endif > + > static int corePrivateIndex; > static int displayPrivateIndex; > > --- compiz-plugins-extra-0.9.5.0/notification/src/notification.cpp.orig > 2011-07-27 03:32:05.763416425 +0200 > +++ compiz-plugins-extra-0.9.5.0/notification/src/notification.cpp > 2011-07-27 03:32:35.955672411 +0200 > @@ -26,6 +26,13 @@ > > COMPIZ_PLUGIN_20090315 (notification, NotificationPluginVTable); > > +/* libnotify 0.7 introduced proper NOTIFY_CHECK_VERSION macro */ > +#ifdef NOTIFY_CHECK_VERSION > +#if NOTIFY_CHECK_VERSION(0,6,1) > +#define HAVE_LIBNOTIFY_0_6_1 > +#endif > +#endif > + > void > NotificationScreen::logMessage (const char *component, > CompLogLevel level, > > _______________________________________________ > dev mailing list > [email protected] > http://lists.compiz.org/mailman/listinfo/dev >
-- Sam Spilsbury _______________________________________________ dev mailing list [email protected] http://lists.compiz.org/mailman/listinfo/dev
