Add a patch to make the "/ ?" key on abnt2 keyboards work

5 files changed, 120 insertions, 0 deletions

diff --git a/dependencies/debian-lenny/Makefile b/dependencies/debian-lenny/Makefile
index 56cf2a1..10bb643 100644
--- a/dependencies/debian-lenny/Makefile
+++ b/dependencies/debian-lenny/Makefile
@@ -5,6 +5,9 @@ LIBX11_SOURCE_DIR   = libx11-1.1.4
 LIBX11_PATCH_FILE   = libx11-eagain.patch
 LIBX11_DEB_PKG      = libx11-6_1.1.4-2_i386.deb
 
+abnt2:
+	patch -p1 -d /usr/share/X11 < fix-abnt2-kbd.patch
+
 install: libx11
 	dpkg -i $(LIBX11_DEB_PKG)
 	echo "$(LIBX11_PACKAGE_NAME) hold" | dpkg --set-selections
diff --git a/dependencies/debian-lenny/fix-abnt2-kbd.patch b/dependencies/debian-lenny/fix-abnt2-kbd.patch
new file mode 100644
index 0000000..e60598a
--- /dev/null
+++ b/dependencies/debian-lenny/fix-abnt2-kbd.patch
@@ -0,0 +1,34 @@
+diff -Nru X11/xkb/keycodes/evdev X11.new/xkb/keycodes/evdev
+--- X11/xkb/keycodes/evdev	2008-08-14 14:55:51.000000000 -0300
++++ X11.new/xkb/keycodes/evdev	2008-09-19 08:36:56.000000000 -0300
+@@ -147,14 +147,16 @@
+ 
+ 	<HZTG> =  93;	// Hankaku/Zenkakau toggle
+ 	<HKTG> = 101;	// Hiragana/Katakana toggle
+-	<AB11> = 211;	// backslash/underscore
++	//<AB11> = 211;	// backslash/underscore
+ 	<HENK> = 100;	// Henkan
+ 	<MUHE> = 102;	// Muhenkan
+ 	<AE13> = 132;	// Yen
+ 	<KATA> =  98;	// Katakana
+ 	<HIRA> =  99;	// Hiragana
+ 	<JPCM> = 103;	// KPJPComma
+-	<RO>   =  97;	// Romaji
++	//<RO>   =  97;	// Romaji
++	// Fix for ABNT2 keyboards:
++	<AB11> = 97;
+ 
+ 	// Keys that are generated on Korean keyboards
+ 
+diff -Nru X11/XKeysymDB X11.new/XKeysymDB
+--- X11/XKeysymDB	2008-06-09 11:36:59.000000000 -0300
++++ X11.new/XKeysymDB	2008-09-19 08:35:29.000000000 -0300
+@@ -256,7 +256,7 @@
+ XF86Launch1		:1008FF41
+ XF86Launch2		:1008FF42
+ XF86Launch3		:1008FF43
+-XF86Launch4		:1008FF44
++//XF86Launch4		:1008FF44
+ XF86Launch5		:1008FF45
+ XF86Launch6		:1008FF46
+ XF86Launch7		:1008FF47
diff --git a/dependencies/generic/fix-abnt2-kbd.patch b/dependencies/generic/fix-abnt2-kbd.patch
new file mode 100644
index 0000000..e60598a
--- /dev/null
+++ b/dependencies/generic/fix-abnt2-kbd.patch
@@ -0,0 +1,34 @@
+diff -Nru X11/xkb/keycodes/evdev X11.new/xkb/keycodes/evdev
+--- X11/xkb/keycodes/evdev	2008-08-14 14:55:51.000000000 -0300
++++ X11.new/xkb/keycodes/evdev	2008-09-19 08:36:56.000000000 -0300
+@@ -147,14 +147,16 @@
+ 
+ 	<HZTG> =  93;	// Hankaku/Zenkakau toggle
+ 	<HKTG> = 101;	// Hiragana/Katakana toggle
+-	<AB11> = 211;	// backslash/underscore
++	//<AB11> = 211;	// backslash/underscore
+ 	<HENK> = 100;	// Henkan
+ 	<MUHE> = 102;	// Muhenkan
+ 	<AE13> = 132;	// Yen
+ 	<KATA> =  98;	// Katakana
+ 	<HIRA> =  99;	// Hiragana
+ 	<JPCM> = 103;	// KPJPComma
+-	<RO>   =  97;	// Romaji
++	//<RO>   =  97;	// Romaji
++	// Fix for ABNT2 keyboards:
++	<AB11> = 97;
+ 
+ 	// Keys that are generated on Korean keyboards
+ 
+diff -Nru X11/XKeysymDB X11.new/XKeysymDB
+--- X11/XKeysymDB	2008-06-09 11:36:59.000000000 -0300
++++ X11.new/XKeysymDB	2008-09-19 08:35:29.000000000 -0300
+@@ -256,7 +256,7 @@
+ XF86Launch1		:1008FF41
+ XF86Launch2		:1008FF42
+ XF86Launch3		:1008FF43
+-XF86Launch4		:1008FF44
++//XF86Launch4		:1008FF44
+ XF86Launch5		:1008FF45
+ XF86Launch6		:1008FF46
+ XF86Launch7		:1008FF47
diff --git a/dependencies/ubuntu-8.04/Makefile b/dependencies/ubuntu-8.04/Makefile
index 33f76e5..9094523 100644
--- a/dependencies/ubuntu-8.04/Makefile
+++ b/dependencies/ubuntu-8.04/Makefile
@@ -5,6 +5,9 @@ LIBX11_SOURCE_DIR   = libx11-1.1.3
 LIBX11_PATCH_FILE   = libx11-eagain.patch
 LIBX11_DEB_PKG      = libx11-6_1.1.3-1ubuntu2_i386.deb 
 
