diff options
| author | wiz <wiz@pkgsrc.org> | 2012-05-09 09:30:07 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2012-05-09 09:30:07 +0000 |
| commit | 6337b9cafa6526ff3ea6fbbfc400eee64d68caf3 (patch) | |
| tree | f0e7542a1c434188bf1d63a2f4d121138594629a | |
| parent | bfffb4f5b9607dd6575cc833ab844322b2591748 (diff) | |
| download | pkgsrc-6337b9cafa6526ff3ea6fbbfc400eee64d68caf3.tar.gz | |
Fix accepting keys in text mode; breakage caused by glib2 update.
Patch from Debian, found for OpenBSD by Antoine Jacoutot and
mentioned on current-users by Matthieu Herrb.
Bump PKGREVISION.
| -rw-r--r-- | editors/emacs/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs/distinfo | 3 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-src_xgselect.c | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index d2dafa6a035..af5b8ace833 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.143 2012/03/03 12:54:16 wiz Exp $ +# $NetBSD: Makefile,v 1.144 2012/05/09 09:30:07 wiz Exp $ CONFLICTS+= emacs-nox11-[0-9]* .include "../../editors/emacs/Makefile.common" -PKGREVISION=1 +PKGREVISION= 2 .include "options.mk" diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 5babd8e0e43..03158c96150 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.56 2012/02/19 17:44:35 minskim Exp $ +$NetBSD: distinfo,v 1.57 2012/05/09 09:30:07 wiz Exp $ SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473 RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7 @@ -11,3 +11,4 @@ SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3 SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9 SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507 +SHA1 (patch-src_xgselect.c) = 4a0b246eae2e43fc1e544210fc97c0170e3cffdc diff --git a/editors/emacs/patches/patch-src_xgselect.c b/editors/emacs/patches/patch-src_xgselect.c new file mode 100644 index 00000000000..e35e80056ef --- /dev/null +++ b/editors/emacs/patches/patch-src_xgselect.c @@ -0,0 +1,16 @@ +$NetBSD: patch-src_xgselect.c,v 1.1 2012/05/09 09:30:07 wiz Exp $ + +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10631 + +--- src/xgselect.c.orig 2012-01-11 12:35:01.000000000 +0000 ++++ src/xgselect.c +@@ -55,6 +55,9 @@ xg_select (max_fds, rfds, wfds, efds, ti + do { + if (n_gfds > gfds_size) + { ++ if (gfds_size == 0) ++ xgselect_initialize (); ++ + while (n_gfds > gfds_size) + gfds_size *= 2; + xfree (gfds); |