diff options
| author | pav <pav@FreeBSD.org> | 2005-09-11 01:19:56 +0800 |
|---|---|---|
| committer | pav <pav@FreeBSD.org> | 2005-09-11 01:19:56 +0800 |
| commit | 237c31fb3140faf8bda7f3ab4a51350f77f78709 (patch) | |
| tree | 483f07713808bf9d16094e90c720174d964b9a13 /japanese/emacs-emcws | |
| parent | 346f25178bf5bb9d15a1d4a95a46205ad7c45406 (diff) | |
| download | freebsd-ports-gnome-237c31fb3140faf8bda7f3ab4a51350f77f78709.tar.gz freebsd-ports-gnome-237c31fb3140faf8bda7f3ab4a51350f77f78709.tar.zst freebsd-ports-gnome-237c31fb3140faf8bda7f3ab4a51350f77f78709.zip | |
- Fix build with recent Xaw3d
PR: ports/85821
Submitted by: NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (maintainer)
Diffstat (limited to 'japanese/emacs-emcws')
| -rw-r--r-- | japanese/emacs-emcws/Makefile | 2 | ||||
| -rw-r--r-- | japanese/emacs-emcws/files/patch-src:xterm.c | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index c6218980fa48..b50ea1150465 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -7,7 +7,7 @@ PORTNAME= emcws PORTVERSION= ${EMACS_VER} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= japanese editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= emacs diff --git a/japanese/emacs-emcws/files/patch-src:xterm.c b/japanese/emacs-emcws/files/patch-src:xterm.c new file mode 100644 index 000000000000..01ec93bec95e --- /dev/null +++ b/japanese/emacs-emcws/files/patch-src:xterm.c @@ -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 + } + } + } |