Wed May 9 09:30:07 2012 UTC ()
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.


(wiz)
diff -r1.143 -r1.144 pkgsrc/editors/emacs/Makefile
diff -r1.56 -r1.57 pkgsrc/editors/emacs/distinfo
diff -r0 -r1.1 pkgsrc/editors/emacs/patches/patch-src_xgselect.c
cvs diff -r1.143 -r1.144 pkgsrc/editors/emacs/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Makefile 2012/03/03 12:54:16 1.143
+++ pkgsrc/editors/emacs/Makefile 2012/05/09 09:30:07 1.144
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.143 2012/03/03 12:54:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.144 2012/05/09 09:30:07 wiz Exp $
2 2
3CONFLICTS+= emacs-nox11-[0-9]* 3CONFLICTS+= emacs-nox11-[0-9]*
4 4
5.include "../../editors/emacs/Makefile.common" 5.include "../../editors/emacs/Makefile.common"
6PKGREVISION=1 6PKGREVISION= 2
7 7
8.include "options.mk" 8.include "options.mk"
9 9
10SUBST_CLASSES+= prefix 10SUBST_CLASSES+= prefix
11SUBST_STAGE.prefix= pre-configure 11SUBST_STAGE.prefix= pre-configure
12SUBST_VARS.prefix= PREFIX 12SUBST_VARS.prefix= PREFIX
13SUBST_FILES.prefix= src/s/netbsd.h 13SUBST_FILES.prefix= src/s/netbsd.h
14 14
15.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 15.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
16.include "../../sysutils/desktop-file-utils/desktopdb.mk" 16.include "../../sysutils/desktop-file-utils/desktopdb.mk"
17.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.56 -r1.57 pkgsrc/editors/emacs/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs/Attic/distinfo 2012/02/19 17:44:35 1.56
+++ pkgsrc/editors/emacs/Attic/distinfo 2012/05/09 09:30:07 1.57
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.56 2012/02/19 17:44:35 minskim Exp $ 1$NetBSD: distinfo,v 1.57 2012/05/09 09:30:07 wiz Exp $
2 2
3SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473 3SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473
4RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7 4RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7
5Size (emacs-23.4.tar.gz) = 47721193 bytes 5Size (emacs-23.4.tar.gz) = 47721193 bytes
6SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50 6SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50
7SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e 7SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e
8SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9 8SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9
9SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9 9SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9
10SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 10SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
11SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3 11SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3
12SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9 12SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9
13SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507 13SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507
 14SHA1 (patch-src_xgselect.c) = 4a0b246eae2e43fc1e544210fc97c0170e3cffdc
File Added: pkgsrc/editors/emacs/patches/Attic/patch-src_xgselect.c
$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);