x11-misc/xneur: Add patch for libnotify-0.7 compatibility

svn path=/sunrise/; revision=11809

diff --git a/x11-misc/xneur/ChangeLog b/x11-misc/xneur/ChangeLog
index 614435a303b4f9d5fbdab9c645eeb523de9c3d9e..aa06a948b039b618c789f035e9956fca85ecd097 100644 (file)
--- a/x11-misc/xneur/ChangeLog
+++ b/x11-misc/xneur/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Mar 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -xneur-0.12.0.ebuild, +xneur-0.12.0-r1.ebuild,
+  +files/xneur-0.12.0-libnotify-0.7.patch:
+  Add patch for libnotify-0.7 compatibility
+
   01 Feb 2011; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   -xneur-0.11.1.ebuild, -files/xneur-0.11.1-openmp.patch,
   +xneur-0.12.0.ebuild:

diff --git a/x11-misc/xneur/Manifest b/x11-misc/xneur/Manifest
index 0c2726df5c3c6f3ee0d0fa3a01fe455d16780068..82191f83f53b9793aa838dc47795fdaca245c0ab 100644 (file)
--- a/x11-misc/xneur/Manifest
+++ b/x11-misc/xneur/Manifest
@@ -1,4 +1,5 @@
+AUX xneur-0.12.0-libnotify-0.7.patch 942 RMD160 7b387ed208aca4bda8c486357a3bdc96c6dd0599 SHA1 65ca63a725ec95cc71538bd0debca394be434b38 SHA256 a47904e04aac0167d0afe8fd9aa63f24acef65755bfc63744d98342c1538e295
 DIST xneur-0.12.0.tar.bz2 1088554 RMD160 0e5fa4012b69c4e82f7bcefe3e3c478f5500487a SHA1 aff607938f1cc1f7bd38b41b53ea8bf70a4db376 SHA256 962660306f138de44fbfcb458fffac59ce32000a49e2314e4f0460a98ac93327
-EBUILD xneur-0.12.0.ebuild 2466 RMD160 37750ba095ad31569af17da895cf482813bbf93a SHA1 1c90aba7bf1db75c99324fd1ff313e21530f6688 SHA256 a95ab84241b35a4dce7ffa08de093225b8b5e0e4ca9f3794374a88fd266840d8
-MISC ChangeLog 2215 RMD160 66c0c28320abd736956fce8d6c50e3ef591fe226 SHA1 23938f137606cfd0e72f5742173ee6e458611d24 SHA256 52470d01a7db70a2f43fe8410cdec0341557add692981df3333f366d2f60611e
+EBUILD xneur-0.12.0-r1.ebuild 2520 RMD160 ee0dabd6912e4dff9c500fe0045a6345e3ab9d3d SHA1 39056ec4c43885fddb0593491fcccc6e80069ec5 SHA256 1a654990ccb906fe42611d174b7dd3467b66c0bbac7edef9710e778545155200
+MISC ChangeLog 2422 RMD160 bcd4f006ceb5d69ba776f4d8f5d9e8c348c269fc SHA1 96467c8dcd2c5a7ddc0708a3028f6ea303a1ebd9 SHA256 865a64517f56b1b19b7d2f6a5a48d6fb35ca7eabcd692727a5de6f16ac48f6f2
 MISC metadata.xml 474 RMD160 4973d641049a2ff4fee27892be5fe67647bad186 SHA1 0208c219f21a0d4c7cd84ba5962e7f2901426f4a SHA256 dfe27aab6e4b47d75ab37a7d4e07f936e5e3577ce277dfd8c0eb0493b813d09e

diff --git a/x11-misc/xneur/files/xneur-0.12.0-libnotify-0.7.patch b/x11-misc/xneur/files/xneur-0.12.0-libnotify-0.7.patch
new file mode 100644 (file)
index 0000000..080dcc6
--- /dev/null
+++ b/x11-misc/xneur/files/xneur-0.12.0-libnotify-0.7.patch
@@ -0,0 +1,28 @@
+diff -ru xneur-0.12.0-orig/lib/notify/popup.c xneur-0.12.0/lib/notify/popup.c
+--- xneur-0.12.0-orig/lib/notify/popup.c       2011-01-27 05:25:42.000000000 -0500
++++ xneur-0.12.0/lib/notify/popup.c    2011-03-12 02:21:20.411001315 -0500
+@@ -27,6 +27,10 @@
+ 
+ #include <libnotify/notify.h>
+ 
++#ifndef NOTIFY_CHECK_VERSION /* macro did not exist before libnotify-0.5.2 */
++#  define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #include <pthread.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -73,8 +77,12 @@
+               popup_body->header = popup_body->content;
+               popup_body->content = NULL;
+       }
+-      
++
++#if NOTIFY_CHECK_VERSION(0,7,0)
++      NotifyNotification *notify = notify_notification_new(popup_body->header, popup_body->content, icon);
++#else
+       NotifyNotification *notify = notify_notification_new(popup_body->header, popup_body->content, icon, NULL);
++#endif
+ 
+       notify_notification_set_category(notify, type);
+       notify_notification_set_urgency(notify, urgency);

diff --git a/x11-misc/xneur/xneur-0.12.0.ebuild b/x11-misc/xneur/xneur-0.12.0-r1.ebuild
similarity index 97%
rename from x11-misc/xneur/xneur-0.12.0.ebuild
rename to x11-misc/xneur/xneur-0.12.0-r1.ebuild
index 69235618b363c05ac74ba24e4562ba796f3bd30b..2d3e57551dccda61138eb9c32d5cad0ef8fef2f1 100644 (file)
--- a/x11-misc/xneur/xneur-0.12.0.ebuild
+++ b/x11-misc/xneur/xneur-0.12.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="In-place conversion of text typed in with a wrong keyboard layout (Punto Switcher replacement)"
 HOMEPAGE="http://www.xneur.ru/"
@@ -43,6 +43,7 @@ src_prepare() {
                ltmain.sh aclocal.m4 || die
 
        sed -i -e "s/-Werror -g0//" configure.in
+       epatch "${FILESDIR}/${P}-libnotify-0.7.patch"
        eautoreconf
 }