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

Eric Bélanger eric at nymeria.archlinux.org
Fri Aug 9 18:41:03 UTC 2013


    Date: Friday, August 9, 2013 @ 20:41:03
  Author: eric
Revision: 192287

upgpkg: rdesktop 1.8.0-1

Upstream update, Add pcsclite depends, Add prepare function, Update patches

Modified:
  rdesktop/trunk/PKGBUILD
  rdesktop/trunk/rdesktop-libao.patch
  rdesktop/trunk/rdesktop-send_physical_buttons.diff

-------------------------------------+
 PKGBUILD                            |   17 ++++++++++-------
 rdesktop-libao.patch                |    3 +--
 rdesktop-send_physical_buttons.diff |    4 ++--
 3 files changed, 13 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-09 17:00:37 UTC (rev 192286)
+++ PKGBUILD	2013-08-09 18:41:03 UTC (rev 192287)
@@ -4,20 +4,20 @@
 # Contributor: Dan McGee <dan at archlinux.org>
 
 pkgname=rdesktop
-pkgver=1.7.1
-pkgrel=3
+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=('openssl' 'libao' 'libsamplerate' 'xorg-xrandr')
+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=('c4b39115951c4a6d74f511c99b18fcf9'
-         '880d3aeac67b901e6bf44d1323374768'
-         'bd2c9bc68bddcc2652c668753d787df7')
+md5sums=('203d662ac20b22250bbbd525a9f29f3a'
+         'cbfb12729e7f28e497afb883cc42022b'
+         '6514f31dc879a0a66c955e4e3348c143')
 
-build() {
+prepare() {
   cd ${pkgname}-${pkgver}
 
   # FS#15113
@@ -25,7 +25,10 @@
 
   # Fix libao segfault, from Fedora
   patch -i "${srcdir}/rdesktop-libao.patch"
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --enable-smartcard \
     --with-ipv6

Modified: rdesktop-libao.patch
===================================================================
--- rdesktop-libao.patch	2013-08-09 17:00:37 UTC (rev 192286)
+++ rdesktop-libao.patch	2013-08-09 18:41:03 UTC (rev 192287)
@@ -1,11 +1,10 @@
 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,7 +76,7 @@ libao_open(void)
+@@ -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);

Modified: rdesktop-send_physical_buttons.diff
===================================================================
--- rdesktop-send_physical_buttons.diff	2013-08-09 17:00:37 UTC (rev 192286)
+++ rdesktop-send_physical_buttons.diff	2013-08-09 18:41:03 UTC (rev 192287)
@@ -26,8 +26,8 @@
  #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)
+-			   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)
  		{




More information about the arch-commits mailing list