mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-20 00:53:12 +03:00
xkeyboardconfig: drop no-longer-applying esperanto patch
This commit is contained in:
parent
97d1f95d9d
commit
d41bc0ff56
@ -413,9 +413,6 @@ self: super:
|
||||
xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: {
|
||||
nativeBuildInputs = attrs.nativeBuildInputs ++ [intltool];
|
||||
|
||||
#TODO: resurrect patches for US_intl?
|
||||
patches = [ ./xkeyboard-config-eo.patch ];
|
||||
|
||||
configureFlags = [ "--with-xkb-rules-symlink=xorg" ];
|
||||
|
||||
# 1: compatibility for X11/xkb location
|
||||
|
@ -1,69 +0,0 @@
|
||||
diff --git a/rules/base.xml.in b/rules/base.xml.in
|
||||
index ec321f8..e9c3546 100644
|
||||
--- a/rules/base.xml.in
|
||||
+++ b/rules/base.xml.in
|
||||
@@ -1786,6 +1786,13 @@
|
||||
</layout>
|
||||
<layout>
|
||||
<configItem>
|
||||
+ <name>eo</name>
|
||||
+ <_shortDescription>Esp</_shortDescription>
|
||||
+ <_description>Esperanto</_description>
|
||||
+ </configItem>
|
||||
+ </layout>
|
||||
+ <layout>
|
||||
+ <configItem>
|
||||
<name>ir</name>
|
||||
<_shortDescription>Irn</_shortDescription>
|
||||
<_description>Iran</_description>
|
||||
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
|
||||
--- a/symbols/Makefile.am
|
||||
+++ b/symbols/Makefile.am
|
||||
@@ -10,7 +10,7 @@ bt by braille \
|
||||
ca cd ch \
|
||||
ch cn cz \
|
||||
de dk dz \
|
||||
-ee es et epo eu \
|
||||
+ee eo es et epo eu \
|
||||
fi fo fr \
|
||||
gb ge gh gn \
|
||||
gr hr hu \
|
||||
diff --git a/symbols/Makefile.in b/symbols/Makefile.in
|
||||
--- a/symbols/Makefile.in
|
||||
+++ b/symbols/Makefile.in
|
||||
@@ -222,7 +222,7 @@ bt by braille \
|
||||
ca cd ch \
|
||||
ch cn cz \
|
||||
de dk dz \
|
||||
-ee es et epo eu \
|
||||
+ee eo es et epo eu \
|
||||
fi fo fr \
|
||||
gb ge gh gn \
|
||||
gr hr hu \
|
||||
diff --git a/symbols/eo b/symbols/eo
|
||||
new file mode 100644
|
||||
index 0000000..d6358c9
|
||||
--- /dev/null
|
||||
+++ b/symbols/eo
|
||||
@@ -0,0 +1,21 @@
|
||||
+// $XFree86$
|
||||
+
|
||||
+partial alphanumeric_keys
|
||||
+xkb_symbols "basic" {
|
||||
+
|
||||
+ // Describes the differences between a very simple en_US
|
||||
+ // keyboard and a simple Esperanto keyboard
|
||||
+ // Press AltGr or Windows Menu key together with C, H, J, S, U
|
||||
+ // to get accented letters.
|
||||
+ // 2001 by Radovan Garabik <garabik@melkor.dnp.fmph.uniba.sk>
|
||||
+
|
||||
+ key.type = "FOUR_LEVEL";
|
||||
+
|
||||
+ key <AD02> { [w,W, ubreve,Ubreve ] };
|
||||
+ key <AD07> { [u,U, ubreve, Ubreve ] };
|
||||
+ key <AC02> { [s,S, scircumflex, Scircumflex ] };
|
||||
+ key <AC05> { [g,G, gcircumflex,Gcircumflex ] };
|
||||
+ key <AC06> { [h,H, hcircumflex,Hcircumflex ] };
|
||||
+ key <AC07> { [j,J, jcircumflex,Jcircumflex ] };
|
||||
+ key <AB03> { [c,C, ccircumflex,Ccircumflex ] };
|
||||
+};
|
Loading…
Reference in New Issue
Block a user