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

Jelle van der Waa jelle at nymeria.archlinux.org
Tue Jan 14 19:45:06 UTC 2014


    Date: Tuesday, January 14, 2014 @ 20:45:06
  Author: jelle
Revision: 104044

archrelease: copy trunk to community-i686, community-x86_64

Added:
  rdesktop/repos/community-i686/PKGBUILD
    (from rev 104043, rdesktop/trunk/PKGBUILD)
  rdesktop/repos/community-i686/rdesktop-send_physical_buttons.diff
    (from rev 104043, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
  rdesktop/repos/community-x86_64/PKGBUILD
    (from rev 104043, rdesktop/trunk/PKGBUILD)
  rdesktop/repos/community-x86_64/rdesktop-send_physical_buttons.diff
    (from rev 104043, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
Deleted:
  rdesktop/repos/community-i686/PKGBUILD
  rdesktop/repos/community-i686/rdesktop-send_physical_buttons.diff
  rdesktop/repos/community-x86_64/PKGBUILD
  rdesktop/repos/community-x86_64/rdesktop-send_physical_buttons.diff

------------------------------------------------------+
 /PKGBUILD                                            |   72 ++++++++
 /rdesktop-send_physical_buttons.diff                 |  140 +++++++++++++++++
 community-i686/PKGBUILD                              |   36 ----
 community-i686/rdesktop-send_physical_buttons.diff   |   70 --------
 community-x86_64/PKGBUILD                            |   36 ----
 community-x86_64/rdesktop-send_physical_buttons.diff |   70 --------
 6 files changed, 212 insertions(+), 212 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-01-14 19:44:49 UTC (rev 104043)
+++ community-i686/PKGBUILD	2014-01-14 19:45:06 UTC (rev 104044)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Dan McGee <dan at archlinux.org>
-
-pkgname=rdesktop
-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/"
-license=('GPL3')
-depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        rdesktop-send_physical_buttons.diff)
-sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8'
-          '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # FS#15113
-  patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --enable-smartcard \
-    --with-ipv6
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}

Copied: rdesktop/repos/community-i686/PKGBUILD (from rev 104043, rdesktop/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-01-14 19:45:06 UTC (rev 104044)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+
+pkgname=rdesktop
+pkgver=1.8.1
+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' 'libgssglue')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        rdesktop-send_physical_buttons.diff)
+sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8'
+          '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # FS#15113
+  patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --enable-smartcard \
+    --with-ipv6
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-i686/rdesktop-send_physical_buttons.diff
===================================================================
--- community-i686/rdesktop-send_physical_buttons.diff	2014-01-14 19:44:49 UTC (rev 104043)
+++ community-i686/rdesktop-send_physical_buttons.diff	2014-01-14 19:45:06 UTC (rev 104044)
@@ -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/community-i686/rdesktop-send_physical_buttons.diff (from rev 104043, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
===================================================================
--- community-i686/rdesktop-send_physical_buttons.diff	                        (rev 0)
+++ community-i686/rdesktop-send_physical_buttons.diff	2014-01-14 19:45:06 UTC (rev 104044)
@@ -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;
+
+ 	  	 

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-01-14 19:44:49 UTC (rev 104043)
+++ community-x86_64/PKGBUILD	2014-01-14 19:45:06 UTC (rev 104044)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Dan McGee <dan at archlinux.org>
-
-pkgname=rdesktop
-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/"
-license=('GPL3')
-depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        rdesktop-send_physical_buttons.diff)
-sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8'
-          '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # FS#15113
-  patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --enable-smartcard \
-    --with-ipv6
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}

Copied: rdesktop/repos/community-x86_64/PKGBUILD (from rev 104043, rdesktop/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-01-14 19:45:06 UTC (rev 104044)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+
+pkgname=rdesktop
+pkgver=1.8.1
+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' 'libgssglue')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        rdesktop-send_physical_buttons.diff)
+sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8'
+          '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # FS#15113
+  patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --enable-smartcard \
+    --with-ipv6
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-x86_64/rdesktop-send_physical_buttons.diff
===================================================================
--- community-x86_64/rdesktop-send_physical_buttons.diff	2014-01-14 19:44:49 UTC (rev 104043)
+++ community-x86_64/rdesktop-send_physical_buttons.diff	2014-01-14 19:45:06 UTC (rev 104044)
@@ -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/community-x86_64/rdesktop-send_physical_buttons.diff (from rev 104043, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
===================================================================
--- community-x86_64/rdesktop-send_physical_buttons.diff	                        (rev 0)
+++ community-x86_64/rdesktop-send_physical_buttons.diff	2014-01-14 19:45:06 UTC (rev 104044)
@@ -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;
+
+ 	  	 




More information about the arch-commits mailing list