diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 14:05:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-25 14:05:13 (GMT) |
| commit | 7a39ccec01ad0c3a6cc0f7fa1662f92f87c58dd1 (patch) | |
| tree | 18338c3885cfabc8328e56399cffda3318a6de36 /unix | |
| parent | c1617bb90af0cb596871fea41ebc5f36ea1ea89b (diff) | |
| parent | dc7625ccd3a00dba6a55b37c190b2cae3b58ea4f (diff) | |
| download | tk-7a39ccec01ad0c3a6cc0f7fa1662f92f87c58dd1.zip tk-7a39ccec01ad0c3a6cc0f7fa1662f92f87c58dd1.tar.gz tk-7a39ccec01ad0c3a6cc0f7fa1662f92f87c58dd1.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 7 | ||||
| -rw-r--r-- | unix/tcl.m4 | 5 | ||||
| -rw-r--r-- | unix/tkUnixKey.c | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 271cb07..0d7e415 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1580,9 +1580,14 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure cd $(MAC_OSX_DIR); autoheader; touch $@ -dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros genstubs +$(TOP_DIR)/manifest.uuid: + printf "git." >$(TOP_DIR)/manifest.uuid + git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid + +dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid genstubs rm -rf $(DISTDIR) $(INSTALL_DATA_DIR) $(DISTDIR)/unix + $(DIST_INSTALL_DATA) $$(TOP_DIR)/manifest.uuid $(DISTDIR) $(DIST_INSTALL_DATA) $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix $(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix $(DIST_INSTALL_DATA) $(UNIX_DIR)/configure.ac $(UNIX_DIR)/tk.spec \ diff --git a/unix/tcl.m4 b/unix/tcl.m4 index aed464f..056cf1f 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2477,7 +2477,10 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ AC_CHECK_FUNC($1, tcl_ok=1, tcl_ok=0) if test ["$tcl_ok"] = 1; then AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken], - AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok, + AC_TRY_RUN([[ +#include <stdlib.h> +#include <string.h> +int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok, [tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown)) if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then tcl_ok=1 diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c index 1a5cb7d..3db5372 100644 --- a/unix/tkUnixKey.c +++ b/unix/tkUnixKey.c @@ -360,11 +360,15 @@ TkpGetKeySym( * alphabetic, then switch back to the unshifted keysym. */ +#ifndef XK_Oslash + /* XK_Oslash is the official name, but might not be present in older X11 headers */ +# define XK_Oslash XK_Ooblique +#endif if ((index & 1) && !(eventPtr->xkey.state & ShiftMask) && (dispPtr->lockUsage == LU_CAPS)) { if (!(((sym >= XK_A) && (sym <= XK_Z)) || ((sym >= XK_Agrave) && (sym <= XK_Odiaeresis)) - || ((sym >= XK_Ooblique) && (sym <= XK_Thorn)))) { + || ((sym >= XK_Oslash) && (sym <= XK_Thorn)))) { index &= ~1; sym = XkbKeycodeToKeysym(dispPtr->display, eventPtr->xkey.keycode, 0, index); |