ports/85508: editors/emacs: compilation fails with new Xaw3d

[NIIMI Satoshi]

>Number:         85508
>Category:       ports
>Synopsis:       editors/emacs: compilation fails with new Xaw3d
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 31 00:40:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     NIIMI Satoshi
>Release:        FreeBSD 5.4-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 5.4-RELEASE-p6 FreeBSD 5.4-RELEASE-p6 #2: Sat Aug 27 13:20:51 JST 2005 root at berkeley.l.sa2c.net:/usr/obj/usr/src/sys/MYKERNEL i386


	
>Description:
Emacs 21.3 can't be built with Xaw3d 1.5E.
	
>How-To-Repeat:
cd /usr/ports/editors/emacs; make
	
>Fix:
incorporate Xaw3d related changes in emacs's MAIN trunk.

emacs/src/ChangeLog:
> 2005-03-31  Stefan Monnier  <monnier at iro.umontreal.ca>
> 
> 	* xterm.c [HAVE_XAW3D]:
> 	(x_set_toolkit_scroll_bar_thumb): Remove ugly old hack that didn't
> 	really work and that breaks with some versions of Xaw3d.

	

--- emacs.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/emacs/Makefile,v
retrieving revision 1.62
diff -u -r1.62 Makefile
--- Makefile	15 May 2005 15:32:14 -0000	1.62
+++ Makefile	31 Aug 2005 00:13:04 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	emacs
 PORTVERSION=	21.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	editors ipv6
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
Index: files/patch-src:xterm.c
===================================================================
RCS file: files/patch-src:xterm.c
diff -N files/patch-src:xterm.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src:xterm.c	31 Aug 2005 00:19:35 -0000
@@ -0,0 +1,42 @@
+--- src/xterm.c.orig	Tue Oct 15 23:21:45 2002
++++ src/xterm.c	Wed Aug 31 09:18:48 2005
+@@ -118,8 +118,6 @@
+ #ifdef HAVE_XAW3D
+ #include <X11/Xaw3d/Simple.h>
+ #include <X11/Xaw3d/Scrollbar.h>
+-#define ARROW_SCROLLBAR
+-#include <X11/Xaw3d/ScrollbarP.h>
+ #else /* !HAVE_XAW3D */
+ #include <X11/Xaw/Simple.h>
+ #include <X11/Xaw/Scrollbar.h>
+@@ -8863,30 +8861,12 @@
+ 	  XawScrollbarSetThumb (widget, top, shown);
+ 	else
+ 	  {
+-#ifdef HAVE_XAW3D
+-	    ScrollbarWidget sb = (ScrollbarWidget) widget;
+-	    int scroll_mode = 0;
+-	    
+-	    /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR.  */
+-	    if (xaw3d_arrow_scroll)
+-	      {
+-		/* Xaw3d stupidly ignores resize requests while dragging
+-		   so we have to make it believe it's not in dragging mode.  */
+-		scroll_mode = sb->scrollbar.scroll_mode;
+-		if (scroll_mode == 2)
+-		  sb->scrollbar.scroll_mode = 0;
+-	      }
+-#endif
+ 	    /* Try to make the scrolling a tad smoother.  */
+ 	    if (!xaw3d_pick_top)
+ 	      shown = min (shown, old_shown);
+ 	    
+ 	    XawScrollbarSetThumb (widget, top, shown);
+ 	    
+-#ifdef HAVE_XAW3D
+-	    if (xaw3d_arrow_scroll && scroll_mode == 2)
+-	      sb->scrollbar.scroll_mode = scroll_mode;
+-#endif
+ 	  }
+       }
+   }
--- emacs.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: