From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 31 00:40:14 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 642E516A41F for ; Wed, 31 Aug 2005 00:40:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D81D243D55 for ; Wed, 31 Aug 2005 00:40:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j7V0eDRY027500 for ; Wed, 31 Aug 2005 00:40:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j7V0eDMr027498; Wed, 31 Aug 2005 00:40:13 GMT (envelope-from gnats) Resent-Date: Wed, 31 Aug 2005 00:40:13 GMT Resent-Message-Id: <200508310040.j7V0eDMr027498@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, NIIMI Satoshi Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F013816A429 for ; Wed, 31 Aug 2005 00:32:26 +0000 (GMT) (envelope-from sa2c@sa2c.net) Received: from freebird.and.or.jp (ns.and.or.jp [203.141.148.11]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89E6943D46 for ; Wed, 31 Aug 2005 00:32:26 +0000 (GMT) (envelope-from sa2c@sa2c.net) Received: from localhost (localhost [127.0.0.1]) by freebird.and.or.jp (Postfix) with ESMTP id CB6BE2E02E for ; Wed, 31 Aug 2005 09:32:21 +0900 (JST) Message-Id: <20050831003220.B486A11456@berkeley.l.sa2c.net> Date: Wed, 31 Aug 2005 09:32:20 +0900 (JST) From: NIIMI Satoshi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/85508: editors/emacs: compilation fails with new Xaw3d X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: NIIMI Satoshi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Aug 2005 00:40:14 -0000 >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@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 > > * 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 + #include +-#define ARROW_SCROLLBAR +-#include + #else /* !HAVE_XAW3D */ + #include + #include +@@ -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: