[arch-commits] Commit in rdesktop/repos (3 files)

[Giovanni Scafora]

    Date: Saturday, October 3, 2009 @ 12:01:30
  Author: giovanni
Revision: 53863

Merged revisions 53835,53859 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/rdesktop/trunk

........
  r53835 | andrea | 2009-10-03 07:35:43 -0700 (sab, 03 ott 2009) | 2 lines
  
  upgpkg: rdesktop 1.6.0-3
      FS#15113
........
  r53859 | andrea | 2009-10-03 08:43:03 -0700 (sab, 03 ott 2009) | 2 lines
  
  upgpkg: rdesktop 1.6.0-3
      added patch to build
........

Added:
  rdesktop/repos/extra-x86_64/rdesktop-send_physical_buttons.diff
    (from rev 53859, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
Modified:
  rdesktop/repos/extra-x86_64/	(properties)
  rdesktop/repos/extra-x86_64/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   23 ++++++-----
 rdesktop-send_physical_buttons.diff |   70 ++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 9 deletions(-)


Property changes on: rdesktop/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /rdesktop/trunk:1-1593
   + /rdesktop/trunk:1-53862

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-03 15:55:18 UTC (rev 53862)
+++ extra-x86_64/PKGBUILD	2009-10-03 16:01:30 UTC (rev 53863)
@@ -1,20 +1,25 @@
 # $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+
 pkgname=rdesktop
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 depends=('libx11' 'openssl' 'libao' 'libsamplerate')
-pkgdesc="rdesktop is used to connect to windows terminal servers"
+pkgdesc="Is used to connect to windows terminal servers"
+url="http://www.rdesktop.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-url="http://www.rdesktop.org/"
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	'rdesktop-send_physical_buttons.diff')
+md5sums=('c6fcbed7f0ad7e60ac5fcb2d324d8b16'
+         '880d3aeac67b901e6bf44d1323374768')
 
 build() {
-   cd $startdir/src/$pkgname-$pkgver
+   cd $srcdir/$pkgname-$pkgver
+
+   patch -i ${srcdir}/rdesktop-send_physical_buttons.diff || return 1
+
    ./configure --prefix=/usr
    make || return 1
-   make DESTDIR=$startdir/pkg install
+   make DESTDIR=$pkgdir install
 }
-
-md5sums=('c6fcbed7f0ad7e60ac5fcb2d324d8b16')

Copied: rdesktop/repos/extra-x86_64/rdesktop-send_physical_buttons.diff (from rev 53859, 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	2009-10-03 16:01:30 UTC (rev 53863)
@@ -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 "Au:L:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
++			   VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEMmzCDKS: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;
+
+