+abnt2:
+	patch -p1 -d /usr/share/X11 < fix-abnt2-kbd.patch
+
 install: libx11
 	dpkg -i $(LIBX11_DEB_PKG)
 	echo "$(LIBX11_PACKAGE_NAME) hold" | dpkg --set-selections
diff --git a/dependencies/ubuntu-8.04/fix-abnt2-kbd.patch b/dependencies/ubuntu-8.04/fix-abnt2-kbd.patch
new file mode 100644
index 0000000..63c2d7c
--- /dev/null
+++ b/dependencies/ubuntu-8.04/fix-abnt2-kbd.patch
@@ -0,0 +1,46 @@
+diff -Nru X11/xkb/keycodes/evdev X11.patched/xkb/keycodes/evdev
+--- X11/xkb/keycodes/evdev	2008-09-19 11:55:04.000000000 -0300
++++ X11.patched/xkb/keycodes/evdev	2008-09-19 11:54:49.000000000 -0300
+@@ -147,14 +147,16 @@
+ 
+ 	<HZTG> =  93;	// Hankaku/Zenkakau toggle
+ 	<HKTG> = 101;	// Hiragana/Katakana toggle
+-	<AB11> = 211;	// backslash/underscore
++	//<AB11> = 211;	// backslash/underscore
+ 	<HENK> = 100;	// Henkan
+ 	<MUHE> = 102;	// Muhenkan
+ 	<AE13> = 132;	// Yen
+ 	<KATA> =  98;	// Katakana
+ 	<HIRA> =  99;	// Hiragana
+ 	<JPCM> = 103;	// KPJPComma
+-	<RO>   =  97;	// Romaji
++	//<RO>   =  97;	// Romaji
++	// Fix for ABNT2 keyboards:
++	<AB11> = 97;
+ 
+ 	// Keys that are generated on Korean keyboards
+ 
+diff -Nru X11/XKeysymDB X11.patched/XKeysymDB
+--- X11/XKeysymDB	2008-09-19 11:55:04.000000000 -0300
++++ X11.patched/XKeysymDB	2008-09-19 11:54:50.000000000 -0300
+@@ -251,7 +251,7 @@
+ XF86Launch1		:1008FF41
+ XF86Launch2		:1008FF42
+ XF86Launch3		:1008FF43
+-XF86Launch4		:1008FF44
++//XF86Launch4		:1008FF44
+ XF86Launch5		:1008FF45
+ XF86Launch6		:1008FF46
+ XF86Launch7		:1008FF47
+diff -Nru X11/XKeysymDB.orig X11.patched/XKeysymDB.orig
+--- X11/XKeysymDB.orig	2008-09-19 11:54:36.000000000 -0300
++++ X11.patched/XKeysymDB.orig	2008-09-19 11:54:48.000000000 -0300
+@@ -251,7 +251,7 @@
+ XF86Launch1		:1008FF41
+ XF86Launch2		:1008FF42
+ XF86Launch3		:1008FF43
+-//XF86Launch4		:1008FF44
++XF86Launch4		:1008FF44
+ XF86Launch5		:1008FF45
+ XF86Launch6		:1008FF46
+ XF86Launch7		:1008FF47