On 26/12/2015 17:37, Sevan Janiyan wrote: > Hi Anthony, > > On 26/12/2015 00:55, Anthony J. Bentley wrote: >> As X starts, it will attempt to detect features from the kbd(8) >> setting--for example, us.dvorak will enable dvorak in X, and >> fr.dvorak will enable French dvorak in X. However, it detects >> these features with equality checks, which will fail if multiple >> options are set, as in the case of us.dvorak.swapctrlcaps or >> fr.dvorak.swapctrlcaps. >> >> Instead of checking for equality, this diff instead checks if the >> bits are set. Now us.dvorak.swapctrlcaps and fr.dvorak.swapctrlcaps >> work, us.swapctrlcaps.iopener swaps ctrl/caps, and the ones that >> already worked (de.nodead, etc) still do. >> >> This was reported on misc@ by "Sevan / Venture37" back in June. > > Thanks for looking into it, I'm checking out the Xenocara consolidation > as I type this. Will test & report back :)
I checkout xenocara to my home directory on OpenBSD/i386 December 3rd -current snapshot. Made the changes in your patch. As per xenocara/README I ran make bootstrap, obj and build. The build process, fails with ===> data/xkeyboard-config/rules/compat touch parts_done HDR="/home/sme/xenocara/data/xkeyboard-config/rules/../../../dist/xkeyboard-config/rules/HDR" /bin/sh /home/sme/xenocara/data/xkeyboard-config/rules/../../../dist/xkeyboard-config/rules/merge.sh base base.hdr.part base.lists.part base.lists.base.part compat/base.lists.part HDR base.m_k.part HDR base.l1_k.part HDR base.l_k.part HDR base.o_k.part HDR base.ml_g.part HDR base.m_g.part HDR compat/base.mlv_s.part base.mlv_s.part HDR compat/base.ml_s.part base.ml_s.part HDR compat/base.ml1_s.part base.ml1_s.part HDR compat/base.ml1v1_s.part HDR compat/base.ml2_s.part base.ml2_s.part HDR compat/base.ml3_s.part base.ml3_s.part HDR compat/base.ml4_s.part base.ml4_s.part HDR compat/base.ml2v2_s.part HDR compat/base.ml3v3_s.part HDR compat/base.ml4v4_s.part HDR base.m_s.part HDR base.ml_s1.part HDR compat/base.lv_c.part HDR compat/base.l1v1_c.part HDR compat/base.l2v2_c.part HDR compat/base.l3v3_c.part HDR compat/base.l4v4_c.part HDR base.ml_c.part HDR base.ml1_c.part HDR base.m_t.part HDR base.lo_s.part HDR base.l1o_s.part HDR base.l2o_s.part HDR base.l3o_s.part HDR base.l4o_s.part HDR compat/base.o_s.part base.o_s.part HDR base.o_c.part HDR base.o_t.part cat: /home/sme/xenocara/data/xkeyboard-config/rules/../../../dist/xkeyboard-config/rules/compat/base.mlv_s.part: No such file or directory *** Error 1 in data/xkeyboard-config/rules (Makefile:99 'base') *** Error 1 in data/xkeyboard-config (<bsd.subdir.mk>:48 'all') *** Error 1 in data/xkeyboard-config (/usr/X11R6/share/mk/bsd.xorg.mk:211 'build') *** Error 1 in data (<bsd.subdir.mk>:48 'build') *** Error 1 in . (<bsd.subdir.mk>:48 'realbuild') *** Error 1 in /home/sme/xenocara (Makefile:41 'build') I haven't ruled out PEBKAC, this is the first time I've attempted to build xenocara I believe. Sevan
