[arch-commits] Commit in rdesktop/repos/community-x86_64 (4 files)

Jelle van der Waa jelle at archlinux.org
Fri Dec 20 13:37:40 UTC 2019


    Date: Friday, December 20, 2019 @ 13:37:39
  Author: jelle
Revision: 538485

archrelease: copy trunk to community-x86_64

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

-------------------------------------+
 PKGBUILD                            |   68 +++++++---------
 rdesktop-send_physical_buttons.diff |  140 +++++++++++++++++-----------------
 2 files changed, 102 insertions(+), 106 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-20 13:37:30 UTC (rev 538484)
+++ PKGBUILD	2019-12-20 13:37:39 UTC (rev 538485)
@@ -1,36 +0,0 @@
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Dan McGee <dan at archlinux.org>
-
-pkgname=rdesktop
-pkgver=1.8.6
-pkgrel=1
-pkgdesc="An open source client for Windows Remote Desktop Services"
-arch=('x86_64')
-url="https://www.rdesktop.org/"
-license=('GPL3')
-depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite' 'libgssglue')
-source=(https://github.com/rdesktop/rdesktop/archive/v${pkgver}.tar.gz rdesktop-send_physical_buttons.diff)
-sha512sums=('364a69e4b32d2c2a8a2eb16c8bcdc7fa9534afbb91b8a235b80f7d66943e6574a8db5ee52c9a92dfea73b56988b8108c6f4e06c70c486a0d3c5ce7690477d8a6'
-            'a51d3d8a048cc5b67d872e9bfee91bfecd055c4bbf202cca3e768eb51dfd12e30e55ccee5431cec6ba20de818e1f0b94d4fe953f43828ee8b84f1fb7e4ffccec')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # FS#15113
-  patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
-  
-  ./bootstrap
-}
-
-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 538484, rdesktop/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-20 13:37:39 UTC (rev 538485)
@@ -0,0 +1,32 @@
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dan McGee <dan at archlinux.org>
+
+pkgname=rdesktop
+pkgver=1.9.0
+pkgrel=1
+pkgdesc="An open source client for Windows Remote Desktop Services"
+arch=('x86_64')
+url="https://www.rdesktop.org/"
+license=('GPL3')
+depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite' 'libgssglue' 'libxcursor')
+source=(https://github.com/rdesktop/rdesktop/archive/v${pkgver}.tar.gz)
+sha512sums=('c5120ea615e4a83c9c86dd77e536d48218121dfce2425fa6b78b4d59f194e28a709dcc86ed410921759b2bafa4aab1bf0b89d4440b8ae5e4741d1af092b0fbcf')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  ./bootstrap
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+    --enable-smartcard \
+    --with-ipv6
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Deleted: rdesktop-send_physical_buttons.diff
===================================================================
--- rdesktop-send_physical_buttons.diff	2019-12-20 13:37:30 UTC (rev 538484)
+++ rdesktop-send_physical_buttons.diff	2019-12-20 13:37:39 UTC (rev 538485)
@@ -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 538484, rdesktop/trunk/rdesktop-send_physical_buttons.diff)
===================================================================
--- rdesktop-send_physical_buttons.diff	                        (rev 0)
+++ rdesktop-send_physical_buttons.diff	2019-12-20 13:37:39 UTC (rev 538485)
@@ -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