* [gentoo-commits] gentoo-x86 commit in x11-plugins/compiz-plugins-extra/files: compiz-plugins-extra-0.8.6-libnotify.patch
@ 2011-02-13 18:32 Diego Petteno (flameeyes)
0 siblings, 0 replies; 3+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-02-13 18:32 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/02/13 18:32:25
Added: compiz-plugins-extra-0.8.6-libnotify.patch
Log:
Resolve automagic dependencies over libnotify: force it on 0.8.4-r1, and patch 0.8.6-r1 to respect a libnotify USE flag instead. Drop old version.
(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)
Revision Changes Path
1.1 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.1&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.1&content-type=text/plain
Index: compiz-plugins-extra-0.8.6-libnotify.patch
===================================================================
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
PKG_CHECK_MODULES(COMPIZMOUSEPOLL, compiz-mousepoll, [have_compiz_mousepoll=yes], [have_compiz_mousepoll=no])
AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" = "xyes")
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify, [have_libnotify=yes], [have_libnotify=no])
+AC_ARG_WITH([libnotify], [AS_HELP_STRING([--without-libnotify], [Build without libnotify support @<:@default=auto@:>@])])
+AS_IF([test "x$with_libnotify" != "xno"], [
+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify, [have_libnotify=yes], [have_libnotify=no])
+])
AM_CONDITIONAL(NOTIFICATION_PLUGIN, test "x$have_libnotify" = "xyes")
-if test "$have_libnotify" = yes; then
+if test "x$have_libnotify" = "xyes"; then
AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin])
fi
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-plugins/compiz-plugins-extra/files: compiz-plugins-extra-0.8.6-libnotify.patch
@ 2011-02-28 17:45 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-02-28 17:45 UTC (permalink / raw
To: gentoo-commits
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);
+
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-plugins/compiz-plugins-extra/files: compiz-plugins-extra-0.8.6-libnotify.patch
@ 2012-09-25 14:35 Sergey Popov (pinkbyte)
0 siblings, 0 replies; 3+ messages in thread
From: Sergey Popov (pinkbyte) @ 2012-09-25 14:35 UTC (permalink / raw
To: gentoo-commits
pinkbyte 12/09/25 14:35:31
Removed: compiz-plugins-extra-0.8.6-libnotify.patch
Log:
Drop old compiz plugins
(Portage version: 2.2.0_alpha129/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-25 14:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-28 17:45 [gentoo-commits] gentoo-x86 commit in x11-plugins/compiz-plugins-extra/files: compiz-plugins-extra-0.8.6-libnotify.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2012-09-25 14:35 Sergey Popov (pinkbyte)
2011-02-13 18:32 Diego Petteno (flameeyes)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox