Fix missing depend and building with x11-libs/libnotify >= 0.7 wrt #357087 by Martin LORANG.

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

4 files changed, 70 insertions, 8 deletions

diff --git a/net-misc/tsclient/ChangeLog b/net-misc/tsclient/ChangeLog
index 35212c793d30..fa8a1f687a45 100644
--- a/net-misc/tsclient/ChangeLog
+++ b/net-misc/tsclient/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tsclient
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/ChangeLog,v 1.33 2010/11/02 02:55:05 ford_prefect Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/ChangeLog,v 1.34 2011/03/13 08:19:39 ssuominen Exp $
+
+  13 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> tsclient-2.0.1.ebuild,
+  +files/tsclient-2.0.1-libnotify-0.7.patch:
+  Fix missing depend and building with x11-libs/libnotify >= 0.7 wrt #357087 by
+  Martin LORANG.
 
   02 Nov 2010; Arun Raghavan <ford_prefect@gentoo.org>
   tsclient-2.0.1.ebuild:
diff --git a/net-misc/tsclient/Manifest b/net-misc/tsclient/Manifest
index 469fd29ca855..b853dad81e75 100644
--- a/net-misc/tsclient/Manifest
+++ b/net-misc/tsclient/Manifest
@@ -1,5 +1,6 @@
+AUX tsclient-2.0.1-libnotify-0.7.patch 1724 RMD160 8da1e2c0ac46f8cfa2676b5bc5a0c25ad4a072c3 SHA1 c27d6b5a48378308704ef69f264524f9bd1923ee SHA256 08e32d686dad38750eedf9a947696e2e468b25699e023b0600caede923d048a4
 AUX tsclient-2.0.1-no-networkmanager.patch 1537 RMD160 994a72e8cbf9a7dad193b85c9986beb8e6c52920 SHA1 fd2fe33c36b64f023ccb403855eb93a4d7de252b SHA256 21c560398532d7bcf89447ba14daab74f6fa29e5d6c2d34ff71883937603c3f1
 DIST tsclient-2.0.1.tar.bz2 360232 RMD160 662b28a84c59c018628c584e82855c238443c239 SHA1 be80de4bbec2ffb23786acb24fd1f11df8d7fe69 SHA256 0ec9c6c320e244bc2e7d5a745136ca0c935c575fe3d14dd680253843efc68c0d
-EBUILD tsclient-2.0.1.ebuild 1556 RMD160 9c7fb1b8739a081abb3f6f8db66650778fc9c969 SHA1 ca8f2db1f47fe428ba1ad70851ba0214d3f43271 SHA256 a5f9f35425516db7854eddd797b2417c2ee7b2850b5de01d9805323c8c80cae5
-MISC ChangeLog 4791 RMD160 4a9f59ce91fce0ec7cf263d1f585adfc87caf7cb SHA1 c9f0a968508c43bcfcbb6f4e71b6ceb56f4cf5b8 SHA256 5d1deaf4e5bcf0f5c8bf119619f3c63c92908db5a98fc28793b2a84367123e2c
+EBUILD tsclient-2.0.1.ebuild 1616 RMD160 180cd40c894964d4499f8590086e442d985cb03a SHA1 c916f04cf2a55464ab44c3803e6182e79da2b9ba SHA256 860d11580ecbde4b8b0e29cff37e046365bbaaf6f80dffeb7c6993c13ab50225
+MISC ChangeLog 5008 RMD160 f34cf055c3340211d8a681166d527458a9cfb6f6 SHA1 148e0fc07002618f633283207b16fb6e2deeff76 SHA256 954dbd3573ab860da9a47a5e6d8cbf797806db35eb4b6dfd0595177a1721ea9b
 MISC metadata.xml 231 RMD160 e2fc63b915c34005d4a00f9491d4af9f0f512656 SHA1 93a3ea32c14c885f4a282f4a5a19ce1f59743a56 SHA256 9f9743606554a91a6c2999dc60fba9ffde65dd316b5910991be692866be47461
