From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in x11-plugins/compiz-plugins-extra/files: compiz-plugins-extra-0.8.6-libnotify.patch
Date: Mon, 28 Feb 2011 17:45:20 +0000 (UTC) [thread overview]
Message-ID: <20110228174520.60EEF20054@flycatcher.gentoo.org> (raw)
ssuominen 11/02/28 17:45:20
Modified: compiz-plugins-extra-0.8.6-libnotify.patch
Log:
Fix building with x11-libs/libnotify >= 0.7 wrt #354761 by Diego Elio Pettenò.
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Revision Changes Path
1.2 x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch?r1=1.1&r2=1.2
Index: compiz-plugins-extra-0.8.6-libnotify.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compiz-plugins-extra-0.8.6-libnotify.patch 13 Feb 2011 18:32:25 -0000 1.1
+++ compiz-plugins-extra-0.8.6-libnotify.patch 28 Feb 2011 17:45:20 -0000 1.2
@@ -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 @@
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);
+
next reply other threads:[~2011-02-28 17:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-28 17:45 Samuli Suominen (ssuominen) [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-25 14:35 [gentoo-commits] gentoo-x86 commit in x11-plugins/compiz-plugins-extra/files: compiz-plugins-extra-0.8.6-libnotify.patch Sergey Popov (pinkbyte)
2011-02-13 18:32 Diego Petteno (flameeyes)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110228174520.60EEF20054@flycatcher.gentoo.org \
--to=ssuominen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox