Adding KDE integration patch and closing bug #58312.

5 files changed, 141 insertions, 7 deletions

diff --git a/net-misc/rdesktop/ChangeLog b/net-misc/rdesktop/ChangeLog
index daf1d7333b96..950fa227a140 100644
--- a/net-misc/rdesktop/ChangeLog
+++ b/net-misc/rdesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/rdesktop
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.38 2004/07/19 02:31:32 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/ChangeLog,v 1.39 2004/08/18 20:13:22 wolf31o2 Exp $
+
+*rdesktop-1.3.1-r1 (18 Aug 2004)
+
+  18 Aug 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/rdesktop-1.3.1-kde.patch, +rdesktop-1.3.1-r1.ebuild:
+  Adding KDE integration patch and closing bug #58312.
 
   18 Jul 2004; Tom Gall <tgall@gentoo.org> rdesktop-1.3.1.ebuild:
   stable on ppc64, bug #57126
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index f0c0acdbc983..002a32d3019c 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,9 +1,12 @@
-MD5 f9da0a15c597a136734141ec99233093 ChangeLog 4962
-MD5 ba5cbd501be829c4dd810293a86e28c2 metadata.xml 554
-MD5 beec453a865a647e9eb3e4078b6d7ede rdesktop-1.3.0-r1.ebuild 1824
+MD5 73b0945abef33059f76e8a3b96342be8 rdesktop-1.3.1-r1.ebuild 1181
 MD5 37d16d26fe9d7d4b4f39f0520e56ed73 rdesktop-1.3.1.ebuild 978
-MD5 b8fee27ff14cefe2a9bde06b992b01a0 files/digest-rdesktop-1.3.0-r1 66
+MD5 beec453a865a647e9eb3e4078b6d7ede rdesktop-1.3.0-r1.ebuild 1824
+MD5 64a5a234eaa658b13a84a3531920f7cc ChangeLog 5171
+MD5 ba5cbd501be829c4dd810293a86e28c2 metadata.xml 554
+MD5 4120908a83d84e4150a2cce191f2bbc0 files/rdesktop-1.3.0-last-two-certs.patch 1146
+MD5 a843f83ff14be3e87d5528c3c31416ed files/rdesktop-1.3.1-kde.patch 2409
 MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1 66
-MD5 4ff22b875cb790ab578b6ef3426225ee files/rdesktop-1.3.0-builtin-license.patch 2395
 MD5 575e5d9fe8a75cb24dcf3c4d1f4348b4 files/rdesktop-1.3.0-geometry.patch 1868