diff --git a/net-misc/tsclient/files/tsclient-2.0.1-libnotify-0.7.patch b/net-misc/tsclient/files/tsclient-2.0.1-libnotify-0.7.patch
new file mode 100644
index 000000000000..351f3fb16a05
--- /dev/null
+++ b/net-misc/tsclient/files/tsclient-2.0.1-libnotify-0.7.patch
@@ -0,0 +1,54 @@
+--- src/plugins/default/tsc-rdp-connection.c
++++ src/plugins/default/tsc-rdp-connection.c
+@@ -13,6 +13,10 @@
+ #include "tsc-connection.h"
+ #include "tsc-util.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #define RDP_CONFIG_GROUP "RDP"
+ #define RDP_KEY_HOST "host"
+ #define RDP_KEY_USERNAME "username"
+@@ -50,7 +54,12 @@
+ 				   tsc_connection_get_name (TSC_CONNECTION (connection)));
+ 	body = g_strdup_printf (_("You are connected to '%s' in fullscreen mode.  Use Control+Alt+Enter to switch to and from windowed mode."), tsc_connection_get_name (TSC_CONNECTION (connection)));
+ 	
+-	n = notify_notification_new (summary, body, GTK_STOCK_DIALOG_INFO, NULL);
++	n = notify_notification_new (summary, body, GTK_STOCK_DIALOG_INFO
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	);
++#else
++	, NULL);
++#endif
+ 	g_free (summary);
+ 	g_free (body);
+ 	
+--- src/plugins/default/tsc-vnc-connection.c
++++ src/plugins/default/tsc-vnc-connection.c
+@@ -8,6 +8,10 @@
+ #include "tsc-util.h"
+ #include "tsc-connection.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ #define VNC_CONFIG_GROUP "VNC"
+ #define VNC_KEY_HOST "host"
+ #define VNC_KEY_PASSWORD "password"
+@@ -39,7 +43,12 @@
+ 				   tsc_connection_get_name (TSC_CONNECTION (connection)));
+ 	body = g_strdup_printf (_("You are connected to '%s' in fullscreen mode.  Use F8 to switch to and from windowed mode."), tsc_connection_get_name (TSC_CONNECTION (connection)));
+ 
+-	n = notify_notification_new (summary, body, GTK_STOCK_DIALOG_INFO, NULL);
++	n = notify_notification_new (summary, body, GTK_STOCK_DIALOG_INFO
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++	);
++#else
++	, NULL);
++#endif
+ 	g_free (summary);
+ 	g_free (body);
+ 	
diff --git a/net-misc/tsclient/tsclient-2.0.1.ebuild b/net-misc/tsclient/tsclient-2.0.1.ebuild
index 1785b76d92fc..5f2871e8ae69 100644
--- a/net-misc/tsclient/tsclient-2.0.1.ebuild
+++ b/net-misc/tsclient/tsclient-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-2.0.1.ebuild,v 1.3 2010/11/02 02:55:05 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tsclient/tsclient-2.0.1.ebuild,v 1.4 2011/03/13 08:19:39 ssuominen Exp $
 
 EAPI=2
 
@@ -23,7 +23,8 @@ RDEPEND="x11-libs/gtk+:2
 	gnome-base/libglade:2.0
 	gnome-base/libgnome
 	gnome-base/libgnomeui
-	gnome-base/gnome-desktop:2"
+	gnome-base/gnome-desktop:2
+	x11-libs/libnotify"
 
 DEPEND="${RDEPEND}
 	gnome-base/gconf
@@ -34,7 +35,8 @@ RDEPEND="${RDEPEND}
 	>=net-misc/rdesktop-1.3.0"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-networkmanager.patch
+	epatch "${FILESDIR}"/${P}-no-networkmanager.patch \
+		"${FILESDIR}"/${P}-libnotify-0.7.patch
 
 	# For recent libgnomeui
 	sed -i -e 's:libgnome-2\.0:\0 libgnomeui-2\.0:' \