diff options
| author | tnn <tnn@pkgsrc.org> | 2007-06-06 00:16:35 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2007-06-06 00:16:35 +0000 |
| commit | 693e24acc2fe28fb42f25da5825e82132384ac0f (patch) | |
| tree | cab9d60ab24120124c17446c0dec09d5d9cdc9b9 /net | |
| parent | 0c90d52e53490ea72a5c5d77ab65cfdea5a25480 (diff) | |
| download | pkgsrc-693e24acc2fe28fb42f25da5825e82132384ac0f.tar.gz | |
Pull in a patch from rdesktop CVS, xwin.c rev 1.223.
Fixes a segfault with X11_TYPE=modular. Should fix PR 36443.
Diffstat (limited to 'net')
| -rw-r--r-- | net/rdesktop/Makefile | 4 | ||||
| -rw-r--r-- | net/rdesktop/distinfo | 3 | ||||
| -rw-r--r-- | net/rdesktop/patches/patch-ab | 15 |
3 files changed, 19 insertions, 3 deletions
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile index 537c9e8a433..9a00c5314b9 100644 --- a/net/rdesktop/Makefile +++ b/net/rdesktop/Makefile @@ -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 --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo index 9848601a13e..21ad229a45a 100644 --- a/net/rdesktop/distinfo +++ b/net/rdesktop/distinfo @@ -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 --git a/net/rdesktop/patches/patch-ab b/net/rdesktop/patches/patch-ab new file mode 100644 index 00000000000..6e3e7e1ae52 --- /dev/null +++ b/net/rdesktop/patches/patch-ab @@ -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) + { |