diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2018-07-01 14:33:05 +0200 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2018-07-01 14:33:05 +0200 |
| commit | db2d08c7d4c98dccd4538f1bef3d3b11a2b2a7ec (patch) | |
| tree | b2043860bc0c180b772b2290457a4d036196dad6 | |
| parent | README: eapply doesn't support arch specific patches. (diff) | |
| download | emacs-patches-db2d08c7d4c98dccd4538f1bef3d3b11a2b2a7ec.tar.gz emacs-patches-db2d08c7d4c98dccd4538f1bef3d3b11a2b2a7ec.tar.bz2 emacs-patches-db2d08c7d4c98dccd4538f1bef3d3b11a2b2a7ec.zip | |
Make the X11 interface work again.emacs-18.59-patches-11
| -rw-r--r-- | emacs/18.59/15_all_libxcb.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/emacs/18.59/15_all_libxcb.patch b/emacs/18.59/15_all_libxcb.patch new file mode 100644 index 0000000..474af7c --- /dev/null +++ b/emacs/18.59/15_all_libxcb.patch @@ -0,0 +1,46 @@ +Make the X11 interface work again. +Patch ported from https://github.com/tsutsui/mule1.1-netbsd: + +commit 9a72fba7d6302e637008dcde1968e51f5f57321b +Author: tsugutomo enami <enami@tsugutomo-enamis-MacBook-Air.local> +Date: Sat Feb 28 10:46:25 2015 +0900 + + Copy O_NONBLOCK bit to old_fcntl_flags so that it won't be lost by unrequest_sigio(). + +--- emacs-18.59-orig/src/ChangeLog ++++ emacs-18.59/src/ChangeLog +@@ -1,3 +1,8 @@ ++2018-07-01 Ulrich Müller <ulm@gentoo.org> ++ ++ * x11term.c (x_init_1): Save the O_NONBLOCK bit, so that it won't ++ be lost by unrequest_sigio(). Patch from Tsugutomo Enami. ++ + 2017-12-07 Ulrich Müller <ulm@gentoo.org> + + * s-linux.h (SIGSYS): Don't redefine. Fixes compilation with +--- emacs-18.59-orig/src/x11term.c ++++ emacs-18.59/src/x11term.c +@@ -2105,6 +2105,9 @@ + #ifdef F_SETOWN + extern int old_fcntl_owner; + #endif ++#if defined(F_SETFL) && defined(FASYNC) ++ extern int old_fcntl_flags; ++#endif + + dup2 (ConnectionNumber(XXdisplay), 0); + #ifndef SYSV_STREAMS +@@ -2131,6 +2134,13 @@ + fcntl (0, F_SETOWN, getpid ()); + #endif /* F_SETOWN_SOCK_NEG */ + #endif /* F_SETOWN */ ++#if defined(F_SETFL) && defined(FASYNC) ++ /* ++ * Since libxcb sets O_NONBLOCK, copy the bit so that it won't ++ * dropped by unrequest_sigio(). ++ */ ++ old_fcntl_flags = fcntl (0, F_GETFL, 0) & ~FASYNC; ++#endif + + /* Enable interrupt_input because otherwise we cannot asynchronously + detect C-g sent as a keystroke event from the X server. */ |