[pkgsrc/trunk]: pkgsrc/net/rdesktop Pull in a patch from rdesktop CVS, xwin.c...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c4f30a8730c
branches:  trunk
changeset: 529481:6c4f30a8730c
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Jun 06 00:16:35 2007 +0000

description:
Pull in a patch from rdesktop CVS, xwin.c rev 1.223.
Fixes a segfault with X11_TYPE=modular. Should fix PR 36443.

diffstat:

 net/rdesktop/Makefile         |   4 ++--
 net/rdesktop/distinfo         |   3 ++-
 net/rdesktop/patches/patch-ab |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 44bf538510bc -r 6c4f30a8730c net/rdesktop/Makefile
--- a/net/rdesktop/Makefile     Tue Jun 05 23:32:08 2007 +0000
+++ b/net/rdesktop/Makefile     Wed Jun 06 00:16:35 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2006/12/02 23:14:38 seb Exp $
+# $NetBSD: Makefile,v 1.32 2007/06/06 00:16:35 tnn Exp $
 #
 
 DISTNAME=              rdesktop-1.5.0
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
diff -r 44bf538510bc -r 6c4f30a8730c net/rdesktop/distinfo
--- a/net/rdesktop/distinfo     Tue Jun 05 23:32:08 2007 +0000
+++ b/net/rdesktop/distinfo     Wed Jun 06 00:16:35 2007 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2006/12/01 10:53:15 hubertf Exp $
+$NetBSD: distinfo,v 1.17 2007/06/06 00:16:35 tnn Exp $
 
 SHA1 (rdesktop-1.5.0.tar.gz) = e3086bf865191eed41631813125f482e279c7f3d
 RMD160 (rdesktop-1.5.0.tar.gz) = 350e08166d0b7620b4ed9c6594addae7ec53d15a
 Size (rdesktop-1.5.0.tar.gz) = 245137 bytes
 SHA1 (patch-aa) = dda84f70792828c97aa02567b97d2ae9647b6fcb
+SHA1 (patch-ab) = 396a37a4f6f0751e014bd548f9c44f6c462812e1
diff -r 44bf538510bc -r 6c4f30a8730c net/rdesktop/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/rdesktop/patches/patch-ab     Wed Jun 06 00:16:35 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.7 2007/06/06 00:16:35 tnn Exp $
+
+http://rdesktop.cvs.sourceforge.net/rdesktop/rdesktop/xwin.c?r1=1.222&r2=1.223&view=patch
+
+--- xwin.c     2007/01/17 07:39:31     1.222
++++ xwin.c     2007/04/12 16:04:25     1.223
+@@ -3218,7 +3218,7 @@
+               return;
+ 
+       image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
+-                           (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
++                           (char *) data, cx, cy, g_bpp, 0);
+ 
+       if (g_ownbackstore)
+       {