[arch-commits] Commit in rdesktop/repos (14 files)
Eric Bélanger
eric at nymeria.archlinux.org
Sun Aug 11 19:09:28 UTC 2013
Date: Sunday, August 11, 2013 @ 21:09:27
Author: eric
Revision: 192435
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
rdesktop/repos/extra-i686/PKGBUILD
(from rev 192434, rdesktop/trunk/PKGBUILD)
rdesktop/repos/extra-i686/rdesktop-libao.patch
(from rev 192434, rdesktop/trunk/rdesktop-libao.patch)
rdesktop/repos/extra-i686/rdesktop-send_physical_buttons.diff
(from rev 192434, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
rdesktop/repos/extra-i686/rdesktop-tcp.patch
(from rev 192434, rdesktop/trunk/rdesktop-tcp.patch)
rdesktop/repos/extra-x86_64/PKGBUILD
(from rev 192434, rdesktop/trunk/PKGBUILD)
rdesktop/repos/extra-x86_64/rdesktop-libao.patch
(from rev 192434, rdesktop/trunk/rdesktop-libao.patch)
rdesktop/repos/extra-x86_64/rdesktop-send_physical_buttons.diff
(from rev 192434, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
rdesktop/repos/extra-x86_64/rdesktop-tcp.patch
(from rev 192434, rdesktop/trunk/rdesktop-tcp.patch)
Deleted:
rdesktop/repos/extra-i686/PKGBUILD
rdesktop/repos/extra-i686/rdesktop-libao.patch
rdesktop/repos/extra-i686/rdesktop-send_physical_buttons.diff
rdesktop/repos/extra-x86_64/PKGBUILD
rdesktop/repos/extra-x86_64/rdesktop-libao.patch
rdesktop/repos/extra-x86_64/rdesktop-send_physical_buttons.diff
--------------------------------------------------+
/PKGBUILD | 90 +++++++++++++
/rdesktop-libao.patch | 38 +++++
/rdesktop-send_physical_buttons.diff | 140 +++++++++++++++++++++
extra-i686/PKGBUILD | 41 ------
extra-i686/rdesktop-libao.patch | 19 --
extra-i686/rdesktop-send_physical_buttons.diff | 70 ----------
extra-i686/rdesktop-tcp.patch | 11 +
extra-x86_64/PKGBUILD | 41 ------
extra-x86_64/rdesktop-libao.patch | 19 --
extra-x86_64/rdesktop-send_physical_buttons.diff | 70 ----------
extra-x86_64/rdesktop-tcp.patch | 11 +
11 files changed, 290 insertions(+), 260 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-08-11 19:08:34 UTC (rev 192434)
+++ extra-i686/PKGBUILD 2013-08-11 19:09:27 UTC (rev 192435)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Dan McGee <dan at archlinux.org>
-
-pkgname=rdesktop
-pkgver=1.8.0
-pkgrel=1
-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')
-md5sums=('203d662ac20b22250bbbd525a9f29f3a'
- 'cbfb12729e7f28e497afb883cc42022b'
- '6514f31dc879a0a66c955e4e3348c143')
-
-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"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --enable-smartcard \
- --with-ipv6
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: rdesktop/repos/extra-i686/PKGBUILD (from rev 192434, rdesktop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-08-11 19:09:27 UTC (rev 192435)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+
+pkgname=rdesktop
+pkgver=1.8.0
+pkgrel=2
+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')
+md5sums=('203d662ac20b22250bbbd525a9f29f3a'
+ 'cbfb12729e7f28e497afb883cc42022b'
+ '6514f31dc879a0a66c955e4e3348c143'
+ 'f204fd8a40b16ca10d4962d4eaeca4db')
+
+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"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --enable-smartcard \
+ --with-ipv6
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/rdesktop-libao.patch
===================================================================
--- extra-i686/rdesktop-libao.patch 2013-08-11 19:08:34 UTC (rev 192434)
+++ extra-i686/rdesktop-libao.patch 2013-08-11 19:09:27 UTC (rev 192435)
@@ -1,19 +0,0 @@
-diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c
---- rdesktop-1.6.0/rdpsnd_libao.c.ao 2007-10-30 14:57:30.000000000 +0100
-+++ rdesktop-1.6.0/rdpsnd_libao.c 2010-12-02 21:22:39.000000000 +0100
-@@ -76,6 +76,7 @@ libao_open(void)
- format.channels = 2;
- format.rate = 44100;
- format.byte_format = AO_FMT_NATIVE;
-+ format.matrix = NULL;
-
- o_device = ao_open_live(default_driver, &format, NULL);
- if (o_device == NULL)
-@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx)
- format.channels = pwfx->nChannels;
- format.rate = 44100;
- format.byte_format = AO_FMT_NATIVE;
-+ format.matrix = NULL;
-
- if (o_device != NULL)
- ao_close(o_device);
Copied: rdesktop/repos/extra-i686/rdesktop-libao.patch (from rev 192434, rdesktop/trunk/rdesktop-libao.patch)
===================================================================
--- extra-i686/rdesktop-libao.patch (rev 0)
+++ extra-i686/rdesktop-libao.patch 2013-08-11 19:09:27 UTC (rev 192435)
@@ -0,0 +1,19 @@
+diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c
+--- rdesktop-1.6.0/rdpsnd_libao.c.ao 2007-10-30 14:57:30.000000000 +0100
++++ rdesktop-1.6.0/rdpsnd_libao.c 2010-12-02 21:22:39.000000000 +0100
+@@ -76,6 +76,7 @@ libao_open(void)
+ format.channels = 2;
+ format.rate = 44100;
+ format.byte_format = AO_FMT_NATIVE;
++ format.matrix = NULL;
+
+ o_device = ao_open_live(default_driver, &format, NULL);
+ if (o_device == NULL)
+@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx)
+ format.channels = pwfx->nChannels;
+ format.rate = 44100;
+ format.byte_format = AO_FMT_NATIVE;
++ format.matrix = NULL;
+
+ if (o_device != NULL)
+ ao_close(o_device);
Deleted: extra-i686/rdesktop-send_physical_buttons.diff
===================================================================
--- extra-i686/rdesktop-send_physical_buttons.diff 2013-08-11 19:08:34 UTC (rev 192434)
+++ extra-i686/rdesktop-send_physical_buttons.diff 2013-08-11 19:09:27 UTC (rev 192435)
@@ -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;
-
-
Copied: rdesktop/repos/extra-i686/rdesktop-send_physical_buttons.diff (from rev 192434, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
===================================================================
--- extra-i686/rdesktop-send_physical_buttons.diff (rev 0)
+++ extra-i686/rdesktop-send_physical_buttons.diff 2013-08-11 19:09:27 UTC (rev 192435)
@@ -0,0 +1,70 @@
+? 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;
+
+
Copied: rdesktop/repos/extra-i686/rdesktop-tcp.patch (from rev 192434, rdesktop/trunk/rdesktop-tcp.patch)
===================================================================
--- extra-i686/rdesktop-tcp.patch (rev 0)
+++ extra-i686/rdesktop-tcp.patch 2013-08-11 19:09:27 UTC (rev 192435)
@@ -0,0 +1,11 @@
+--- 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)
+ {
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-08-11 19:08:34 UTC (rev 192434)
+++ extra-x86_64/PKGBUILD 2013-08-11 19:09:27 UTC (rev 192435)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Dan McGee <dan at archlinux.org>
-
-pkgname=rdesktop
-pkgver=1.8.0
-pkgrel=1
-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')
-md5sums=('203d662ac20b22250bbbd525a9f29f3a'
- 'cbfb12729e7f28e497afb883cc42022b'
- '6514f31dc879a0a66c955e4e3348c143')
-
-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"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --enable-smartcard \
- --with-ipv6
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
Copied: rdesktop/repos/extra-x86_64/PKGBUILD (from rev 192434, rdesktop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-08-11 19:09:27 UTC (rev 192435)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+
+pkgname=rdesktop
+pkgver=1.8.0
+pkgrel=2
+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')
+md5sums=('203d662ac20b22250bbbd525a9f29f3a'
+ 'cbfb12729e7f28e497afb883cc42022b'
+ '6514f31dc879a0a66c955e4e3348c143'
+ 'f204fd8a40b16ca10d4962d4eaeca4db')
+
+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"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --enable-smartcard \
+ --with-ipv6
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/rdesktop-libao.patch
===================================================================
--- extra-x86_64/rdesktop-libao.patch 2013-08-11 19:08:34 UTC (rev 192434)
+++ extra-x86_64/rdesktop-libao.patch 2013-08-11 19:09:27 UTC (rev 192435)
@@ -1,19 +0,0 @@
-diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c
---- rdesktop-1.6.0/rdpsnd_libao.c.ao 2007-10-30 14:57:30.000000000 +0100
-+++ rdesktop-1.6.0/rdpsnd_libao.c 2010-12-02 21:22:39.000000000 +0100
-@@ -76,6 +76,7 @@ libao_open(void)
- format.channels = 2;
- format.rate = 44100;
- format.byte_format = AO_FMT_NATIVE;
-+ format.matrix = NULL;
-
- o_device = ao_open_live(default_driver, &format, NULL);
- if (o_device == NULL)
-@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx)
- format.channels = pwfx->nChannels;
- format.rate = 44100;
- format.byte_format = AO_FMT_NATIVE;
-+ format.matrix = NULL;
-
- if (o_device != NULL)
- ao_close(o_device);
Copied: rdesktop/repos/extra-x86_64/rdesktop-libao.patch (from rev 192434, rdesktop/trunk/rdesktop-libao.patch)
===================================================================
--- extra-x86_64/rdesktop-libao.patch (rev 0)
+++ extra-x86_64/rdesktop-libao.patch 2013-08-11 19:09:27 UTC (rev 192435)
@@ -0,0 +1,19 @@
+diff -up rdesktop-1.6.0/rdpsnd_libao.c.ao rdesktop-1.6.0/rdpsnd_libao.c
+--- rdesktop-1.6.0/rdpsnd_libao.c.ao 2007-10-30 14:57:30.000000000 +0100
++++ rdesktop-1.6.0/rdpsnd_libao.c 2010-12-02 21:22:39.000000000 +0100
+@@ -76,6 +76,7 @@ libao_open(void)
+ format.channels = 2;
+ format.rate = 44100;
+ format.byte_format = AO_FMT_NATIVE;
++ format.matrix = NULL;
+
+ o_device = ao_open_live(default_driver, &format, NULL);
+ if (o_device == NULL)
+@@ -115,6 +115,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx)
+ format.channels = pwfx->nChannels;
+ format.rate = 44100;
+ format.byte_format = AO_FMT_NATIVE;
++ format.matrix = NULL;
+
+ if (o_device != NULL)
+ ao_close(o_device);
Deleted: extra-x86_64/rdesktop-send_physical_buttons.diff
===================================================================
--- extra-x86_64/rdesktop-send_physical_buttons.diff 2013-08-11 19:08:34 UTC (rev 192434)
+++ extra-x86_64/rdesktop-send_physical_buttons.diff 2013-08-11 19:09:27 UTC (rev 192435)
@@ -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;
-
-
Copied: rdesktop/repos/extra-x86_64/rdesktop-send_physical_buttons.diff (from rev 192434, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
===================================================================
--- extra-x86_64/rdesktop-send_physical_buttons.diff (rev 0)
+++ extra-x86_64/rdesktop-send_physical_buttons.diff 2013-08-11 19:09:27 UTC (rev 192435)
@@ -0,0 +1,70 @@
+? 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;
+
+
Copied: rdesktop/repos/extra-x86_64/rdesktop-tcp.patch (from rev 192434, rdesktop/trunk/rdesktop-tcp.patch)
===================================================================
--- extra-x86_64/rdesktop-tcp.patch (rev 0)
+++ extra-x86_64/rdesktop-tcp.patch 2013-08-11 19:09:27 UTC (rev 192435)
@@ -0,0 +1,11 @@
+--- 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)
+ {
More information about the arch-commits
mailing list