| 1 |
ssuominen 11/02/28 17:45:20 |
| 2 |
|
| 3 |
Modified: compiz-plugins-extra-0.8.6-libnotify.patch |
| 4 |
Log: |
| 5 |
Fix building with x11-libs/libnotify >= 0.7 wrt #354761 by Diego Elio Pettenò. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: compiz-plugins-extra-0.8.6-libnotify.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/compiz-plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- compiz-plugins-extra-0.8.6-libnotify.patch 13 Feb 2011 18:32:25 -0000 1.1 |
| 23 |
+++ compiz-plugins-extra-0.8.6-libnotify.patch 28 Feb 2011 17:45:20 -0000 1.2 |
| 24 |
@@ -1,8 +1,6 @@ |
| 25 |
-Index: compiz-plugins-extra-0.8.6/configure.ac |
| 26 |
-=================================================================== |
| 27 |
---- compiz-plugins-extra-0.8.6.orig/configure.ac |
| 28 |
-+++ compiz-plugins-extra-0.8.6/configure.ac |
| 29 |
-@@ -136,9 +136,12 @@ AM_CONDITIONAL(THREED_PLUGIN, test "x$ha |
| 30 |
+--- configure.ac |
| 31 |
++++ configure.ac |
| 32 |
+@@ -136,9 +136,12 @@ |
| 33 |
PKG_CHECK_MODULES(COMPIZMOUSEPOLL, compiz-mousepoll, [have_compiz_mousepoll=yes], [have_compiz_mousepoll=no]) |
| 34 |
AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" = "xyes") |
| 35 |
|
| 36 |
@@ -17,3 +15,31 @@ |
| 37 |
AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin]) |
| 38 |
fi |
| 39 |
|
| 40 |
+--- src/notification/notification.c |
| 41 |
++++ src/notification/notification.c |
| 42 |
+@@ -21,6 +21,11 @@ |
| 43 |
+ |
| 44 |
+ |
| 45 |
+ #include <libnotify/notify.h> |
| 46 |
++ |
| 47 |
++#ifndef NOTIFY_CHECK_VERSION |
| 48 |
++#define NOTIFY_CHECK_VERSION(x,y,z) 0 |
| 49 |
++#endif |
| 50 |
++ |
| 51 |
+ #include <stdio.h> |
| 52 |
+ #include <stdarg.h> |
| 53 |
+ #include <string.h> |
| 54 |
+@@ -103,7 +108,12 @@ |
| 55 |
+ |
| 56 |
+ n = notify_notification_new (logLevel, |
| 57 |
+ message, |
| 58 |
+- iconUri, NULL); |
| 59 |
++ iconUri |
| 60 |
++#if NOTIFY_CHECK_VERSION (0, 7, 0) |
| 61 |
++ ); |
| 62 |
++#else |
| 63 |
++ , NULL); |
| 64 |
++#endif |
| 65 |
+ |
| 66 |
+ notify_notification_set_timeout (n, nd->timeout); |
| 67 |
+ |
Archives