Fri Dec 27 23:54:04 UTC 2013

7 files changed, 0 insertions, 266 deletions

diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
deleted file mode 100644
index 7558c06e5..000000000
--- a/extra/rdesktop/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 193090 2013-08-15 23:15:47Z eric $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Dan McGee <dan@archlinux.org>
-
-pkgname=rdesktop
-pkgver=1.8.0
-pkgrel=3
-pkgdesc="An open source client for Windows Remote Desktop Services"
-arch=('i686' 'x86_64')
-url="http://www.rdesktop.org/"
-license=('GPL3')
-depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch' 'rdesktop-tcp.patch'
-	rdesktop-r1729.patch rdesktop-r1731.patch rdesktop-r1732.patch)
-sha1sums=('2d39a41d29ad1ad2509d1e343a2817a3c7d666de'
-          '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d'
-          '68a48061e5ed76150c1444891a192f7884fd056e'
-          'a14793c72194bed74725bcf75fdb8b93c7577399'
-          '972d6ec59cf140383880464e3ef43e03969f3bfe'
-          '9a417aba27ded0ab595cbb07fccd452bdc0af20c'
-          '1bc92e04058a2f5c02f42a5c97da7ee672a71698')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  # FS#15113
-  patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
-
-  # Fix libao segfault, from Fedora
-  patch -i "${srcdir}/rdesktop-libao.patch"
-
-  # FS#36488
-  patch -i "${srcdir}/rdesktop-tcp.patch"
-  patch -i "${srcdir}/rdesktop-r1731.patch"
-  patch -i "${srcdir}/rdesktop-r1732.patch"
-
-  # FS#36505
-  patch -i "${srcdir}/rdesktop-r1729.patch"
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --enable-smartcard \
-    --with-ipv6
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch
deleted file mode 100644
index 9def24443..000000000
--- a/extra/rdesktop/rdesktop-libao.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: rdpsnd_libao.c
-===================================================================
---- rdpsnd_libao.c	(revision 1729)
-+++ rdpsnd_libao.c	(revision 1730)
-@@ -111,6 +111,7 @@
- {
- 	ao_sample_format format;
- 
-+	memset(&format, 0, sizeof(format));
- 	format.bits = pwfx->wBitsPerSample;
- 	format.channels = pwfx->nChannels;
- 	format.rate = 44100;
diff --git a/extra/rdesktop/rdesktop-r1729.patch b/extra/rdesktop/rdesktop-r1729.patch
deleted file mode 100644
index 3f38a692c..000000000
--- a/extra/rdesktop/rdesktop-r1729.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: scard.c
-===================================================================
---- scard.c	(revision 1728)
-+++ scard.c	(revision 1729)
-@@ -2,8 +2,8 @@
-    rdesktop: A Remote Desktop Protocol client.
-    Smart Card support
-    Copyright (C) Alexi Volkov <alexi@myrealbox.com> 2006
--   Copyright 2010 Pierre Ossman <ossman@cendio.se> for Cendio AB
--   Copyright 2011 Henrik Andersson <hean01@cendio.se> for Cendio AB
-+   Copyright 2010-2013 Pierre Ossman <ossman@cendio.se> for Cendio AB
-+   Copyright 2011-2013 Henrik Andersson <hean01@cendio.se> for Cendio AB
- 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -1109,6 +1109,7 @@
- 	MYPCSC_SCARDCONTEXT myHContext;
- 	SERVER_DWORD dwTimeout;
- 	SERVER_DWORD dwCount;
-+	SERVER_DWORD dwPointerId;
- 	SERVER_LPSCARD_READERSTATE_A rsArray, cur;
- 	MYPCSC_LPSCARD_READERSTATE_A myRsArray;
- 	long i;
-@@ -1133,7 +1134,8 @@
- 		memset(rsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE_A));
- 		for (i = 0, cur = rsArray; i < dwCount; i++, cur++)
- 		{
--			in_uint32_le(in, cur->szReader);
-+			in_uint32_le(in, dwPointerId);
-+			cur->szReader = (char *)(intptr_t)dwPointerId;
- 			in_uint32_le(in, cur->dwCurrentState);
- 			in_uint32_le(in, cur->dwEventState);
- 			in_uint32_le(in, cur->cbAtr);
diff --git a/extra/rdesktop/rdesktop-r1731.patch b/extra/rdesktop/rdesktop-r1731.patch
deleted file mode 100644
index f72728191..000000000
--- a/extra/rdesktop/rdesktop-r1731.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rdesktop.c
-===================================================================
---- rdesktop.c	(revision 1730)
-+++ rdesktop.c	(revision 1731)
-@@ -87,7 +87,7 @@
- RD_BOOL g_sendmotion = True;
- RD_BOOL g_bitmap_cache = True;
- RD_BOOL g_bitmap_cache_persist_enable = False;
--RD_BOOL g_bitmap_cache_precache = True;
-+RD_BOOL g_bitmap_cache_precache = False;
- RD_BOOL g_use_ctrl = True;
- RD_BOOL g_encryption = True;
- RD_BOOL g_encryption_initial = True;
diff --git a/extra/rdesktop/rdesktop-r1732.patch b/extra/rdesktop/rdesktop-r1732.patch
deleted file mode 100644
index a4260d0d0..000000000
--- a/extra/rdesktop/rdesktop-r1732.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: proto.h
-===================================================================
---- proto.h	(revision 1731)
-+++ proto.h	(revision 1732)
-@@ -144,6 +144,7 @@
- char *l_to_a(long N, int base);
- int load_licence(unsigned char **data);
- void save_licence(unsigned char *data, int length);
-+void rd_create_ui(void);
- RD_BOOL rd_pstcache_mkdir(void);
- int rd_open_file(char *filename);
- void rd_close_file(int fd);
-Index: rdp.c
-===================================================================
---- rdp.c	(revision 1731)
-+++ rdp.c	(revision 1732)
-@@ -1044,6 +1044,9 @@
- 	uint8 type;
- 	uint16 len_src_descriptor, len_combined_caps;
- 
-+	/* at this point we need to ensure that we have ui created */
-+	rd_create_ui();
-+
- 	in_uint32_le(s, g_rdp_shareid);
- 	in_uint16_le(s, len_src_descriptor);
- 	in_uint16_le(s, len_combined_caps);
-Index: rdesktop.c
-===================================================================
---- rdesktop.c	(revision 1731)
-+++ rdesktop.c	(revision 1732)
-@@ -87,7 +87,7 @@
- RD_BOOL g_sendmotion = True;
- RD_BOOL g_bitmap_cache = True;
- RD_BOOL g_bitmap_cache_persist_enable = False;
--RD_BOOL g_bitmap_cache_precache = False;
-+RD_BOOL g_bitmap_cache_precache = True;
- RD_BOOL g_use_ctrl = True;
- RD_BOOL g_encryption = True;
- RD_BOOL g_encryption_initial = True;
-@@ -1132,13 +1132,7 @@
- 		DEBUG(("Connection successful.\n"));
- 		memset(password, 0, sizeof(password));
- 
--		/* only create a window if we dont have one intialized */
--		if (!ui_have_window())
--		{
--			if (!ui_create_window())
--				return EX_OSERR;
--		}
--
-+		rd_create_ui();
- 		tcp_run_ui(True);
- 
- 		g_redirect = False;
-@@ -1732,6 +1726,18 @@
- 	close(fd);
- }
- 
-+/* create rdesktop ui */
-+void
-+rd_create_ui()
-+{
-+	/* only create a window if we dont have one intialized */
-+	if (!ui_have_window())
-+	{
-+		if (!ui_create_window())
-+			return EX_OSERR;
-+	}
-+}
-+
- /* Create the bitmap cache directory */
- RD_BOOL
- rd_pstcache_mkdir(void)
diff --git a/extra/rdesktop/rdesktop-send_physical_buttons.diff b/extra/rdesktop/rdesktop-send_physical_buttons.diff
deleted file mode 100644
index 69620988f..000000000
--- a/extra/rdesktop/rdesktop-send_physical_buttons.diff
+++ /dev/null
@@ -1,70 +0,0 @@
-? aclocal.m4
-Index: rdesktop.c
-===================================================================
-RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
-retrieving revision 1.163
-diff -u -r1.163 rdesktop.c
---- rdesktop.c	5 Apr 2008 06:15:45 -0000	1.163
-+++ rdesktop.c	5 Aug 2008 11:46:04 -0000
-@@ -73,6 +73,7 @@
- int g_win_button_size = 0;	/* If zero, disable single app mode */
- RD_BOOL g_bitmap_compression = True;
- RD_BOOL g_sendmotion = True;
-+RD_BOOL g_send_physical_buttons = True;
- RD_BOOL g_bitmap_cache = True;
- RD_BOOL g_bitmap_cache_persist_enable = False;
- RD_BOOL g_bitmap_cache_precache = True;
-@@ -152,6 +153,7 @@
- 	fprintf(stderr, "   -B: use BackingStore of X-server (if available)\n");
- 	fprintf(stderr, "   -e: disable encryption (French TS)\n");
- 	fprintf(stderr, "   -E: disable encryption from client to server\n");
-+	fprintf(stderr, "   -M: do not map logical mouse buttons to physical\n");
- 	fprintf(stderr, "   -m: do not send motion events\n");
- 	fprintf(stderr, "   -C: use private colour map\n");
- 	fprintf(stderr, "   -D: hide window manager decorations\n");
-@@ -450,7 +452,7 @@
- #endif
- 
- 	while ((c = getopt(argc, argv,
--			   VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
-+			   VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitMmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
- 	{
- 		switch (c)
- 		{
-@@ -584,6 +586,9 @@
- 			case 'E':
- 				g_packet_encryption = False;
- 				break;
-+			case 'M':
-+				g_send_physical_buttons = False;
-+				break;
- 			case 'm':
- 				g_sendmotion = False;
- 				break;
-Index: xwin.c
-===================================================================
-RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
-retrieving revision 1.235
-diff -u -r1.235 xwin.c
---- xwin.c	11 Jul 2008 03:51:23 -0000	1.235
-+++ xwin.c	5 Aug 2008 11:46:06 -0000
-@@ -36,6 +36,7 @@
- extern int g_ypos;
- extern int g_pos;
- extern RD_BOOL g_sendmotion;
-+extern RD_BOOL g_send_physical_buttons;
- extern RD_BOOL g_fullscreen;
- extern RD_BOOL g_grab_keyboard;
- extern RD_BOOL g_hide_decorations;
-@@ -2190,7 +2191,8 @@
- 	   receive physical buttons (true in mstsc as well) and
- 	   logical button behavior depends on the remote desktop's own
- 	   mouse settings */
--	xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1];
-+	if (g_send_physical_buttons)
-+		xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1];
- 	button = xkeymap_translate_button(xevent.xbutton.button);
- 	if (button == 0)
- 		return;
-
- 	  	 
diff --git a/extra/rdesktop/rdesktop-tcp.patch b/extra/rdesktop/rdesktop-tcp.patch
deleted file mode 100644
index f20182978..000000000
--- a/extra/rdesktop/rdesktop-tcp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rdesktop/trunk/tcp.c
-+++ b/rdesktop/trunk/tcp.c
-@@ -193,7 +193,7 @@
- 	int rcvd = 0, ssl_err;
- 
- 	if (g_network_error == True)
--		return;
-+		return NULL;
- 
- 	if (s == NULL)
- 	{