Fix building with x11-libs/libnotify 0.5.x series wrt #354087 by Diego Elio Pettenò.

Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64

4 files changed, 44 insertions, 15 deletions

diff --git a/app-pda/syncevolution/ChangeLog b/app-pda/syncevolution/ChangeLog
index 7efbd9e78570..b4bdbe924730 100644
--- a/app-pda/syncevolution/ChangeLog
+++ b/app-pda/syncevolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-pda/syncevolution
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/syncevolution/ChangeLog,v 1.3 2011/01/10 03:58:46 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/syncevolution/ChangeLog,v 1.4 2011/02/08 15:32:16 ssuominen Exp $
+
+  08 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  syncevolution-1.1.1.ebuild, +files/syncevolution-1.1.1-libnotify-0.5.x.patch:
+  Fix building with x11-libs/libnotify 0.5.x series wrt #354087 by Diego Elio
+  Pettenò.
 
 *syncevolution-1.1.1 (10 Jan 2011)
 
diff --git a/app-pda/syncevolution/Manifest b/app-pda/syncevolution/Manifest
index 7caeab7695fb..f53212e6cf0d 100644
--- a/app-pda/syncevolution/Manifest
+++ b/app-pda/syncevolution/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX syncevolution-1.1.1-libnotify-0.5.x.patch 921 RMD160 4d01553bb795642c05229612e36c0a5b56c0e73c SHA1 ff32e03426d2b342901e96d3076070c3c465864c SHA256 d42cc4fba2f4855f23a434b97957328bb9125780576d7d005ee9cf38c232d04f
 DIST syncevolution-1.0.tar.gz 11486957 RMD160 e7af91e17b426a8f26f8af18203c6b12d87e7696 SHA1 12d7ed0a94646d09ca930951e5a8034d8cb8142a SHA256 d5964eaffcbe70e0cc8c166ec557a887bb2df668117d67a7336eeb36d6df3312
 DIST syncevolution-1.1.1.tar.gz 11550798 RMD160 b64a803f14b3c36ad72e41409d5631d0b9231a4a SHA1 bdf056e0ee44891cc8516a56ad3191b9d23fc6cb SHA256 c11e31198228a1e9cdc093791bf61f142d2982b76d72e0d1d1fc3fcb1e6ff645
 EBUILD syncevolution-1.0.ebuild 1553 RMD160 16e43bcee56c27643ff4f9fd62cc896a69f863ff SHA1 ec686c95ec642bba0fb800ac89786f4fe5559464 SHA256 388a120f8fe97b6e4ac819c9b8c1a122113b8b70a64a0f61f14107f8b5a4aa93
-EBUILD syncevolution-1.1.1.ebuild 1754 RMD160 d7873325d1d54f8fba32c61b959d4fbd5aca8fe8 SHA1 4bbcceaec0cb8581e2dbaae31b4a46d5daff556d SHA256 049002b5ee1bbd9950fbd9dd20bc7453c8227ff3f565451ff628f0732f9e4893
-MISC ChangeLog 648 RMD160 b2575514a603405d41418fd3c7fa82aeeb9771a6 SHA1 c5c2ddda6361ed66b6418cd56603cf7c2b21cdfa SHA256 d64edd79b463a099f00631139be1ed4432ee587956b4b09c71f10db44d889eec
+EBUILD syncevolution-1.1.1.ebuild 1852 RMD160 a3437dca10f14a69cab6f0d02018beae35fc2f3d SHA1 5cc85b42bc637736b6f7dd373e4a47ff4a9eef21 SHA256 c55604993d6741154c0a001ba8cb329a440a67dbd279f07ccd0ab83461c7adf2
+MISC ChangeLog 876 RMD160 a325a771462ca74fff9007204190374bc7f94b29 SHA1 5f1815f331d85811c56abb1ff3dbe88b91dc83e8 SHA256 cf9ac5528efc13638c9d1c5c66cc1f60d1564007f42b013ec8c25aa9411b3e79
 MISC metadata.xml 218 RMD160 dcf0864821f82cd4da3e0da4d518166f6045b7b5 SHA1 ca615ae28fbffc0e7e3d1e51e189fbd245fddcc4 SHA256 983941334731e33b40df7a8643ee1f0e415ff4a4e2c90e1a4ac80a852792fb47
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk0qg/wACgkQmOfEJZHYOKfB7gCgltHTfGfKflv7fHWJB+CHTtj1
-0EsAoNg0jglvHIL6fqTtFj1ABJPpWeZ1
-=qRoj
------END PGP SIGNATURE-----
diff --git a/app-pda/syncevolution/files/syncevolution-1.1.1-libnotify-0.5.x.patch b/app-pda/syncevolution/files/syncevolution-1.1.1-libnotify-0.5.x.patch
new file mode 100644
index 000000000000..ca24e48e583a
--- /dev/null
+++ b/app-pda/syncevolution/files/syncevolution-1.1.1-libnotify-0.5.x.patch
@@ -0,0 +1,28 @@
+--- src/syncevo-dbus-server.cpp
++++ src/syncevo-dbus-server.cpp
+@@ -64,6 +64,9 @@
+ 
+ #ifdef HAS_NOTIFY
+ #include <libnotify/notify.h>
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
+ #endif
+ 
+ class DBusMessage;
+@@ -6108,10 +6111,11 @@
+         notify_notification_clear_actions(m_notification);
+         notify_notification_close(m_notification, NULL);
+     }
+-#if !defined(NOTIFY_CHECK_VERSION)
+-    m_notification = notify_notification_new(summary, body, NULL, NULL);
+-#else // NOTIFY_CHECK_VERSION(0,7,0) is redundant, because 0.7.0 introduced NOTIFY_CHECK_VERSION
+-    m_notification = notify_notification_new(summary, body, NULL);
++    m_notification = notify_notification_new(summary, body, NULL
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++    );
++#else
++    , NULL);
+ #endif
+     //if actions are not supported, don't add actions
+     //An example is Ubuntu Notify OSD. It uses an alert box
diff --git a/app-pda/syncevolution/syncevolution-1.1.1.ebuild b/app-pda/syncevolution/syncevolution-1.1.1.ebuild
index 0e3a866dab94..48fa524d90fa 100644
--- a/app-pda/syncevolution/syncevolution-1.1.1.ebuild
+++ b/app-pda/syncevolution/syncevolution-1.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/syncevolution/syncevolution-1.1.1.ebuild,v 1.1 2011/01/10 03:58:46 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/syncevolution/syncevolution-1.1.1.ebuild,v 1.2 2011/02/08 15:32:16 ssuominen Exp $
 
 EAPI=2
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="A SyncML desktop client and server"
 HOMEPAGE="http://syncevolution.org/"
@@ -65,3 +65,8 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-gui=no"
 	fi
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.5.x.patch
+	gnome2_src_prepare
+}