packages: compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.spec, com...

[lisu]

Author: lisu                         Date: Thu Apr  7 08:40:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with libnotify 0.7

---- Files affected:
packages/compiz-fusion-plugins-extra:
   compiz-fusion-plugins-extra.spec (1.19 -> 1.20) , compiz-fusion-plugins-extra-libnotify.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.spec
diff -u packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.spec:1.19 packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.spec:1.20
--- packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.spec:1.19	Thu Apr  7 10:30:01 2011
+++ packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.spec	Thu Apr  7 10:40:49 2011
@@ -13,6 +13,7 @@
 Source2:	fusioncap.png
 Source3:	splash_background.png
 Source4:	splash_logo.png
+Patch0:		%{name}-libnotify.patch
 URL:		http://www.compiz.org/
 BuildRequires:	GConf2-devel
 BuildRequires:	OpenGL-devel
@@ -104,6 +105,7 @@
 
 %prep
 %setup -q -n %{pkgname}-%{version}
+%patch0 -p1
 
 %build
 %{__glib_gettextize}
@@ -153,6 +155,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/04/07 08:40:49  lisu
+- fix build with libnotify 0.7
+
 Revision 1.19  2011/04/07 08:30:01  lisu
 - rel 2
 

================================================================
Index: packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-libnotify.patch
diff -u /dev/null packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-libnotify.patch:1.1
--- /dev/null	Thu Apr  7 10:40:54 2011
+++ packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra-libnotify.patch	Thu Apr  7 10:40:49 2011
@@ -0,0 +1,15 @@
+--- compiz-plugins-extra-0.8.6/src/notification/notification.c~	2010-03-29 16:09:18.000000000 +0200
++++ compiz-plugins-extra-0.8.6/src/notification/notification.c	2011-04-07 10:38:05.312531742 +0200
+@@ -103,7 +103,11 @@
+ 
+     n = notify_notification_new (logLevel,
+                                  message,
+-                                 iconUri, NULL);
++                                 iconUri
++#if !defined(NOTIFY_VERSION_MINOR) || (NOTIFY_VERSION_MAJOR == 0 && NOTIFY_VERSION_MINOR < 7)
++				 , NULL
++#endif
++				 );
+ 
+     notify_notification_set_timeout (n, nd->timeout);
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/compiz-fusion-plugins-extra/compiz-fusion-plugins-extra.spec?r1=1.19&r2=1.20&f=u