From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Pu7A2-0001Hy-1F for garchives@archives.gentoo.org; Mon, 28 Feb 2011 17:45:30 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 973CC1C02A; Mon, 28 Feb 2011 17:45:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6535E1C02A for ; Mon, 28 Feb 2011 17:45:22 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C84C51B4177 for ; Mon, 28 Feb 2011 17:45:21 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2166) id 60EEF20054; Mon, 28 Feb 2011 17:45:20 +0000 (UTC) From: "Samuli Suominen (ssuominen)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, ssuominen@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-plugins/compiz-plugins-extra/files: compiz-plugins-extra-0.8.6-libnotify.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: compiz-plugins-extra-0.8.6-libnotify.patch X-VCS-Directories: x11-plugins/compiz-plugins-extra/files X-VCS-Committer: ssuominen X-VCS-Committer-Name: Samuli Suominen Content-Type: text/plain; charset=utf8 Message-Id: <20110228174520.60EEF20054@flycatcher.gentoo.org> Date: Mon, 28 Feb 2011 17:45:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a9f23ba3a151f455de55046d3626be23 ssuominen 11/02/28 17:45:20 Modified: compiz-plugins-extra-0.8.6-libnotify.patch Log: Fix building with x11-libs/libnotify >=3D 0.7 wrt #354761 by Diego Elio= Petten=C3=B2. =20 (Portage version: 2.2.0_alpha25/cvs/Linux x86_64) Revision Changes Path 1.2 x11-plugins/compiz-plugins-extra/files/compiz-plugin= s-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=3D1.2= &view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/compiz= -plugins-extra/files/compiz-plugins-extra-0.8.6-libnotify.patch?rev=3D1.2= &content-type=3Dtext/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=3D1.1&= r2=3D1.2 Index: compiz-plugins-extra-0.8.6-libnotify.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D 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 -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- 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_mouse= poll=3Dyes], [have_compiz_mousepoll=3Dno]) AM_CONDITIONAL(SHOWMOUSE_PLUGIN, test "x$have_compiz_mousepoll" =3D "xy= es") =20 @@ -17,3 +15,31 @@ AC_DEFINE(USE_NOTIFICATION, 1, [Build notification plugin]) fi =20 +--- src/notification/notification.c ++++ src/notification/notification.c +@@ -21,6 +21,11 @@ +=20 +=20 + #include ++ ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #include + #include + #include +@@ -103,7 +108,12 @@ +=20 + n =3D notify_notification_new (logLevel, + message, +- iconUri, NULL); ++ iconUri ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif +=20 + notify_notification_set_timeout (n, nd->timeout); +=20