-MD5 4120908a83d84e4150a2cce191f2bbc0 files/rdesktop-1.3.0-last-two-certs.patch 1146
+MD5 b8fee27ff14cefe2a9bde06b992b01a0 files/digest-rdesktop-1.3.0-r1 66
+MD5 3f26cdcaa9d46e40bcf78e879cac3d14 files/digest-rdesktop-1.3.1-r1 66
+MD5 4ff22b875cb790ab578b6ef3426225ee files/rdesktop-1.3.0-builtin-license.patch 2395
diff --git a/net-misc/rdesktop/files/digest-rdesktop-1.3.1-r1 b/net-misc/rdesktop/files/digest-rdesktop-1.3.1-r1
new file mode 100644
index 000000000000..928168058f7c
--- /dev/null
+++ b/net-misc/rdesktop/files/digest-rdesktop-1.3.1-r1
@@ -0,0 +1 @@
+MD5 968a1e3f5161bab80c306df31c54cfb1 rdesktop-1.3.1.tar.gz 139686
diff --git a/net-misc/rdesktop/files/rdesktop-1.3.1-kde.patch b/net-misc/rdesktop/files/rdesktop-1.3.1-kde.patch
new file mode 100644
index 000000000000..015aed8ac5fb
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.3.1-kde.patch
@@ -0,0 +1,76 @@
+--- rdesktop-1.3.1/rdesktop.c.orig	2004-03-08 18:02:58.000000000 +0100
++++ rdesktop-1.3.1/rdesktop.c		2004-03-09 22:32:19.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include <sys/time.h>		/* gettimeofday */
+ #include <sys/times.h>		/* times */
+ #include <errno.h>
++#include <X11/Xlib.h>           /* Window */
+ #include "rdesktop.h"
+ 
+ #ifdef EGD_SOCKET
+@@ -68,6 +69,7 @@
+ BOOL g_console_session = False;
+ BOOL g_numlock_sync = False;
+ extern BOOL g_owncolmap;
++extern Window g_embed_wnd;
+ 
+ #ifdef WITH_RDPSND
+ BOOL g_rdpsnd = False;
+@@ -112,6 +114,7 @@
+ 	fprintf(stderr, "   -S: caption button size (single application mode)\n");
+ 	fprintf(stderr, "   -T: window title\n");
+ 	fprintf(stderr, "   -N: enable numlock synchronisation\n");
++        fprintf(stderr, "   -X: embed into another window with a given id.\n");
+ 	fprintf(stderr, "   -a: connection colour depth\n");
+ 	fprintf(stderr, "   -r: enable specified device redirection (currently: sound)\n");
+ 	fprintf(stderr, "   -0: attach to console\n");
+@@ -224,6 +227,7 @@
+ 	prompt_password = False;
+ 	domain[0] = password[0] = shell[0] = directory[0] = 0;
+ 	strcpy(keymapname, "en-us");
++	g_embed_wnd = 0;
+ 
+ #ifdef RDP2VNC
+ #define VNCOPT "V:Q:"
+@@ -231,7 +235,7 @@
+ #define VNCOPT
+ #endif
+ 
+-	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:Na:r:045h?")) != -1)
++	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:NX:a:r:045h?")) != -1)
+ 	{
+ 		switch (c)
+ 		{
+@@ -374,6 +378,10 @@
+ 				g_numlock_sync = True;
+ 				break;
+ 
++                        case 'X':
++                                g_embed_wnd = strtod(optarg, NULL);
++                                break;
++
+ 			case 'a':
+ 				g_server_bpp = strtol(optarg, NULL, 10);
+ 				if (g_server_bpp != 8 && g_server_bpp != 16 && g_server_bpp != 15
+--- rdesktop-1.3.1/xwin.c.orig	2004-03-08 18:02:58.000000000 +0100
++++ rdesktop-1.3.1/xwin.c	2004-03-10 16:17:59.000000000 +0100
+@@ -41,6 +41,7 @@
+ static int g_x_socket;
+ static Screen *g_screen;
+ Window g_wnd;
++Window g_embed_wnd;
+ BOOL g_enable_compose = False;
+ static GC g_gc;
+ static BOOL g_gc_initialized = False;
+@@ -929,6 +930,11 @@
+ 		XFree(sizehints);
+ 	}
+ 
++        if ( g_embed_wnd )
++        {
++                XReparentWindow(g_display, g_wnd, g_embed_wnd, 0, 0);
++        }
++
+ 	input_mask = KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
+ 		VisibilityChangeMask | FocusChangeMask;
+ 
diff --git a/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild b/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..151f69fbb37e
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rdesktop/rdesktop-1.3.1-r1.ebuild,v 1.1 2004/08/18 20:13:22 wolf31o2 Exp $
+
+inherit eutils
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~ppc64"
+IUSE="kde ssl debug"
+
+DEPEND="virtual/x11
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+
+src_unpack() {
+	unpack ${A}
+
+	# Apply KDE 3.3.0 compatibility patch from KDE CVS submitted to bug #58312
+	# by Ronald Moesbergen <r.moesbergen@hccnet.nl>
+	use kde && epatch ${FILESDIR}/${P}-kde.patch
+}
+
+src_compile() {
+	local myconf
+	use ssl \
+		&& myconf="--with-openssl=/usr/include/openssl" \
+		|| myconf="--without-openssl"
+
+	sed -i -e '/-O2/c\' -e 'cflags="$cflags ${CFLAGS}"' configure
+
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--sharedir=/usr/share/${PN} \
+		`use_with debug` \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install
+	dodoc COPYING doc/HACKING doc/TODO doc/keymapping.txt
+}