Date: Wednesday, November 20, 2013 @ 03:52:31 Author: eric Revision: 199943
upgpkg: rdesktop 1.8.1-1 Upstream update, Remove old patches Modified: rdesktop/trunk/PKGBUILD Deleted: rdesktop/trunk/rdesktop-libao.patch rdesktop/trunk/rdesktop-r1729.patch rdesktop/trunk/rdesktop-r1731.patch rdesktop/trunk/rdesktop-r1732.patch rdesktop/trunk/rdesktop-tcp.patch ----------------------+ PKGBUILD | 28 +++--------------- rdesktop-libao.patch | 12 -------- rdesktop-r1729.patch | 33 ---------------------- rdesktop-r1731.patch | 13 -------- rdesktop-r1732.patch | 73 ------------------------------------------------- rdesktop-tcp.patch | 11 ------- 6 files changed, 5 insertions(+), 165 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-11-20 02:11:51 UTC (rev 199942) +++ PKGBUILD 2013-11-20 02:52:31 UTC (rev 199943) @@ -4,8 +4,8 @@ # Contributor: Dan McGee <d...@archlinux.org> pkgname=rdesktop -pkgver=1.8.0 -pkgrel=3 +pkgver=1.8.1 +pkgrel=1 pkgdesc="An open source client for Windows Remote Desktop Services" arch=('i686' 'x86_64') url="http://www.rdesktop.org/" @@ -12,32 +12,14 @@ 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') + rdesktop-send_physical_buttons.diff) +sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8' + '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d') 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() { Deleted: rdesktop-libao.patch =================================================================== --- rdesktop-libao.patch 2013-11-20 02:11:51 UTC (rev 199942) +++ rdesktop-libao.patch 2013-11-20 02:52:31 UTC (rev 199943) @@ -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; Deleted: rdesktop-r1729.patch =================================================================== --- rdesktop-r1729.patch 2013-11-20 02:11:51 UTC (rev 199942) +++ rdesktop-r1729.patch 2013-11-20 02:52:31 UTC (rev 199943) @@ -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 <al...@myrealbox.com> 2006 -- Copyright 2010 Pierre Ossman <oss...@cendio.se> for Cendio AB -- Copyright 2011 Henrik Andersson <hea...@cendio.se> for Cendio AB -+ Copyright 2010-2013 Pierre Ossman <oss...@cendio.se> for Cendio AB -+ Copyright 2011-2013 Henrik Andersson <hea...@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); Deleted: rdesktop-r1731.patch =================================================================== --- rdesktop-r1731.patch 2013-11-20 02:11:51 UTC (rev 199942) +++ rdesktop-r1731.patch 2013-11-20 02:52:31 UTC (rev 199943) @@ -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; Deleted: rdesktop-r1732.patch =================================================================== --- rdesktop-r1732.patch 2013-11-20 02:11:51 UTC (rev 199942) +++ rdesktop-r1732.patch 2013-11-20 02:52:31 UTC (rev 199943) @@ -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) Deleted: rdesktop-tcp.patch =================================================================== --- rdesktop-tcp.patch 2013-11-20 02:11:51 UTC (rev 199942) +++ rdesktop-tcp.patch 2013-11-20 02:52:31 UTC (rev 199943) @@ -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) - {