On 5/17/07, Rolf Sommerhalder <[EMAIL PROTECTED]> wrote:
Thanks for this patch which applied cleanly and solved the problem of
rdesktop crashing upon startup on my Dell Inspiron 4000 laptop running
i386-current and xenocara.

Interestingly, the unpatched rdesktop so far did not crash on my Dell
desktop at work which also runs i386-current and xenocara. Eventually,
unpatched rdesktop does not crash on certain video cards?  I can
provide dmesg of both boxes if anyone is interested.

My (i386) Radeon Mobility M7LW needs this, my (amd64) Radeon X800 GTO2 doesn't.

Can you commit this patch to the ports tree, and/or send it upstream?

working on it... here's a new patch that retries the calculation.
Produces slightly better output sometimes.

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/rdesktop/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile    2007/03/25 19:38:39     1.23
+++ Makefile    2007/05/17 17:07:39
@@ -2,7 +2,7 @@

COMMENT=        "open source client for Windows Terminal Server"
DISTNAME=       rdesktop-1.5.0
-PKGNAME=       ${DISTNAME}p0
+PKGNAME=       ${DISTNAME}p1
CATEGORIES=     x11 net
MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=rdesktop/}

Index: patches/patch-xwin_c
===================================================================
RCS file: patches/patch-xwin_c
diff -N patch-xwin_c
--- /dev/null   Sat Aug 30 18:16:59 1997
+++ patches/patch-xwin_c        Thu May 17 17:07:39 2007
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- xwin.c.orig        Wed Apr 25 12:03:29 2007
++++ xwin.c     Wed Apr 25 12:04:54 2007
+@@ -3221,6 +3221,10 @@ ui_desktop_restore(uint32 offset, int x, int y, int cx
+       image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
+                            (char *) data, cx, cy, BitmapPad(g_display), cx * 
g_bpp / 8);
+
++      if (image == NULL)
++              image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
++                           (char *) data, cx, cy, BitmapPad(g_display), 0);
++
+       if (g_ownbackstore)
+       {
+               XPutImage(g_display, g_backstore, g_gc, image, 0, 0, x, y, cx, 
cy);

--
GDB has a 'break' feature; why doesn't it have 'fix' too?

Reply via email to