diff options
| author | hauke <hauke@pkgsrc.org> | 2018-01-30 11:47:39 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2018-01-30 11:47:39 +0000 |
| commit | e0279c17dbc2c25811e8e442152510785e857c9a (patch) | |
| tree | 7d28257dc431848ab53e30b744affa00ca8c8db3 | |
| parent | 3b67ec57882438495895fe6c795d34ce4b1c1e9f (diff) | |
| download | pkgsrc-e0279c17dbc2c25811e8e442152510785e857c9a.tar.gz | |
On some target platforms, Xm headers #define *_XFT_ symbols; if we do
not use xft (the default), explicitly disable it.
| -rw-r--r-- | editors/xemacs-current/distinfo | 3 | ||||
| -rw-r--r-- | editors/xemacs-current/options.mk | 7 | ||||
| -rw-r--r-- | editors/xemacs-current/patches/patch-src_console-xlike-inc.h | 18 |
3 files changed, 25 insertions, 3 deletions
diff --git a/editors/xemacs-current/distinfo b/editors/xemacs-current/distinfo index 95b702b553a..d7a09240050 100644 --- a/editors/xemacs-current/distinfo +++ b/editors/xemacs-current/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2017/11/17 13:06:03 hauke Exp $ +$NetBSD: distinfo,v 1.32 2018/01/30 11:47:39 hauke Exp $ SHA1 (xemacs-21.5.34.tar.gz) = ed1fe3ff6ce6eeb9ff75ac0ee34c6530e1c355ce RMD160 (xemacs-21.5.34.tar.gz) = 2f6a5bc7fd72508722dded16ee7742db3e87ffaf @@ -11,6 +11,7 @@ SHA1 (patch-lib-src_fakemail.c) = e62f75055b80f207696cfd77cd7b55fd46e8249b SHA1 (patch-lwlib_Makefile.in.in) = 8d243f1c85122429187b8250c18221dee8423ed0 SHA1 (patch-modules_common_Makefile.common) = d62a23a05e72cc196557e2f7fbbccea791ee0101 SHA1 (patch-src_Makefile.in.in) = 7a7ea5fe03b11e8690f44f4dbef17e793fbf50f2 +SHA1 (patch-src_console-xlike-inc.h) = 80b29a72c73b2371ba559f1cb21ea5e4e1dedb1e SHA1 (patch-src_dired.c) = d850495e567224dc7a43e1db74f4e305a906f177 SHA1 (patch-src_lisp.h) = c5f3b5f920ec6d451a5d5c5d1e414d6ae3d6660f SHA1 (patch-src_unexelf.c) = 96b2cf1d2512ad23fca98db9b48c34533bba8b66 diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk index 84b773addb4..c1a943c1d82 100644 --- a/editors/xemacs-current/options.mk +++ b/editors/xemacs-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.15 2017/11/15 14:46:31 hauke Exp $ +# $NetBSD: options.mk,v 1.16 2018/01/30 11:47:39 hauke Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS+= ldap canna debug @@ -38,6 +38,9 @@ CONFIGURE_ARGS+= --with-dialogs=lucid CONFIGURE_ARGS+= --with-widgets=lucid CONFIGURE_ARGS+= --with-athena=xaw CONFIGURE_ARGS+= --with-xim=xlib +# Explicitely exclude other toolkits +CONFIGURE_ARGS+= --without-gtk +CONFIGURE_ARGS+= --without-gnome .else CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --without-jpeg @@ -63,7 +66,7 @@ CONFIGURE_ARGS+= --without-ldap . include "../../x11/libXrender/buildlink3.mk" CONFIGURE_ARGS+= --with-xft=emacs,tabs,menubars,gauges .else -CONFIGURE_ARGS+= --with-xft=no +CONFIGURE_ARGS+= --without-xft .endif .if !empty(PKG_OPTIONS:Mxface) diff --git a/editors/xemacs-current/patches/patch-src_console-xlike-inc.h b/editors/xemacs-current/patches/patch-src_console-xlike-inc.h new file mode 100644 index 00000000000..3059ad440f8 --- /dev/null +++ b/editors/xemacs-current/patches/patch-src_console-xlike-inc.h @@ -0,0 +1,18 @@ +$NetBSD: patch-src_console-xlike-inc.h,v 1.1 2018/01/30 11:47:39 hauke Exp $ + +On some target platforms, Xm headers #define *_XFT_ symbols + +--- src/console-xlike-inc.h.orig 2013-08-21 17:43:45.000000000 +0000 ++++ src/console-xlike-inc.h +@@ -115,6 +115,11 @@ along with XEmacs. If not, see <http:// + #define USE_XFT_MENUBARS + #define USE_XFT_TABS + #define USE_XFT_GAUGES ++#else /* Xm headers might #define *_XFT */ ++#undef USE_XFT ++#undef USE_XFT_MENUBARS ++#undef USE_XFT_TABS ++#undef USE_XFT_GAUGES + #endif + + /***************************************************************************/ |