From a93f757687841d9371975eb723678568bbc4e2da Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 10:15:33 +0100 Subject: remove dependency to intltool --- package/avahi/Makefile | 5 +++-- package/avahi/patches/patch-Makefile_am | 12 ++++++++++++ package/avahi/patches/patch-avahi-ui_Makefile_am | 19 +++++++++++++++++++ package/avahi/patches/patch-configure_ac | 10 ++++++++++ package/avahi/patches/patch-ltmain_sh | 6 +++--- 5 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 package/avahi/patches/patch-Makefile_am create mode 100644 package/avahi/patches/patch-avahi-ui_Makefile_am create mode 100644 package/avahi/patches/patch-configure_ac diff --git a/package/avahi/Makefile b/package/avahi/Makefile index fa8c56fe1..bd203e79e 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -5,11 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= avahi PKG_VERSION:= 0.6.31 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 2f22745b8f7368ad5a0a3fddac343f2d PKG_DESCR:= mDNS daemon PKG_SECTION:= dhcp -PKG_BUILDDEP:= libdaemon expat gdbm glib gettext-tiny gtk+ dbus +PKG_BUILDDEP:= autotool libdaemon expat gdbm glib gettext-tiny gtk+ dbus PKG_URL:= http://avahi.org/ PKG_SITES:= http://avahi.org/download/ PKG_NEED_CXX:= 1 @@ -33,6 +33,7 @@ $(eval $(call PKG_template,AVAHI_DAEMON,avahi-daemon,${PKG_VERSION}-${PKG_RELEAS $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_AVAHI_DNSCONFD},${PKGSD_AVAHI_DNSCONFD},${PKG_SECTION})) $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBAVAHI},${PKGSC_LIBAVAHI},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --enable-glib \ --enable-gtk2 \ --enable-libdaemon \ diff --git a/package/avahi/patches/patch-Makefile_am b/package/avahi/patches/patch-Makefile_am new file mode 100644 index 000000000..ff5160336 --- /dev/null +++ b/package/avahi/patches/patch-Makefile_am @@ -0,0 +1,12 @@ +--- avahi-0.6.31.orig/Makefile.am 2011-12-30 22:26:44.000000000 +0100 ++++ avahi-0.6.31/Makefile.am 2014-03-04 09:57:29.000000000 +0100 +@@ -75,8 +75,7 @@ SUBDIRS = \ + avahi-compat-howl \ + avahi-autoipd \ + avahi-ui \ +- avahi-ui-sharp \ +- po ++ avahi-ui-sharp + + DX_INPUT = \ + $(srcdir)/avahi-common/address.h \ diff --git a/package/avahi/patches/patch-avahi-ui_Makefile_am b/package/avahi/patches/patch-avahi-ui_Makefile_am new file mode 100644 index 000000000..c1744d9d0 --- /dev/null +++ b/package/avahi/patches/patch-avahi-ui_Makefile_am @@ -0,0 +1,19 @@ +--- avahi-0.6.31.orig/avahi-ui/Makefile.am 2012-02-14 23:22:16.000000000 +0100 ++++ avahi-0.6.31/avahi-ui/Makefile.am 2014-03-04 09:45:16.000000000 +0100 +@@ -79,9 +79,6 @@ libavahi_ui_gtk3_la_CFLAGS += -DDATABASE + endif + + bin_PROGRAMS = bssh +-desktop_DATA += bssh.desktop bvnc.desktop +-@INTLTOOL_DESKTOP_RULE@ +- + bssh_SOURCES = bssh.c + + if HAVE_GTK3 +@@ -108,6 +105,4 @@ endif # HAVE_GLIB + endif + endif + +-@INTLTOOL_DESKTOP_RULE@ +- + CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/package/avahi/patches/patch-configure_ac b/package/avahi/patches/patch-configure_ac new file mode 100644 index 000000000..c610da2cd --- /dev/null +++ b/package/avahi/patches/patch-configure_ac @@ -0,0 +1,10 @@ +--- avahi-0.6.31.orig/configure.ac 2012-02-14 22:44:25.000000000 +0100 ++++ avahi-0.6.31/configure.ac 2014-03-04 08:05:14.000000000 +0100 +@@ -412,7 +412,6 @@ if test "x$have_kqueue" = "xyes" ; then + AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) + fi + +-IT_PROG_INTLTOOL([0.35.0]) + GETTEXT_PACKAGE=avahi + AC_SUBST([GETTEXT_PACKAGE]) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) diff --git a/package/avahi/patches/patch-ltmain_sh b/package/avahi/patches/patch-ltmain_sh index c83acd926..e3bcd4083 100644 --- a/package/avahi/patches/patch-ltmain_sh +++ b/package/avahi/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ ---- avahi-0.6.30.orig/ltmain.sh 2011-04-04 00:10:35.000000000 +0200 -+++ avahi-0.6.30/ltmain.sh 2011-05-12 12:30:44.000000000 +0200 -@@ -5840,7 +5840,7 @@ func_mode_link () +--- avahi-0.6.31.orig/ltmain.sh 2012-02-14 23:36:26.000000000 +0100 ++++ avahi-0.6.31/ltmain.sh 2014-03-04 07:44:03.000000000 +0100 +@@ -5853,7 +5853,7 @@ func_mode_link () # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- cgit v1.2.3 From 111e0d7f09b5273a64e00e55210b6e5d747e6b90 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 11:17:27 +0100 Subject: be consistent with names for the ABI --- target/arm/sys-available/acmesystems-foxg20 | 3 ++- target/arm/sys-available/cubox-i | 2 +- target/arm/sys-available/keyasic-ka2000 | 2 +- target/arm/sys-available/raspberry-pi | 2 +- target/arm/sys-available/sharp-zaurus | 2 +- target/arm/sys-available/toolchain-arm | 2 +- target/arm/sys-available/toolchain-armhf | 4 ++-- target/config/Config.in | 34 ++++++++++++++--------------- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20 index 576468bbe..b907d39c8 100644 --- a/target/arm/sys-available/acmesystems-foxg20 +++ b/target/arm/sys-available/acmesystems-foxg20 @@ -2,13 +2,14 @@ config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 bool "Foxboard FOXG20" select ADK_arm select ADK_little + select ADK_soft_float + select ADK_eabi select ADK_acmesystems_foxg20 select ADK_KERNEL_ARCH_AT91 select ADK_KERNEL_ARCH_AT91SAM9260 select ADK_KERNEL_ARCH_AT91SAM9G20 select ADK_KERNEL_MACH_ACMENETUSFOXG20 select ADK_KERNEL_AEABI - select ADK_EABI select ADK_TARGET_WITH_WATCHDOG select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_RTC diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i index f7a4f59bc..3ee6bb8cd 100644 --- a/target/arm/sys-available/cubox-i +++ b/target/arm/sys-available/cubox-i @@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_CUBOX_I select ADK_arm select ADK_little select ADK_hard_float + select ADK_eabihf select ADK_cubox_i select ADK_CPU_CORTEX_A9 - select ADK_EABIHF select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000 index 36434269c..1610d4b42 100644 --- a/target/arm/sys-available/keyasic-ka2000 +++ b/target/arm/sys-available/keyasic-ka2000 @@ -3,8 +3,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000 select ADK_arm select ADK_little select ADK_soft_float + select ADK_eabi select ADK_keyasic_ka2000 - select ADK_EABI select ADK_CPU_ARM926EJ_S select ADK_TOOLCHAIN select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index ecf224a1a..3c0f2ad30 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -3,9 +3,9 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_arm select ADK_little select ADK_hard_float + select ADK_eabihf select ADK_raspberry_pi select ADK_CPU_ARM1176JZF_S - select ADK_EABIHF select ADK_TARGET_WITH_MMC select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus index 0f124719d..a58401cf3 100644 --- a/target/arm/sys-available/sharp-zaurus +++ b/target/arm/sys-available/sharp-zaurus @@ -3,7 +3,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS select ADK_arm select ADK_sharp_zaurus select ADK_little - select ADK_EABI + select ADK_eabi select ADK_CPU_XSCALE select ADK_TARGET_CPU_WITH_IWMMXT select ADK_TARGET_WITH_VGA diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index 2cbe76a2e..c6bb00b43 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -4,8 +4,8 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_toolchain_arm select ADK_little select ADK_soft_float + select ADK_eabi select ADK_TOOLCHAIN - select ADK_EABI select ADK_TARGET_PACKAGE_TGZ help ARM toolchain (soft float). diff --git a/target/arm/sys-available/toolchain-armhf b/target/arm/sys-available/toolchain-armhf index 0517118c3..89383f44f 100644 --- a/target/arm/sys-available/toolchain-armhf +++ b/target/arm/sys-available/toolchain-armhf @@ -1,11 +1,11 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMHF bool "Toolchain only (hard float)" select ADK_arm - select ADK_toolchain_armhf select ADK_little select ADK_hard_float + select ADK_eabihf + select ADK_toolchain_armhf select ADK_TOOLCHAIN - select ADK_EABIHF select ADK_TARGET_PACKAGE_TGZ help ARM toolchain (hard float). diff --git a/target/config/Config.in b/target/config/Config.in index 44ee685fe..1eda1e3a4 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -117,14 +117,20 @@ config ADK_n32 config ADK_n64 boolean +config ADK_eabi + boolean + +config ADK_eabihf + boolean + config ADK_TARGET_ABI string default "n32" if ADK_n32 default "n64" if ADK_n64 default "32" if ADK_32 default "x32" if ADK_x32 - default "eabi" if ADK_EABI - default "eabihf" if ADK_EABIHF + default "eabi" if ADK_eabi + default "eabihf" if ADK_eabihf config ADK_TARGET_MIPS_ABI depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS @@ -251,19 +257,19 @@ depends on ADK_TARGET_SYSTEM_QEMU_ARM config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB boolean "ARM Ltd. Versatile/PB" select ADK_soft_float - select ADK_EABI + select ADK_eabi select ADK_CPU_ARM926EJ_S config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 boolean "ARM Ltd. Versatile Express for Cortex-A9" select ADK_hard_float - select ADK_EABIHF + select ADK_eabihf select ADK_CPU_CORTEX_A9 config ADK_TARGET_QEMU_ARM_MODEL_SPITZ boolean "Xscale PXA270 Spitz PDA" select ADK_soft_float - select ADK_EABI + select ADK_eabi select ADK_CPU_XSCALE select ADK_TARGET_WITH_VGA @@ -387,12 +393,6 @@ config ADK_TARGET_KERNEL_MAY_64BIT config ADK_TOOLCHAIN_ONLY boolean -config ADK_EABI - boolean - -config ADK_EABIHF - boolean - config ADK_LINUX_64 boolean @@ -700,24 +700,24 @@ endchoice config ADK_TARGET_SUFFIX string - default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_EABIHF - default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_EABI + default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_eabihf + default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_eabi default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64 default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64 default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64 default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64 default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64 default "gnu" if ADK_TARGET_LIB_GLIBC - default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF - default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI + default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_eabihf + default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_eabi default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 && ADK_TARGET_KERNEL64 default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64 default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64 default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64 default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64 default "uclibc" if ADK_TARGET_LIB_UCLIBC - default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF - default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI + default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_eabihf + default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_eabi default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64 default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64 default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64 -- cgit v1.2.3 From 0755318d755d6fee3f307582e8f0efa67b893709 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 14:50:25 +0100 Subject: update xkeyboard-config, pregenerate xml files, so no dependency to intltool exist --- package/xkeyboard-config/Makefile | 12 +- package/xkeyboard-config/patches/patch-Makefile_am | 10 + .../xkeyboard-config/patches/patch-configure_ac | 13 + .../patches/patch-rules_Makefile_am | 10 + .../patches/patch-rules_base_extras_xml_in | 855 +++ .../patches/patch-rules_base_xml_in | 7654 ++++++++++++++++++++ .../patches/patch-rules_evdev_extras_xml_in | 855 +++ .../patches/patch-rules_evdev_xml_in | 7654 ++++++++++++++++++++ 8 files changed, 17059 insertions(+), 4 deletions(-) create mode 100644 package/xkeyboard-config/patches/patch-Makefile_am create mode 100644 package/xkeyboard-config/patches/patch-configure_ac create mode 100644 package/xkeyboard-config/patches/patch-rules_Makefile_am create mode 100644 package/xkeyboard-config/patches/patch-rules_base_extras_xml_in create mode 100644 package/xkeyboard-config/patches/patch-rules_base_xml_in create mode 100644 package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in create mode 100644 package/xkeyboard-config/patches/patch-rules_evdev_xml_in diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 68a89e31e..df46bc896 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -4,18 +4,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xkeyboard-config -PKG_VERSION:= 2.6 +PKG_VERSION:= 2.11 PKG_RELEASE:= 1 -PKG_MD5SUM:= 9a77cb477aec1123720332a091255f25 +PKG_MD5SUM:= e3defd29cc464cc1a1dfa0eebaca53b1 PKG_DESCR:= X keyboard config PKG_SECTION:= x11/libs -PKG_BUILDDEP:= xkbcomp -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_BUILDDEP:= autotool util-macros xkbcomp +PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ + +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XKEYBOARD_CONFIG,xkeyboard-config,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + xkeyboard-config-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb ${CP} ${WRKINST}/usr/share/X11/xkb/* \ diff --git a/package/xkeyboard-config/patches/patch-Makefile_am b/package/xkeyboard-config/patches/patch-Makefile_am new file mode 100644 index 000000000..91f90f91b --- /dev/null +++ b/package/xkeyboard-config/patches/patch-Makefile_am @@ -0,0 +1,10 @@ +--- xkeyboard-config-2.11.orig/Makefile.am 2013-10-19 18:02:53.000000000 +0200 ++++ xkeyboard-config-2.11/Makefile.am 2014-03-04 14:43:40.000000000 +0100 +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = compat geometry keycodes po rules symbols types docs man ++SUBDIRS = compat geometry keycodes rules symbols types + + pkgconfigdir = $(datadir)/pkgconfig + pkgconfig_DATA = xkeyboard-config.pc diff --git a/package/xkeyboard-config/patches/patch-configure_ac b/package/xkeyboard-config/patches/patch-configure_ac new file mode 100644 index 000000000..2cb7cc7db --- /dev/null +++ b/package/xkeyboard-config/patches/patch-configure_ac @@ -0,0 +1,13 @@ +--- xkeyboard-config-2.11.orig/configure.ac 2014-01-29 21:08:27.000000000 +0100 ++++ xkeyboard-config-2.11/configure.ac 2014-03-04 14:43:26.000000000 +0100 +@@ -63,10 +63,6 @@ AM_CONDITIONAL(USE_COMPAT_RULES, test "x + # **** + # i18n + # **** +-AC_PROG_INTLTOOL(0.30) +- +-AM_GNU_GETTEXT_VERSION([0.18.1]) +-AM_GNU_GETTEXT([external]) + + GETTEXT_PACKAGE=xkeyboard-config + AC_SUBST(GETTEXT_PACKAGE) diff --git a/package/xkeyboard-config/patches/patch-rules_Makefile_am b/package/xkeyboard-config/patches/patch-rules_Makefile_am new file mode 100644 index 000000000..ac07e510b --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_Makefile_am @@ -0,0 +1,10 @@ +--- xkeyboard-config-2.11.orig/rules/Makefile.am 2013-12-17 23:59:06.000000000 +0100 ++++ xkeyboard-config-2.11/rules/Makefile.am 2014-03-04 14:30:44.000000000 +0100 +@@ -244,4 +244,6 @@ MAINTAINERCLEANFILES = $(srcdir)/evdev.x + rulesdir = $(xkb_base)/rules + xmldir = $(rulesdir) + +-@INTLTOOL_XML_NOMERGE_RULE@ ++# remove intltool-merge dependency ++%.xml: %.xml.in ++ cp $< $@ diff --git a/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in new file mode 100644 index 000000000..beb2b7a9d --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_base_extras_xml_in @@ -0,0 +1,855 @@ +--- xkeyboard-config-2.11.orig/rules/base.extras.xml.in 2013-12-24 00:48:45.000000000 +0100 ++++ xkeyboard-config-2.11/rules/base.extras.xml.in 2014-03-04 14:31:19.000000000 +0100 +@@ -1,4 +1,4 @@ +- ++ + + + +@@ -6,8 +6,8 @@ + + + apl +- <_shortDescription>apl +- <_description>APL keyboard symbols ++ apl ++ APL keyboard symbols + eng + + +@@ -58,29 +58,29 @@ + + + ca +- <_shortDescription>fr +- <_description>French (Canada) ++ fr ++ French (Canada) + fra + + + + + kut +- <_shortDescription>kut +- <_description>Kutenai ++ kut ++ Kutenai + + + + + shs +- <_shortDescription>shs +- <_description>Secwepemctsin ++ shs ++ Secwepemctsin + + + + + sun_type6 +- <_description>Multilingual (Canada, Sun Type 6/7) ++ Multilingual (Canada, Sun Type 6/7) + + + +@@ -88,8 +88,8 @@ + + + de +- <_shortDescription>de +- <_description>German ++ de ++ German + + ger + +@@ -98,7 +98,7 @@ + + + us +- <_description>German (US keyboard with German letters) ++ German (US keyboard with German letters) + + eng + +@@ -107,7 +107,7 @@ + + + hu +- <_description>German (with Hungarian letters and no dead keys) ++ German (with Hungarian letters and no dead keys) + + ger + hun +@@ -117,7 +117,7 @@ + + + sun_type6 +- <_description>German (Sun Type 6/7) ++ German (Sun Type 6/7) + + + +@@ -125,15 +125,15 @@ + + + ir +- <_shortDescription>fa +- <_description>Persian ++ fa ++ Persian + per + + + + + ave +- <_description>Avestan ++ Avestan + ave + + +@@ -142,21 +142,21 @@ + + + lt +- <_shortDescription>lt +- <_description>Lithuanian ++ lt ++ Lithuanian + lit + + + + + us_dvorak +- <_description>Lithuanian (US Dvorak with Lithuanian letters) ++ Lithuanian (US Dvorak with Lithuanian letters) + + + + + sun_type6 +- <_description>Lithuanian (Sun Type 6/7) ++ Lithuanian (Sun Type 6/7) + + + +@@ -164,8 +164,8 @@ + + + lv +- <_shortDescription>lv +- <_description>Latvian ++ lv ++ Latvian + + lav + +@@ -174,55 +174,55 @@ + + + dvorak +- <_description>Latvian (US Dvorak) ++ Latvian (US Dvorak) + + + + + ykeydvorak +- <_description>Latvian (US Dvorak, Y variant) ++ Latvian (US Dvorak, Y variant) + + + + + minuskeydvorak +- <_description>Latvian (US Dvorak, minus variant) ++ Latvian (US Dvorak, minus variant) + + + + + dvorakprogr +- <_description>Latvian (programmer US Dvorak) ++ Latvian (programmer US Dvorak) + + + + + ykeydvorakprogr +- <_description>Latvian (programmer US Dvorak, Y variant) ++ Latvian (programmer US Dvorak, Y variant) + + + + + minuskeydvorakprogr +- <_description>Latvian (programmer US Dvorak, minus variant) ++ Latvian (programmer US Dvorak, minus variant) + + + + + colemak +- <_description>Latvian (US Colemak) ++ Latvian (US Colemak) + + + + + apostrophecolemak +- <_description>Latvian (US Colemak, apostrophe variant) ++ Latvian (US Colemak, apostrophe variant) + + + + + sun_type6 +- <_description>Latvian (Sun Type 6/7) ++ Latvian (Sun Type 6/7) + + + +@@ -230,34 +230,34 @@ + + + us +- <_shortDescription>en +- <_description>English (US) ++ en ++ English (US) + eng + + + + + intl-unicode +- <_description>English (US, international AltGr Unicode combining) ++ English (US, international AltGr Unicode combining) + + + + + alt-intl-unicode +- <_description>English (US, international AltGr Unicode combining, alternative) ++ English (US, international AltGr Unicode combining, alternative) + + + + + ats +- <_description>Atsina +- ++ Atsina ++ + + + + + crd +- <_description>Coeur d'Alene Salish ++ Coeur d'Alene Salish + crd + + +@@ -274,13 +274,13 @@ + + + sun_type6 +- <_description>English (US, Sun Type 6/7) ++ English (US, Sun Type 6/7) + + + + + norman +- <_description>English (Norman) ++ English (Norman) + + + +@@ -288,27 +288,27 @@ + + + pl +- <_shortDescription>pl +- <_description>Polish ++ pl ++ Polish + pol + + + + + intl +- <_description>Polish (international with dead keys) ++ Polish (international with dead keys) + + + + + colemak +- <_description>Polish (Colemak) ++ Polish (Colemak) + + + + + sun_type6 +- <_description>Polish (Sun Type 6/7) ++ Polish (Sun Type 6/7) + + + +@@ -316,16 +316,16 @@ + + + ro +- <_shortDescription>ro +- <_description>Romanian ++ ro ++ Romanian + rum + + + + + crh_dobruja +- <_shortDescription>crh +- <_description>Crimean Tatar (Dobruja Q) ++ crh ++ Crimean Tatar (Dobruja Q) + + crh + +@@ -334,13 +334,13 @@ + + + ergonomic +- <_description>Romanian (ergonomic Touchtype) ++ Romanian (ergonomic Touchtype) + + + + + sun_type6 +- <_description>Romanian (Sun Type 6/7) ++ Romanian (Sun Type 6/7) + + + +@@ -348,15 +348,15 @@ + + + rs +- <_shortDescription>sr +- <_description>Serbian ++ sr ++ Serbian + srp + + + + + combiningkeys +- <_description>Serbian (combining accents instead of dead keys) ++ Serbian (combining accents instead of dead keys) + + + +@@ -364,8 +364,8 @@ + + + ru +- <_shortDescription>ru +- <_description>Russian ++ ru ++ Russian + + + +@@ -378,8 +378,8 @@ + + + ruu +- <_shortDescription>ru +- <_description>Russian (with Ukrainian-Belorussian layout) ++ ru ++ Russian (with Ukrainian-Belorussian layout) + rus + ukr + bel +@@ -388,7 +388,7 @@ + + + sun_type6 +- <_description>Russian (Sun Type 6/7) ++ Russian (Sun Type 6/7) + + + +@@ -396,8 +396,8 @@ + + + am +- <_shortDescription>hy +- <_description>Armenian ++ hy ++ Armenian + + hye + +@@ -406,7 +406,7 @@ + + + olpc-phonetic +- <_description>Armenian (OLPC phonetic) ++ Armenian (OLPC phonetic) + + + +@@ -414,15 +414,15 @@ + + + il +- <_shortDescription>he +- <_description>Hebrew ++ he ++ Hebrew + heb + + + + + biblicalSIL +- <_description>Hebrew (Biblical, SIL phonetic) ++ Hebrew (Biblical, SIL phonetic) + heb + + +@@ -431,14 +431,14 @@ + + + ara +- <_shortDescription>ar +- <_description>Arabic ++ ar ++ Arabic + + + + + sun_type6 +- <_description>Arabic (Sun Type 6/7) ++ Arabic (Sun Type 6/7) + + + +@@ -446,14 +446,14 @@ + + + be +- <_shortDescription>be +- <_description>Belgian ++ be ++ Belgian + + + + + sun_type6 +- <_description>Belgian (Sun Type 6/7) ++ Belgian (Sun Type 6/7) + + + +@@ -461,14 +461,14 @@ + + + br +- <_shortDescription>pt +- <_description>Portuguese (Brazil) ++ pt ++ Portuguese (Brazil) + + + + + sun_type6 +- <_description>Portuguese (Brazil, Sun Type 6/7) ++ Portuguese (Brazil, Sun Type 6/7) + + + +@@ -476,14 +476,14 @@ + + + cz +- <_shortDescription>cs +- <_description>Czech ++ cs ++ Czech + + + + + sun_type6 +- <_description>Czech (Sun Type 6/7) ++ Czech (Sun Type 6/7) + + + +@@ -491,14 +491,14 @@ + + + dk +- <_shortDescription>da +- <_description>Danish ++ da ++ Danish + + + + + sun_type6 +- <_description>Danish (Sun Type 6/7) ++ Danish (Sun Type 6/7) + + + +@@ -506,14 +506,14 @@ + + + nl +- <_shortDescription>nl +- <_description>Dutch ++ nl ++ Dutch + + + + + sun_type6 +- <_description>Dutch (Sun Type 6/7) ++ Dutch (Sun Type 6/7) + + + +@@ -521,14 +521,14 @@ + + + ee +- <_shortDescription>et +- <_description>Estonian ++ et ++ Estonian + + + + + sun_type6 +- <_description>Estonian (Sun Type 6/7) ++ Estonian (Sun Type 6/7) + + + +@@ -536,14 +536,14 @@ + + + fi +- <_shortDescription>fi +- <_description>Finnish ++ fi ++ Finnish + + + + + sun_type6 +- <_description>Finnish (Sun Type 6/7) ++ Finnish (Sun Type 6/7) + + + +@@ -551,14 +551,14 @@ + + + fr +- <_shortDescription>fr +- <_description>French ++ fr ++ French + + + + + sun_type6 +- <_description>French (Sun Type 6/7) ++ French (Sun Type 6/7) + + + +@@ -566,14 +566,14 @@ + + + gr +- <_shortDescription>gr +- <_description>Greek ++ gr ++ Greek + + + + + sun_type6 +- <_description>Greek (Sun Type 6/7) ++ Greek (Sun Type 6/7) + + + +@@ -581,14 +581,14 @@ + + + it +- <_shortDescription>it +- <_description>Italian ++ it ++ Italian + + + + + sun_type6 +- <_description>Italian (Sun Type 6/7) ++ Italian (Sun Type 6/7) + + + +@@ -596,26 +596,26 @@ + + + jp +- <_shortDescription>ja +- <_description>Japanese ++ ja ++ Japanese + + + + + sun_type6 +- <_description>Japanese (Sun Type 6) ++ Japanese (Sun Type 6) + + + + + sun_type7 +- <_description>Japanese (Sun Type 7 - pc compatible) ++ Japanese (Sun Type 7 - pc compatible) + + + + + sun_type7_suncompat +- <_description>Japanese (Sun Type 7 - sun compatible) ++ Japanese (Sun Type 7 - sun compatible) + + + +@@ -623,14 +623,14 @@ + + + no +- <_shortDescription>no +- <_description>Norwegian ++ no ++ Norwegian + + + + + sun_type6 +- <_description>Norwegian (Sun Type 6/7) ++ Norwegian (Sun Type 6/7) + + + +@@ -638,14 +638,14 @@ + + + pt +- <_shortDescription>pt +- <_description>Portuguese ++ pt ++ Portuguese + + + + + sun_type6 +- <_description>Portuguese (Sun Type 6/7) ++ Portuguese (Sun Type 6/7) + + + +@@ -653,14 +653,14 @@ + + + sk +- <_shortDescription>sk +- <_description>Slovak ++ sk ++ Slovak + + + + + sun_type6 +- <_description>Slovak (Sun Type 6/7) ++ Slovak (Sun Type 6/7) + + + +@@ -668,14 +668,14 @@ + + + es +- <_shortDescription>es +- <_description>Spanish ++ es ++ Spanish + + + + + sun_type6 +- <_description>Spanish (Sun Type 6/7) ++ Spanish (Sun Type 6/7) + + + +@@ -683,14 +683,14 @@ + + + se +- <_shortDescription>sv +- <_description>Swedish ++ sv ++ Swedish + + + + + sun_type6 +- <_description>Swedish (Sun Type 6/7) ++ Swedish (Sun Type 6/7) + + + +@@ -698,20 +698,20 @@ + + + ch +- <_shortDescription>de +- <_description>German (Switzerland) ++ de ++ German (Switzerland) + + + + + sun_type6_de +- <_description>German (Switzerland, Sun Type 6/7) ++ German (Switzerland, Sun Type 6/7) + + + + + sun_type6_fr +- <_description>French (Switzerland, Sun Type 6/7) ++ French (Switzerland, Sun Type 6/7) + + + +@@ -719,14 +719,14 @@ + + + tr +- <_shortDescription>tr +- <_description>Turkish ++ tr ++ Turkish + + + + + sun_type6 +- <_description>Turkish (Sun Type 6/7) ++ Turkish (Sun Type 6/7) + + + +@@ -734,14 +734,14 @@ + + + ua +- <_shortDescription>uk +- <_description>Ukrainian ++ uk ++ Ukrainian + + + + + sun_type6 +- <_description>Ukrainian (Sun Type 6/7) ++ Ukrainian (Sun Type 6/7) + + + +@@ -749,14 +749,14 @@ + + + gb +- <_shortDescription>en +- <_description>English (UK) ++ en ++ English (UK) + + + + + sun_type6 +- <_description>English (UK, Sun Type 6/7) ++ English (UK, Sun Type 6/7) + + + +@@ -764,18 +764,18 @@ + + + kr +- <_shortDescription>ko +- <_description>Korean ++ ko ++ Korean + + + + + sun_type6 +- <_description>Korean (Sun Type 6/7) ++ Korean (Sun Type 6/7) + + + + + + +- ++ +\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_base_xml_in b/package/xkeyboard-config/patches/patch-rules_base_xml_in new file mode 100644 index 000000000..5249ade99 --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_base_xml_in @@ -0,0 +1,7654 @@ +--- xkeyboard-config-2.11.orig/rules/base.xml.in 2014-01-15 02:02:39.000000000 +0100 ++++ xkeyboard-config-2.11/rules/base.xml.in 2014-03-04 14:31:12.000000000 +0100 +@@ -5,627 +5,627 @@ + + + pc101 +- <_description>Generic 101-key PC ++ Generic 101-key PC + Generic + + + + + pc102 +- <_description>Generic 102-key (Intl) PC ++ Generic 102-key (Intl) PC + Generic + + + + + pc104 +- <_description>Generic 104-key PC ++ Generic 104-key PC + Generic + + + + + pc105 +- <_description>Generic 105-key (Intl) PC ++ Generic 105-key (Intl) PC + Generic + + + + + dell101 +- <_description>Dell 101-key PC ++ Dell 101-key PC + Dell + + + + + latitude +- <_description>Dell Latitude series laptop ++ Dell Latitude series laptop + Dell + + + + + dellm65 +- <_description>Dell Precision M65 ++ Dell Precision M65 + Dell + + + + + everex +- <_description>Everex STEPnote ++ Everex STEPnote + Everex + + + + + flexpro +- <_description>Keytronic FlexPro ++ Keytronic FlexPro + Keytronic + + + + + microsoft +- <_description>Microsoft Natural ++ Microsoft Natural + Microsoft Inc. + + + + + omnikey101 +- <_description>Northgate OmniKey 101 ++ Northgate OmniKey 101 + Northgate + + + + + winbook +- <_description>Winbook Model XP5 ++ Winbook Model XP5 + Generic + + + + + pc98 +- <_description>PC-98xx Series ++ PC-98xx Series + Generic + + + + + a4techKB21 +- <_description>A4Tech KB-21 ++ A4Tech KB-21 + A4Tech + + + + + a4techKBS8 +- <_description>A4Tech KBS-8 ++ A4Tech KBS-8 + A4Tech + + + + + a4_rfkb23 +- <_description>A4Tech Wireless Desktop RFKB-23 ++ A4Tech Wireless Desktop RFKB-23 + A4Tech + + + + + airkey +- <_description>Acer AirKey V ++ Acer AirKey V + Acer + + + + + azonaRF2300 +- <_description>Azona RF2300 wireless Internet Keyboard ++ Azona RF2300 wireless Internet Keyboard + Azona + + + + + scorpius +- <_description>Advance Scorpius KI ++ Advance Scorpius KI + Scorpius + + + + + brother +- <_description>Brother Internet Keyboard ++ Brother Internet Keyboard + Brother + + + + + btc5113rf +- <_description>BTC 5113RF Multimedia ++ BTC 5113RF Multimedia + BTC + + + + + btc5126t +- <_description>BTC 5126T ++ BTC 5126T + BTC + + + + + btc6301urf +- <_description>BTC 6301URF ++ BTC 6301URF + BTC + + + + + btc9000 +- <_description>BTC 9000 ++ BTC 9000 + BTC + + + + + btc9000a +- <_description>BTC 9000A ++ BTC 9000A + BTC + + + + + btc9001ah +- <_description>BTC 9001AH ++ BTC 9001AH + BTC + + + + + btc5090 +- <_description>BTC 5090 ++ BTC 5090 + BTC + + + + + btc9019u +- <_description>BTC 9019U ++ BTC 9019U + BTC + + + + + btc9116u +- <_description>BTC 9116U Mini Wireless Internet and Gaming ++ BTC 9116U Mini Wireless Internet and Gaming + + + + + cherryblue +- <_description>Cherry Blue Line CyBo@rd ++ Cherry Blue Line CyBo@rd + + + + + cherryblueb +- <_description>Cherry CyMotion Master XPress ++ Cherry CyMotion Master XPress + Cherry + + + + + cherrybluea +- <_description>Cherry Blue Line CyBo@rd (alternate option) ++ Cherry Blue Line CyBo@rd (alternate option) + Cherry + + + + + cherrycyboard +- <_description>Cherry CyBo@rd USB-Hub ++ Cherry CyBo@rd USB-Hub + Cherry + + + + + cherrycmexpert +- <_description>Cherry CyMotion Expert ++ Cherry CyMotion Expert + Cherry + + + + + cherrybunlim +- <_description>Cherry B.UNLIMITED ++ Cherry B.UNLIMITED + Cherry + + + + + chicony +- <_description>Chicony Internet Keyboard ++ Chicony Internet Keyboard + Chicony + + + + + chicony0108 +- <_description>Chicony KU-0108 ++ Chicony KU-0108 + Chicony + + + + + chicony0420 +- <_description>Chicony KU-0420 ++ Chicony KU-0420 + Chicony + + + + + chicony9885 +- <_description>Chicony KB-9885 ++ Chicony KB-9885 + Chicony + + + + + compaqeak8 +- <_description>Compaq Easy Access Keyboard ++ Compaq Easy Access Keyboard + Compaq + + + + + compaqik7 +- <_description>Compaq Internet Keyboard (7 keys) ++ Compaq Internet Keyboard (7 keys) + Compaq + + + + + compaqik13 +- <_description>Compaq Internet Keyboard (13 keys) ++ Compaq Internet Keyboard (13 keys) + Compaq + + + + + compaqik18 +- <_description>Compaq Internet Keyboard (18 keys) ++ Compaq Internet Keyboard (18 keys) + Compaq + + + + + cymotionlinux +- <_description>Cherry CyMotion Master Linux ++ Cherry CyMotion Master Linux + Cherry + + + + + armada +- <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard ++ Laptop/notebook Compaq (eg. Armada) Laptop Keyboard + Compaq + + + + + presario +- <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard ++ Laptop/notebook Compaq (eg. Presario) Internet Keyboard + Compaq + + + + + ipaq +- <_description>Compaq iPaq Keyboard ++ Compaq iPaq Keyboard + Compaq + + + + + dell +- <_description>Dell ++ Dell + Dell + + + + + dellsk8125 +- <_description>Dell SK-8125 ++ Dell SK-8125 + Dell + + + + + dellsk8135 +- <_description>Dell SK-8135 ++ Dell SK-8135 + Dell + + + + + dellusbmm +- <_description>Dell USB Multimedia Keyboard ++ Dell USB Multimedia Keyboard + Dell + + + + + inspiron +- <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx ++ Dell Laptop/notebook Inspiron 6xxx/8xxx + Dell + + + + + precision_m +- <_description>Dell Laptop/notebook Precision M series ++ Dell Laptop/notebook Precision M series + Dell + + + + + dexxa +- <_description>Dexxa Wireless Desktop Keyboard ++ Dexxa Wireless Desktop Keyboard + Dexxa + + + + + diamond +- <_description>Diamond 9801 / 9802 series ++ Diamond 9801 / 9802 series + Diamond + + + + + dtk2000 +- <_description>DTK2000 ++ DTK2000 + + + + + ennyah_dkb1008 +- <_description>Ennyah DKB-1008 ++ Ennyah DKB-1008 + Ennyah + + + + + fscaa1667g +- <_description>Fujitsu-Siemens Computers AMILO laptop ++ Fujitsu-Siemens Computers AMILO laptop + Fujitsu-Siemens + + + + + genius +- <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910 ++ Genius Comfy KB-16M / Genius MM Keyboard KWD-910 + Genius + + + + + geniuscomfy +- <_description>Genius Comfy KB-12e ++ Genius Comfy KB-12e + Genius + + + + + geniuscomfy2 +- <_description>Genius Comfy KB-21e-Scroll ++ Genius Comfy KB-21e-Scroll + Genius + + + + + geniuskb19e +- <_description>Genius KB-19e NB ++ Genius KB-19e NB + Genius + + + + + geniuskkb2050hs +- <_description>Genius KKB-2050HS ++ Genius KKB-2050HS + Genius + + + + + gyration +- <_description>Gyration ++ Gyration + Gyration + + + + + htcdream +- <_description>HTC Dream ++ HTC Dream + HTC + + + + + kinesis +- <_description>Kinesis ++ Kinesis + Kinesis + + + + + logitech_base +- <_description>Logitech Generic Keyboard ++ Logitech Generic Keyboard + Logitech + + + + + logitech_g15 +- <_description>Logitech G15 extra keys via G15daemon ++ Logitech G15 extra keys via G15daemon + Logitech + + + + + hpi6 +- <_description>Hewlett-Packard Internet Keyboard ++ Hewlett-Packard Internet Keyboard + Hewlett-Packard + + + + + hp250x +- <_description>Hewlett-Packard SK-250x Multimedia Keyboard ++ Hewlett-Packard SK-250x Multimedia Keyboard + Hewlett-Packard + + + + + hpxe3gc +- <_description>Hewlett-Packard Omnibook XE3 GC ++ Hewlett-Packard Omnibook XE3 GC + Hewlett-Packard + + + + + hpxe3gf +- <_description>Hewlett-Packard Omnibook XE3 GF ++ Hewlett-Packard Omnibook XE3 GF + Hewlett-Packard + + + + + hpxt1000 +- <_description>Hewlett-Packard Omnibook XT1000 ++ Hewlett-Packard Omnibook XT1000 + Hewlett-Packard + + + + + hpdv5 +- <_description>Hewlett-Packard Pavilion dv5 ++ Hewlett-Packard Pavilion dv5 + Hewlett-Packard + + + + + hpzt11xx +- <_description>Hewlett-Packard Pavilion ZT11xx ++ Hewlett-Packard Pavilion ZT11xx + Hewlett-Packard + + + + + hp500fa +- <_description>Hewlett-Packard Omnibook 500 FA ++ Hewlett-Packard Omnibook 500 FA + Hewlett-Packard + + + + + hp5xx +- <_description>Hewlett-Packard Omnibook 5xx ++ Hewlett-Packard Omnibook 5xx + Hewlett-Packard + + + + + hpnx9020 +- <_description>Hewlett-Packard nx9020 ++ Hewlett-Packard nx9020 + Hewlett-Packard + + + + + hp6000 +- <_description>Hewlett-Packard Omnibook 6000/6100 ++ Hewlett-Packard Omnibook 6000/6100 + Hewlett-Packard + + + + + honeywell_euroboard +- <_description>Honeywell Euroboard ++ Honeywell Euroboard + Hewlett-Packard + + + + + hpmini110 +- <_description>Hewlett-Packard Mini 110 Notebook ++ Hewlett-Packard Mini 110 Notebook + Hewlett-Packard + + + + + rapidaccess +- <_description>IBM Rapid Access ++ IBM Rapid Access + Lenovo (previously IBM) + + + + + rapidaccess2 +- <_description>IBM Rapid Access II ++ IBM Rapid Access II + Lenovo (previously IBM) + + + + + thinkpad +- <_description>IBM ThinkPad 560Z/600/600E/A22E ++ IBM ThinkPad 560Z/600/600E/A22E + Lenovo (previously IBM) + + + + + thinkpad60 +- <_description>IBM ThinkPad R60/T60/R61/T61 ++ IBM ThinkPad R60/T60/R61/T61 + Lenovo (previously IBM) + + + + + thinkpadz60 +- <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t ++ IBM ThinkPad Z60m/Z60t/Z61m/Z61t + Lenovo (previously IBM) + + + + + ibm_spacesaver +- <_description>IBM Space Saver ++ IBM Space Saver + Lenovo (previously IBM) + + + + + logiaccess +- <_description>Logitech Access Keyboard ++ Logitech Access Keyboard + Logitech + + + + + logiclx300 +- <_description>Logitech Cordless Desktop LX-300 ++ Logitech Cordless Desktop LX-300 + Logitech + + + + + logii350 +- <_description>Logitech Internet 350 Keyboard ++ Logitech Internet 350 Keyboard + Logitech + 046d:c313 + +@@ -633,665 +633,665 @@ + + + logimel +- <_description>Logitech Media Elite Keyboard ++ Logitech Media Elite Keyboard + Logitech + + + + + logicd +- <_description>Logitech Cordless Desktop ++ Logitech Cordless Desktop + Logitech + + + + + logicd_it +- <_description>Logitech Cordless Desktop iTouch ++ Logitech Cordless Desktop iTouch + Logitech + + + + + logicd_nav +- <_description>Logitech Cordless Desktop Navigator ++ Logitech Cordless Desktop Navigator + Logitech + + + + + logicd_opt +- <_description>Logitech Cordless Desktop Optical ++ Logitech Cordless Desktop Optical + Logitech + + + + + logicda +- <_description>Logitech Cordless Desktop (alternate option) ++ Logitech Cordless Desktop (alternate option) + Logitech + + + + + logicdpa2 +- <_description>Logitech Cordless Desktop Pro (alternate option 2) ++ Logitech Cordless Desktop Pro (alternate option 2) + Logitech + + + + + logicfn +- <_description>Logitech Cordless Freedom/Desktop Navigator ++ Logitech Cordless Freedom/Desktop Navigator + Logitech + + + + + logicdn +- <_description>Logitech Cordless Desktop Navigator ++ Logitech Cordless Desktop Navigator + Logitech + + + + + logiitc +- <_description>Logitech iTouch Cordless Keyboard (model Y-RB6) ++ Logitech iTouch Cordless Keyboard (model Y-RB6) + Logitech + + + + + logiik +- <_description>Logitech Internet Keyboard ++ Logitech Internet Keyboard + Logitech + + + + + itouch +- <_description>Logitech iTouch ++ Logitech iTouch + Logitech + + + + + logicink +- <_description>Logitech Internet Navigator Keyboard ++ Logitech Internet Navigator Keyboard + Logitech + + + + + logiex110 +- <_description>Logitech Cordless Desktop EX110 ++ Logitech Cordless Desktop EX110 + Logitech + + + + + logiinkse +- <_description>Logitech iTouch Internet Navigator Keyboard SE ++ Logitech iTouch Internet Navigator Keyboard SE + Logitech + + + + + logiinkseusb +- <_description>Logitech iTouch Internet Navigator Keyboard SE (USB) ++ Logitech iTouch Internet Navigator Keyboard SE (USB) + Logitech + + + + + logiultrax +- <_description>Logitech Ultra-X Keyboard ++ Logitech Ultra-X Keyboard + Logitech + + + + + logiultraxc +- <_description>Logitech Ultra-X Cordless Media Desktop Keyboard ++ Logitech Ultra-X Cordless Media Desktop Keyboard + Logitech + + + + + logidinovo +- <_description>Logitech diNovo Keyboard ++ Logitech diNovo Keyboard + Logitech + + + + + logidinovoedge +- <_description>Logitech diNovo Edge Keyboard ++ Logitech diNovo Edge Keyboard + Logitech + + + + + mx1998 +- <_description>Memorex MX1998 ++ Memorex MX1998 + Memorex + + + + + mx2500 +- <_description>Memorex MX2500 EZ-Access Keyboard ++ Memorex MX2500 EZ-Access Keyboard + Memorex + + + + + mx2750 +- <_description>Memorex MX2750 ++ Memorex MX2750 + Memorex + + + + + microsoft4000 +- <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000 ++ Microsoft Natural Wireless Ergonomic Keyboard 4000 + Microsoft Inc. + + + + + microsoft7000 +- <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000 ++ Microsoft Natural Wireless Ergonomic Keyboard 7000 + Microsoft Inc. + + + + + microsoftinet +- <_description>Microsoft Internet Keyboard ++ Microsoft Internet Keyboard + Microsoft Inc. + + + + + microsoftpro +- <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro ++ Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro + Microsoft Inc. + + + + + microsoftprousb +- <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro ++ Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro + Microsoft Inc. + + + + + microsoftprooem +- <_description>Microsoft Natural Keyboard Pro OEM ++ Microsoft Natural Keyboard Pro OEM + Microsoft Inc. + + + + + vsonku306 +- <_description>ViewSonic KU-306 Internet Keyboard ++ ViewSonic KU-306 Internet Keyboard + ViewSonic + + + + + microsoftprose +- <_description>Microsoft Internet Keyboard Pro, Swedish ++ Microsoft Internet Keyboard Pro, Swedish + Microsoft Inc. + + + + + microsoftoffice +- <_description>Microsoft Office Keyboard ++ Microsoft Office Keyboard + Microsoft Inc. + + + + + microsoftmult +- <_description>Microsoft Wireless Multimedia Keyboard 1.0A ++ Microsoft Wireless Multimedia Keyboard 1.0A + Microsoft Inc. + + + + + microsoftelite +- <_description>Microsoft Natural Keyboard Elite ++ Microsoft Natural Keyboard Elite + Microsoft Inc. + + + + + microsoftccurve2k +- <_description>Microsoft Comfort Curve Keyboard 2000 ++ Microsoft Comfort Curve Keyboard 2000 + Microsoft Inc. + + + + + oretec +- <_description>Ortek MCK-800 MM/Internet keyboard ++ Ortek MCK-800 MM/Internet keyboard + Ortek + + + + + propeller +- <_description>Propeller Voyager (KTEZ-1000) ++ Propeller Voyager (KTEZ-1000) + KeyTronic + + + + + qtronix +- <_description>QTronix Scorpius 98N+ ++ QTronix Scorpius 98N+ + QTronix + + + + + samsung4500 +- <_description>Samsung SDM 4500P ++ Samsung SDM 4500P + Samsung + + + + + samsung4510 +- <_description>Samsung SDM 4510P ++ Samsung SDM 4510P + Samsung + + + + + sanwaskbkg3 +- <_description>Sanwa Supply SKB-KG3 ++ Sanwa Supply SKB-KG3 + Sanwa Supply Inc. + + + + + sk1300 +- <_description>SK-1300 ++ SK-1300 + NEC + + + + + sk2500 +- <_description>SK-2500 ++ SK-2500 + NEC + + + + + sk6200 +- <_description>SK-6200 ++ SK-6200 + NEC + + + + + sk7100 +- <_description>SK-7100 ++ SK-7100 + NEC + + + + + sp_inet +- <_description>Super Power Multimedia Keyboard ++ Super Power Multimedia Keyboard + Generic + + + + + sven +- <_description>SVEN Ergonomic 2500 ++ SVEN Ergonomic 2500 + SVEN + + + + + sven303 +- <_description>SVEN Slim 303 ++ SVEN Slim 303 + SVEN + + + + + symplon +- <_description>Symplon PaceBook (tablet PC) ++ Symplon PaceBook (tablet PC) + Symplon + + + + + toshiba_s3000 +- <_description>Toshiba Satellite S3000 ++ Toshiba Satellite S3000 + Toshiba + + + + + trust +- <_description>Trust Wireless Keyboard Classic ++ Trust Wireless Keyboard Classic + Trust + + + + + trustda +- <_description>Trust Direct Access Keyboard ++ Trust Direct Access Keyboard + Trust + + + + + trust_slimline +- <_description>Trust Slimline ++ Trust Slimline + Trust + + + + + tm2020 +- <_description>TypeMatrix EZ-Reach 2020 ++ TypeMatrix EZ-Reach 2020 + TypeMatrix + + + + + tm2030PS2 +- <_description>TypeMatrix EZ-Reach 2030 PS2 ++ TypeMatrix EZ-Reach 2030 PS2 + TypeMatrix + + + + + tm2030USB +- <_description>TypeMatrix EZ-Reach 2030 USB ++ TypeMatrix EZ-Reach 2030 USB + TypeMatrix + + + + + tm2030USB-102 +- <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) ++ TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) + TypeMatrix + + + + + tm2030USB-106 +- <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode) ++ TypeMatrix EZ-Reach 2030 USB (106:JP mode) + TypeMatrix + + + + + yahoo +- <_description>Yahoo! Internet Keyboard ++ Yahoo! Internet Keyboard + Yahoo! + + + + + macbook78 +- <_description>MacBook/MacBook Pro ++ MacBook/MacBook Pro + Apple + + + + + macbook79 +- <_description>MacBook/MacBook Pro (Intl) ++ MacBook/MacBook Pro (Intl) + Apple + + + + + macintosh +- <_description>Macintosh ++ Macintosh + Apple + + + + + macintosh_old +- <_description>Macintosh Old ++ Macintosh Old + Apple + + + + + macintosh_hhk +- <_description>Happy Hacking Keyboard for Mac ++ Happy Hacking Keyboard for Mac + Fujitsu + + + + + acer_c300 +- <_description>Acer C300 ++ Acer C300 + Acer + + + + + acer_ferrari4k +- <_description>Acer Ferrari 4000 ++ Acer Ferrari 4000 + Acer + + + + + acer_laptop +- <_description>Acer Laptop ++ Acer Laptop + Acer + + + + + asus_laptop +- <_description>Asus Laptop ++ Asus Laptop + Asus + + + + + apple +- <_description>Apple ++ Apple + Apple + + + + + apple_laptop +- <_description>Apple Laptop ++ Apple Laptop + Apple + + + + + applealu_ansi +- <_description>Apple Aluminium Keyboard (ANSI) ++ Apple Aluminium Keyboard (ANSI) + Apple + + + + + applealu_iso +- <_description>Apple Aluminium Keyboard (ISO) ++ Apple Aluminium Keyboard (ISO) + Apple + + + + + applealu_jis +- <_description>Apple Aluminium Keyboard (JIS) ++ Apple Aluminium Keyboard (JIS) + Apple + + + + + silvercrest +- <_description>SILVERCREST Multimedia Wireless Keyboard ++ SILVERCREST Multimedia Wireless Keyboard + Silvercrest + + + + + emachines +- <_description>Laptop/notebook eMachines m68xx ++ Laptop/notebook eMachines m68xx + eMachines + + + + + benqx +- <_description>BenQ X-Touch ++ BenQ X-Touch + BenQ + + + + + benqx730 +- <_description>BenQ X-Touch 730 ++ BenQ X-Touch 730 + BenQ + + + + + benqx800 +- <_description>BenQ X-Touch 800 ++ BenQ X-Touch 800 + BenQ + + + + + hhk +- <_description>Happy Hacking Keyboard ++ Happy Hacking Keyboard + Fujitsu + + + + + classmate +- <_description>Classmate PC ++ Classmate PC + Intel + + + + + olpc +- <_description>OLPC ++ OLPC + OLPC + + + + + sun_type7_usb +- <_description>Sun Type 7 USB ++ Sun Type 7 USB + Sun Microsystems + + + + + sun_type7_euro_usb +- <_description>Sun Type 7 USB (European layout) ++ Sun Type 7 USB (European layout) + Sun Microsystems + + + + + sun_type7_unix_usb +- <_description>Sun Type 7 USB (Unix layout) ++ Sun Type 7 USB (Unix layout) + Sun Microsystems + + + + + sun_type7_jp_usb +- <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key ++ Sun Type 7 USB (Japanese layout) / Japanese 106-key + Sun Microsystems + + + + + sun_type6_usb +- <_description>Sun Type 6/7 USB ++ Sun Type 6/7 USB + Sun Microsystems + + + + + sun_type6_euro_usb +- <_description>Sun Type 6/7 USB (European layout) ++ Sun Type 6/7 USB (European layout) + Sun Microsystems + + + + + sun_type6_unix_usb +- <_description>Sun Type 6 USB (Unix layout) ++ Sun Type 6 USB (Unix layout) + Sun Microsystems + + + + + sun_type6_jp_usb +- <_description>Sun Type 6 USB (Japanese layout) ++ Sun Type 6 USB (Japanese layout) + Sun Microsystems + + + + + sun_type6_jp +- <_description>Sun Type 6 (Japanese layout) ++ Sun Type 6 (Japanese layout) + Sun Microsystems + + + + + targa_v811 +- <_description>Targa Visionary 811 ++ Targa Visionary 811 + Targa + + + + + unitekkb1925 +- <_description>Unitek KB-1925 ++ Unitek KB-1925 + Unitek Group + + + + + compalfl90 +- <_description>FL90 ++ FL90 + Compal Electronics Inc. + + + + + creativedw7000 +- <_description>Creative Desktop Wireless 7000 ++ Creative Desktop Wireless 7000 + Creative + + + + + htcdream +- <_description>Htc Dream phone ++ Htc Dream phone + htc + + +@@ -1300,9 +1300,9 @@ + + + us +- +- <_shortDescription>en +- <_description>English (US) ++ ++ en ++ English (US) + + eng + +@@ -1311,9 +1311,9 @@ + + + chr +- +- <_shortDescription>chr +- <_description>Cherokee ++ ++ chr ++ Cherokee + + chr + +@@ -1322,75 +1322,75 @@ + + + euro +- <_description>English (US, with euro on 5) ++ English (US, with euro on 5) + + + + + intl +- <_description>English (US, international with dead keys) ++ English (US, international with dead keys) + + + + + alt-intl +- <_description>English (US, alternative international) ++ English (US, alternative international) + + + + + colemak +- <_description>English (Colemak) ++ English (Colemak) + + + + + dvorak +- <_description>English (Dvorak) ++ English (Dvorak) + + + + + dvorak-intl +- <_description>English (Dvorak, international with dead keys) ++ English (Dvorak, international with dead keys) + + + + + dvorak-alt-intl +- <_description>English (Dvorak alternative international no dead keys) ++ English (Dvorak alternative international no dead keys) + + + + + dvorak-l +- <_description>English (left handed Dvorak) ++ English (left handed Dvorak) + + + + + dvorak-r +- <_description>English (right handed Dvorak) ++ English (right handed Dvorak) + + + + + dvorak-classic +- <_description>English (classic Dvorak) ++ English (classic Dvorak) + + + + + dvp +- <_description>English (programmer Dvorak) ++ English (programmer Dvorak) + + + + + rus +- +- <_shortDescription>ru +- <_description>Russian (US, phonetic) ++ ++ ru ++ Russian (US, phonetic) + + rus + +@@ -1399,13 +1399,13 @@ + + + mac +- <_description>English (Macintosh) ++ English (Macintosh) + + + + + altgr-intl +- <_description>English (international AltGr dead keys) ++ English (international AltGr dead keys) + eng + fra + ger +@@ -1414,13 +1414,13 @@ + + + olpc2 +- <_description>English (the divide/multiply keys toggle the layout) ++ English (the divide/multiply keys toggle the layout) + + + + + hbs +- <_description>Serbo-Croatian (US) ++ Serbo-Croatian (US) + eng + bos + hbs +@@ -1431,13 +1431,13 @@ + + + workman +- <_description>English (Workman) ++ English (Workman) + + + + + workman-intl +- <_description>English (Workman, international with dead keys) ++ English (Workman, international with dead keys) + + + +@@ -1445,17 +1445,17 @@ + + + af +- +- <_shortDescription>fa +- <_description>Afghani ++ ++ fa ++ Afghani + + + + + ps +- +- <_shortDescription>ps +- <_description>Pashto ++ ++ ps ++ Pashto + + pus + +@@ -1464,9 +1464,9 @@ + + + uz +- +- <_shortDescription>uz +- <_description>Uzbek (Afghanistan) ++ ++ uz ++ Uzbek (Afghanistan) + + uzb + +@@ -1475,9 +1475,9 @@ + + + olpc-ps +- +- <_shortDescription>ps +- <_description>Pashto (Afghanistan, OLPC) ++ ++ ps ++ Pashto (Afghanistan, OLPC) + + pus + +@@ -1486,17 +1486,17 @@ + + + fa-olpc +- +- <_shortDescription>fa +- <_description>Persian (Afghanistan, Dari OLPC) ++ ++ fa ++ Persian (Afghanistan, Dari OLPC) + + + + + uz-olpc +- +- <_shortDescription>uz +- <_description>Uzbek (Afghanistan, OLPC) ++ ++ uz ++ Uzbek (Afghanistan, OLPC) + + uzb + +@@ -1507,9 +1507,9 @@ + + + ara +- +- <_shortDescription>ar +- <_description>Arabic ++ ++ ar ++ Arabic + + AE + BH +@@ -1539,37 +1539,37 @@ + + + azerty +- <_description>Arabic (azerty) ++ Arabic (azerty) + + + + + azerty_digits +- <_description>Arabic (azerty/digits) ++ Arabic (azerty/digits) + + + + + digits +- <_description>Arabic (digits) ++ Arabic (digits) + + + + + qwerty +- <_description>Arabic (qwerty) ++ Arabic (qwerty) + + + + + qwerty_digits +- <_description>Arabic (qwerty/digits) ++ Arabic (qwerty/digits) + + + + + buckwalter +- <_description>Arabic (Buckwalter) ++ Arabic (Buckwalter) + + + +@@ -1577,9 +1577,9 @@ + + + al +- +- <_shortDescription>sq +- <_description>Albanian ++ ++ sq ++ Albanian + + alb + +@@ -1589,9 +1589,9 @@ + + + am +- +- <_shortDescription>hy +- <_description>Armenian ++ ++ hy ++ Armenian + + hye + +@@ -1600,31 +1600,31 @@ + + + phonetic +- <_description>Armenian (phonetic) ++ Armenian (phonetic) + + + + + phonetic-alt +- <_description>Armenian (alternative phonetic) ++ Armenian (alternative phonetic) + + + + + eastern +- <_description>Armenian (eastern) ++ Armenian (eastern) + + + + + western +- <_description>Armenian (western) ++ Armenian (western) + + + + + eastern-alt +- <_description>Armenian (alternative eastern) ++ Armenian (alternative eastern) + + + +@@ -1632,9 +1632,9 @@ + + + at +- +- <_shortDescription>de +- <_description>German (Austria) ++ ++ de ++ German (Austria) + + ger + +@@ -1643,19 +1643,19 @@ + + + nodeadkeys +- <_description>German (Austria, eliminate dead keys) ++ German (Austria, eliminate dead keys) + + + + + sundeadkeys +- <_description>German (Austria, Sun dead keys) ++ German (Austria, Sun dead keys) + + + + + mac +- <_description>German (Austria, Macintosh) ++ German (Austria, Macintosh) + + + +@@ -1663,9 +1663,9 @@ + + + az +- +- <_shortDescription>az +- <_description>Azerbaijani ++ ++ az ++ Azerbaijani + + aze + +@@ -1674,7 +1674,7 @@ + + + cyrillic +- <_description>Azerbaijani (Cyrillic) ++ Azerbaijani (Cyrillic) + + + +@@ -1682,9 +1682,9 @@ + + + by +- +- <_shortDescription>by +- <_description>Belarusian ++ ++ by ++ Belarusian + + bel + +@@ -1693,13 +1693,13 @@ + + + legacy +- <_description>Belarusian (legacy) ++ Belarusian (legacy) + + + + + latin +- <_description>Belarusian (Latin) ++ Belarusian (Latin) + + + +@@ -1707,9 +1707,9 @@ + + + be +- +- <_shortDescription>be +- <_description>Belgian ++ ++ be ++ Belgian + ger + nld + fra +@@ -1718,43 +1718,43 @@ + + + oss +- <_description>Belgian (alternative) ++ Belgian (alternative) + + + + + oss_latin9 +- <_description>Belgian (alternative, Latin-9 only) ++ Belgian (alternative, Latin-9 only) + + + + + oss_sundeadkeys +- <_description>Belgian (alternative, Sun dead keys) ++ Belgian (alternative, Sun dead keys) + + + + + iso-alternate +- <_description>Belgian (ISO alternate) ++ Belgian (ISO alternate) + + + + + nodeadkeys +- <_description>Belgian (eliminate dead keys) ++ Belgian (eliminate dead keys) + + + + + sundeadkeys +- <_description>Belgian (Sun dead keys) ++ Belgian (Sun dead keys) + + + + + wang +- <_description>Belgian (Wang model 724 azerty) ++ Belgian (Wang model 724 azerty) + + + +@@ -1762,9 +1762,9 @@ + + + bd +- +- <_shortDescription>bn +- <_description>Bangla ++ ++ bn ++ Bangla + + ben + +@@ -1773,7 +1773,7 @@ + + + probhat +- <_description>Bangla (Probhat) ++ Bangla (Probhat) + + + +@@ -1781,17 +1781,17 @@ + + + in +- +- <_shortDescription>in +- <_description>Indian ++ ++ in ++ Indian + + + + + ben +- +- <_shortDescription>bn +- <_description>Bangla (India) ++ ++ bn ++ Bangla (India) + + ben + +@@ -1800,9 +1800,9 @@ + + + ben_probhat +- +- <_shortDescription>bn +- <_description>Bangla (India, Probhat) ++ ++ bn ++ Bangla (India, Probhat) + + ben + +@@ -1811,28 +1811,28 @@ + + + ben_baishakhi +- <_description>Bangla (India, Baishakhi) ++ Bangla (India, Baishakhi) + ben + + + + + ben_bornona +- <_description>Bangla (India, Bornona) ++ Bangla (India, Bornona) + ben + + + + + ben_gitanjali +- <_description>Bangla (India, Uni Gitanjali) ++ Bangla (India, Uni Gitanjali) + ben + + + + + ben_inscript +- <_description>Bangla (India, Baishakhi Inscript) ++ Bangla (India, Baishakhi Inscript) + ben + + +@@ -1846,9 +1846,9 @@ + + + guj +- +- <_shortDescription>gu +- <_description>Gujarati ++ ++ gu ++ Gujarati + + guj + +@@ -1857,9 +1857,9 @@ + + + guru +- +- <_shortDescription>pa +- <_description>Punjabi (Gurmukhi) ++ ++ pa ++ Punjabi (Gurmukhi) + + pan + +@@ -1868,9 +1868,9 @@ + + + jhelum +- +- <_shortDescription>pa +- <_description>Punjabi (Gurmukhi Jhelum) ++ ++ pa ++ Punjabi (Gurmukhi Jhelum) + + pan + +@@ -1879,9 +1879,9 @@ + + + kan +- +- <_shortDescription>kn +- <_description>Kannada ++ ++ kn ++ Kannada + + kan + +@@ -1890,9 +1890,9 @@ + + + kan-kagapa +- +- <_shortDescription>kn +- <_description>Kannada (KaGaPa phonetic) ++ ++ kn ++ Kannada (KaGaPa phonetic) + + kan + +@@ -1901,9 +1901,9 @@ + + + mal +- +- <_shortDescription>ml +- <_description>Malayalam ++ ++ ml ++ Malayalam + + mal + +@@ -1912,9 +1912,9 @@ + + + mal_lalitha +- +- <_shortDescription>ml +- <_description>Malayalam (Lalitha) ++ ++ ml ++ Malayalam (Lalitha) + + mal + +@@ -1923,18 +1923,18 @@ + + + mal_enhanced +- +- <_shortDescription>ml +- <_description>Malayalam (enhanced Inscript with Rupee Sign) ++ ++ ml ++ Malayalam (enhanced Inscript with Rupee Sign) + mal + + + + + ori +- +- <_shortDescription>or +- <_description>Oriya ++ ++ or ++ Oriya + + ori + +@@ -1943,9 +1943,9 @@ + + + tam_unicode +- +- <_shortDescription>ta +- <_description>Tamil (Unicode) ++ ++ ta ++ Tamil (Unicode) + + tam + +@@ -1954,9 +1954,9 @@ + + + tam_keyboard_with_numerals +- +- <_shortDescription>ta +- <_description>Tamil (keyboard with numerals) ++ ++ ta ++ Tamil (keyboard with numerals) + + tam + +@@ -1965,9 +1965,9 @@ + + + tam_TAB +- +- <_shortDescription>ta +- <_description>Tamil (TAB typewriter) ++ ++ ta ++ Tamil (TAB typewriter) + + tam + +@@ -1976,9 +1976,9 @@ + + + tam_TSCII +- +- <_shortDescription>ta +- <_description>Tamil (TSCII typewriter) ++ ++ ta ++ Tamil (TSCII typewriter) + + tam + +@@ -1987,9 +1987,9 @@ + + + tam +- +- <_shortDescription>ta +- <_description>Tamil ++ ++ ta ++ Tamil + + tam + +@@ -1998,9 +1998,9 @@ + + + tel +- +- <_shortDescription>te +- <_description>Telugu ++ ++ te ++ Telugu + + tel + +@@ -2009,9 +2009,9 @@ + + + tel-kagapa +- +- <_shortDescription>te +- <_description>Telugu (KaGaPa phonetic) ++ ++ te ++ Telugu (KaGaPa phonetic) + + tel + +@@ -2020,9 +2020,9 @@ + + + urd-phonetic +- +- <_shortDescription>ur +- <_description>Urdu (phonetic) ++ ++ ur ++ Urdu (phonetic) + + urd + +@@ -2031,9 +2031,9 @@ + + + urd-phonetic3 +- +- <_shortDescription>ur +- <_description>Urdu (alternative phonetic) ++ ++ ur ++ Urdu (alternative phonetic) + + urd + +@@ -2042,9 +2042,9 @@ + + + urd-winkeys +- +- <_shortDescription>ur +- <_description>Urdu (WinKeys) ++ ++ ur ++ Urdu (WinKeys) + + urd + +@@ -2053,9 +2053,9 @@ + + + bolnagri +- +- <_shortDescription>hi +- <_description>Hindi (Bolnagri) ++ ++ hi ++ Hindi (Bolnagri) + + hin + +@@ -2064,9 +2064,9 @@ + + + hin-wx +- +- <_shortDescription>hi +- <_description>Hindi (Wx) ++ ++ hi ++ Hindi (Wx) + + hin + +@@ -2075,9 +2075,9 @@ + + + hin-kagapa +- +- <_shortDescription>hi +- <_description>Hindi (KaGaPa phonetic) ++ ++ hi ++ Hindi (KaGaPa phonetic) + + hin + +@@ -2086,9 +2086,9 @@ + + + san-kagapa +- +- <_shortDescription>sa +- <_description>Sanskrit (KaGaPa phonetic) ++ ++ sa ++ Sanskrit (KaGaPa phonetic) + + san + +@@ -2097,9 +2097,9 @@ + + + mar-kagapa +- +- <_shortDescription>mr +- <_description>Marathi (KaGaPa phonetic) ++ ++ mr ++ Marathi (KaGaPa phonetic) + + mar + +@@ -2108,9 +2108,9 @@ + + + eng +- +- <_shortDescription>en +- <_description>English (India, with RupeeSign) ++ ++ en ++ English (India, with RupeeSign) + + eng + +@@ -2121,9 +2121,9 @@ + + + ba +- +- <_shortDescription>bs +- <_description>Bosnian ++ ++ bs ++ Bosnian + + bos + +@@ -2132,25 +2132,25 @@ + + + alternatequotes +- <_description>Bosnian (use guillemets for quotes) ++ Bosnian (use guillemets for quotes) + + + + + unicode +- <_description>Bosnian (use Bosnian digraphs) ++ Bosnian (use Bosnian digraphs) + + + + + unicodeus +- <_description>Bosnian (US keyboard with Bosnian digraphs) ++ Bosnian (US keyboard with Bosnian digraphs) + + + + + us +- <_description>Bosnian (US keyboard with Bosnian letters) ++ Bosnian (US keyboard with Bosnian letters) + + + +@@ -2158,9 +2158,9 @@ + + + br +- +- <_shortDescription>pt +- <_description>Portuguese (Brazil) ++ ++ pt ++ Portuguese (Brazil) + + por + +@@ -2169,31 +2169,31 @@ + + + nodeadkeys +- <_description>Portuguese (Brazil, eliminate dead keys) ++ Portuguese (Brazil, eliminate dead keys) + + + + + dvorak +- <_description>Portuguese (Brazil, Dvorak) ++ Portuguese (Brazil, Dvorak) + + + + + nativo +- <_description>Portuguese (Brazil, Nativo) ++ Portuguese (Brazil, Nativo) + + + + + nativo-us +- <_description>Portuguese (Brazil, Nativo for US keyboards) ++ Portuguese (Brazil, Nativo for US keyboards) + + + + + nativo-epo +- <_description>Esperanto (Brazil, Nativo) ++ Esperanto (Brazil, Nativo) + + epo + +@@ -2204,9 +2204,9 @@ + + + bg +- +- <_shortDescription>bg +- <_description>Bulgarian ++ ++ bg ++ Bulgarian + + bul + +@@ -2215,13 +2215,13 @@ + + + phonetic +- <_description>Bulgarian (traditional phonetic) ++ Bulgarian (traditional phonetic) + + + + + bas_phonetic +- <_description>Bulgarian (new phonetic) ++ Bulgarian (new phonetic) + + + +@@ -2229,17 +2229,17 @@ + + + ma +- +- <_shortDescription>ar +- <_description>Arabic (Morocco) ++ ++ ar ++ Arabic (Morocco) + + + + + french +- +- <_shortDescription>fr +- <_description>French (Morocco) ++ ++ fr ++ French (Morocco) + + fra + +@@ -2248,9 +2248,9 @@ + + + tifinagh +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh) ++ ++ ber ++ Berber (Morocco, Tifinagh) + + ber + +@@ -2259,9 +2259,9 @@ + + + tifinagh-alt +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh alternative) ++ ++ ber ++ Berber (Morocco, Tifinagh alternative) + + ber + +@@ -2270,9 +2270,9 @@ + + + tifinagh-alt-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh alternative phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh alternative phonetic) + + ber + +@@ -2281,9 +2281,9 @@ + + + tifinagh-extended +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh extended) ++ ++ ber ++ Berber (Morocco, Tifinagh extended) + + ber + +@@ -2292,9 +2292,9 @@ + + + tifinagh-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh phonetic) + + ber + +@@ -2303,9 +2303,9 @@ + + + tifinagh-extended-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh extended phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh extended phonetic) + + ber + +@@ -2316,23 +2316,23 @@ + + + cm +- +- <_shortDescription>cm +- <_description>English (Cameroon) ++ ++ cm ++ English (Cameroon) + eng + + + + + french +- <_description>French (Cameroon) ++ French (Cameroon) + fra + + + + + qwerty +- <_description>Cameroon Multilingual (qwerty) ++ Cameroon Multilingual (qwerty) + + eng + bas +@@ -2369,7 +2369,7 @@ + + + azerty +- <_description>Cameroon Multilingual (azerty) ++ Cameroon Multilingual (azerty) + + fra + bas +@@ -2406,7 +2406,7 @@ + + + dvorak +- <_description>Cameroon Multilingual (Dvorak) ++ Cameroon Multilingual (Dvorak) + + + +@@ -2414,9 +2414,9 @@ + + + mm +- +- <_shortDescription>my +- <_description>Burmese ++ ++ my ++ Burmese + + mya + +@@ -2426,9 +2426,9 @@ + + + ca +- +- <_shortDescription>fr +- <_description>French (Canada) ++ ++ fr ++ French (Canada) + + fra + +@@ -2437,43 +2437,43 @@ + + + fr-dvorak +- +- <_shortDescription>fr +- <_description>French (Canada, Dvorak) ++ ++ fr ++ French (Canada, Dvorak) + + + + + fr-legacy +- +- <_shortDescription>fr +- <_description>French (Canada, legacy) ++ ++ fr ++ French (Canada, legacy) + + + + + multix +- <_description>Canadian Multilingual ++ Canadian Multilingual + + + + + multi +- <_description>Canadian Multilingual (first part) ++ Canadian Multilingual (first part) + + + + + multi-2gr +- <_description>Canadian Multilingual (second part) ++ Canadian Multilingual (second part) + + + + + ike +- +- <_shortDescription>ike +- <_description>Inuktitut ++ ++ ike ++ Inuktitut + + iku + +@@ -2482,9 +2482,9 @@ + + + eng +- +- <_shortDescription>en +- <_description>English (Canada) ++ ++ en ++ English (Canada) + + eng + +@@ -2495,9 +2495,9 @@ + + + cd +- +- <_shortDescription>fr +- <_description>French (Democratic Republic of the Congo) ++ ++ fr ++ French (Democratic Republic of the Congo) + + fra + +@@ -2507,9 +2507,9 @@ + + + cn +- +- <_shortDescription>zh +- <_description>Chinese ++ ++ zh ++ Chinese + + chi + +@@ -2518,7 +2518,7 @@ + + + tib +- <_description>Tibetan ++ Tibetan + + tib + +@@ -2527,7 +2527,7 @@ + + + tib_asciinum +- <_description>Tibetan (with ASCII numerals) ++ Tibetan (with ASCII numerals) + + tib + +@@ -2536,8 +2536,8 @@ + + + ug +- <_shortDescription>ug +- <_description>Uyghur ++ ug ++ Uyghur + + ug + +@@ -2548,9 +2548,9 @@ + + + hr +- +- <_shortDescription>hr +- <_description>Croatian ++ ++ hr ++ Croatian + + hrv + +@@ -2559,25 +2559,25 @@ + + + alternatequotes +- <_description>Croatian (use guillemets for quotes) ++ Croatian (use guillemets for quotes) + + + + + unicode +- <_description>Croatian (use Croatian digraphs) ++ Croatian (use Croatian digraphs) + + + + + unicodeus +- <_description>Croatian (US keyboard with Croatian digraphs) ++ Croatian (US keyboard with Croatian digraphs) + + + + + us +- <_description>Croatian (US keyboard with Croatian letters) ++ Croatian (US keyboard with Croatian letters) + + + +@@ -2585,9 +2585,9 @@ + + + cz +- +- <_shortDescription>cs +- <_description>Czech ++ ++ cs ++ Czech + + cze + +@@ -2596,31 +2596,31 @@ + + + bksl +- <_description>Czech (with <\|> key) ++ Czech (with <\|> key) + + + + + qwerty +- <_description>Czech (qwerty) ++ Czech (qwerty) + + + + + qwerty_bksl +- <_description>Czech (qwerty, extended Backslash) ++ Czech (qwerty, extended Backslash) + + + + + ucw +- <_description>Czech (UCW layout, accented letters only) ++ Czech (UCW layout, accented letters only) + + + + + dvorak-ucw +- <_description>Czech (US Dvorak with CZ UCW support) ++ Czech (US Dvorak with CZ UCW support) + + + +@@ -2628,9 +2628,9 @@ + + + dk +- +- <_shortDescription>da +- <_description>Danish ++ ++ da ++ Danish + + dan + +@@ -2639,25 +2639,25 @@ + + + nodeadkeys +- <_description>Danish (eliminate dead keys) ++ Danish (eliminate dead keys) + + + + + mac +- <_description>Danish (Macintosh) ++ Danish (Macintosh) + + + + + mac_nodeadkeys +- <_description>Danish (Macintosh, eliminate dead keys) ++ Danish (Macintosh, eliminate dead keys) + + + + + dvorak +- <_description>Danish (Dvorak) ++ Danish (Dvorak) + + + +@@ -2665,9 +2665,9 @@ + + + nl +- +- <_shortDescription>nl +- <_description>Dutch ++ ++ nl ++ Dutch + + nld + +@@ -2676,19 +2676,19 @@ + + + sundeadkeys +- <_description>Dutch (Sun dead keys) ++ Dutch (Sun dead keys) + + + + + mac +- <_description>Dutch (Macintosh) ++ Dutch (Macintosh) + + + + + std +- <_description>Dutch (standard) ++ Dutch (standard) + + + +@@ -2696,9 +2696,9 @@ + + + bt +- +- <_shortDescription>dz +- <_description>Dzongkha ++ ++ dz ++ Dzongkha + + dzo + +@@ -2707,9 +2707,9 @@ + + + ee +- +- <_shortDescription>et +- <_description>Estonian ++ ++ et ++ Estonian + + est + +@@ -2718,19 +2718,19 @@ + + + nodeadkeys +- <_description>Estonian (eliminate dead keys) ++ Estonian (eliminate dead keys) + + + + + dvorak +- <_description>Estonian (Dvorak) ++ Estonian (Dvorak) + + + + + us +- <_description>Estonian (US keyboard with Estonian letters) ++ Estonian (US keyboard with Estonian letters) + + + +@@ -2738,9 +2738,9 @@ + + + ir +- +- <_shortDescription>fa +- <_description>Persian ++ ++ fa ++ Persian + + per + +@@ -2749,15 +2749,15 @@ + + + pes_keypad +- <_description>Persian (with Persian Keypad) ++ Persian (with Persian Keypad) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Latin Q) ++ ++ ku ++ Kurdish (Iran, Latin Q) + + kur + +@@ -2766,9 +2766,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, F) ++ ++ ku ++ Kurdish (Iran, F) + + kur + +@@ -2777,9 +2777,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Latin Alt-Q) ++ ++ ku ++ Kurdish (Iran, Latin Alt-Q) + + kur + +@@ -2788,9 +2788,9 @@ + + + ku_ara +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Arabic-Latin) ++ ++ ku ++ Kurdish (Iran, Arabic-Latin) + + kur + +@@ -2801,9 +2801,9 @@ + + + iq +- +- <_shortDescription>ar +- <_description>Iraqi ++ ++ ar ++ Iraqi + ara + kur + +@@ -2811,9 +2811,9 @@ + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Latin Q) ++ ++ ku ++ Kurdish (Iraq, Latin Q) + + kur + +@@ -2822,9 +2822,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, F) ++ ++ ku ++ Kurdish (Iraq, F) + + kur + +@@ -2833,9 +2833,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Latin Alt-Q) ++ ++ ku ++ Kurdish (Iraq, Latin Alt-Q) + + kur + +@@ -2844,9 +2844,9 @@ + + + ku_ara +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Arabic-Latin) ++ ++ ku ++ Kurdish (Iraq, Arabic-Latin) + + kur + +@@ -2857,9 +2857,9 @@ + + + fo +- +- <_shortDescription>fo +- <_description>Faroese ++ ++ fo ++ Faroese + + fao + +@@ -2868,7 +2868,7 @@ + + + nodeadkeys +- <_description>Faroese (eliminate dead keys) ++ Faroese (eliminate dead keys) + + + +@@ -2876,9 +2876,9 @@ + + + fi +- +- <_shortDescription>fi +- <_description>Finnish ++ ++ fi ++ Finnish + + fin + +@@ -2887,26 +2887,26 @@ + + + classic +- <_description>Finnish (classic) ++ Finnish (classic) + + + + + nodeadkeys +- <_description>Finnish (classic, eliminate dead keys) ++ Finnish (classic, eliminate dead keys) + + + + + smi +- <_description>Northern Saami (Finland) ++ Northern Saami (Finland) + sme + + + + + mac +- <_description>Finnish (Macintosh) ++ Finnish (Macintosh) + + + +@@ -2914,9 +2914,9 @@ + + + fr +- +- <_shortDescription>fr +- <_description>French ++ ++ fr ++ French + + fra + +@@ -2925,91 +2925,91 @@ + + + nodeadkeys +- <_description>French (eliminate dead keys) ++ French (eliminate dead keys) + + + + + sundeadkeys +- <_description>French (Sun dead keys) ++ French (Sun dead keys) + + + + + oss +- <_description>French (alternative) ++ French (alternative) + + + + + oss_latin9 +- <_description>French (alternative, Latin-9 only) ++ French (alternative, Latin-9 only) + + + + + oss_nodeadkeys +- <_description>French (alternative, eliminate dead keys) ++ French (alternative, eliminate dead keys) + + + + + oss_sundeadkeys +- <_description>French (alternative, Sun dead keys) ++ French (alternative, Sun dead keys) + + + + + latin9 +- <_description>French (legacy, alternative) ++ French (legacy, alternative) + + + + + latin9_nodeadkeys +- <_description>French (legacy, alternative, eliminate dead keys) ++ French (legacy, alternative, eliminate dead keys) + + + + + latin9_sundeadkeys +- <_description>French (legacy, alternative, Sun dead keys) ++ French (legacy, alternative, Sun dead keys) + + + + + bepo +- <_description>French (Bepo, ergonomic, Dvorak way) ++ French (Bepo, ergonomic, Dvorak way) + + + + + bepo_latin9 +- <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only) ++ French (Bepo, ergonomic, Dvorak way, Latin-9 only) + + + + + dvorak +- <_description>French (Dvorak) ++ French (Dvorak) + + + + + mac +- <_description>French (Macintosh) ++ French (Macintosh) + + + + + bre +- <_description>French (Breton) ++ French (Breton) + + + + + oci +- <_description>Occitan ++ Occitan + + oci + +@@ -3018,7 +3018,7 @@ + + + geo +- <_description>Georgian (France, AZERTY Tskapo) ++ Georgian (France, AZERTY Tskapo) + + geo + +@@ -3029,9 +3029,9 @@ + + + gh +- +- <_shortDescription>en +- <_description>English (Ghana) ++ ++ en ++ English (Ghana) + + eng + +@@ -3040,15 +3040,15 @@ + + + generic +- <_description>English (Ghana, multilingual) ++ English (Ghana, multilingual) + + + + + akan +- +- <_shortDescription>ak +- <_description>Akan ++ ++ ak ++ Akan + + aka + +@@ -3057,9 +3057,9 @@ + + + ewe +- +- <_shortDescription>ee +- <_description>Ewe ++ ++ ee ++ Ewe + + ewe + +@@ -3068,9 +3068,9 @@ + + + fula +- +- <_shortDescription>ff +- <_description>Fula ++ ++ ff ++ Fula + + ful + +@@ -3079,9 +3079,9 @@ + + + ga +- +- <_shortDescription>gaa +- <_description>Ga ++ ++ gaa ++ Ga + + gaa + +@@ -3090,9 +3090,9 @@ + + + hausa +- +- <_shortDescription>ha +- <_description>Hausa ++ ++ ha ++ Hausa + + hau + +@@ -3101,9 +3101,9 @@ + + + avn +- +- <_shortDescription>avn +- <_description>Avatime ++ ++ avn ++ Avatime + + avn + +@@ -3112,7 +3112,7 @@ + + + gillbt +- <_description>English (Ghana, GILLBT) ++ English (Ghana, GILLBT) + + + +@@ -3120,9 +3120,9 @@ + + + gn +- +- <_shortDescription>fr +- <_description>French (Guinea) ++ ++ fr ++ French (Guinea) + + fra + +@@ -3132,9 +3132,9 @@ + + + ge +- +- <_shortDescription>ka +- <_description>Georgian ++ ++ ka ++ Georgian + + geo + +@@ -3143,21 +3143,21 @@ + + + ergonomic +- <_description>Georgian (ergonomic) ++ Georgian (ergonomic) + + + + + mess +- <_description>Georgian (MESS) ++ Georgian (MESS) + + + + + ru +- +- <_shortDescription>ru +- <_description>Russian (Georgia) ++ ++ ru ++ Russian (Georgia) + + rus + +@@ -3166,7 +3166,7 @@ + + + os +- <_description>Ossetian (Georgia) ++ Ossetian (Georgia) + + oss + +@@ -3177,9 +3177,9 @@ + + + de +- +- <_shortDescription>de +- <_description>German ++ ++ de ++ German + + ger + +@@ -3188,75 +3188,75 @@ + + + deadacute +- <_description>German (dead acute) ++ German (dead acute) + + + + + deadgraveacute +- <_description>German (dead grave acute) ++ German (dead grave acute) + + + + + nodeadkeys +- <_description>German (eliminate dead keys) ++ German (eliminate dead keys) + + + + + T3 +- <_description>German (T3) ++ German (T3) + + + + + ro +- <_description>Romanian (Germany) ++ Romanian (Germany) + rum + + + + + ro_nodeadkeys +- <_description>Romanian (Germany, eliminate dead keys) ++ Romanian (Germany, eliminate dead keys) + rum + + + + + dvorak +- <_description>German (Dvorak) ++ German (Dvorak) + + + + + sundeadkeys +- <_description>German (Sun dead keys) ++ German (Sun dead keys) + + + + + neo +- <_description>German (Neo 2) ++ German (Neo 2) + + + + + mac +- <_description>German (Macintosh) ++ German (Macintosh) + + + + + mac_nodeadkeys +- <_description>German (Macintosh, eliminate dead keys) ++ German (Macintosh, eliminate dead keys) + + + + + dsb +- <_description>Lower Sorbian ++ Lower Sorbian + + dsb + +@@ -3265,7 +3265,7 @@ + + + dsb_qwertz +- <_description>Lower Sorbian (qwertz) ++ Lower Sorbian (qwertz) + + dsb + +@@ -3274,15 +3274,15 @@ + + + qwerty +- <_description>German (qwerty) ++ German (qwerty) + + + + + ru +- +- <_shortDescription>ru +- <_description>Russian (Germany, phonetic) ++ ++ ru ++ Russian (Germany, phonetic) + + rus + +@@ -3291,7 +3291,7 @@ + + + legacy +- <_description>German (legacy) ++ German (legacy) + + + +@@ -3299,9 +3299,9 @@ + + + gr +- +- <_shortDescription>gr +- <_description>Greek ++ ++ gr ++ Greek + + gre + +@@ -3310,25 +3310,25 @@ + + + simple +- <_description>Greek (simple) ++ Greek (simple) + + + + + extended +- <_description>Greek (extended) ++ Greek (extended) + + + + + nodeadkeys +- <_description>Greek (eliminate dead keys) ++ Greek (eliminate dead keys) + + + + + polytonic +- <_description>Greek (polytonic) ++ Greek (polytonic) + + + +@@ -3336,9 +3336,9 @@ + + + hu +- +- <_shortDescription>hu +- <_description>Hungarian ++ ++ hu ++ Hungarian + + hun + +@@ -3347,115 +3347,115 @@ + + + standard +- <_description>Hungarian (standard) ++ Hungarian (standard) + + + + + nodeadkeys +- <_description>Hungarian (eliminate dead keys) ++ Hungarian (eliminate dead keys) + + + + + qwerty +- <_description>Hungarian (qwerty) ++ Hungarian (qwerty) + + + + + 101_qwertz_comma_dead +- <_description>Hungarian (101/qwertz/comma/dead keys) ++ Hungarian (101/qwertz/comma/dead keys) + + + + + 101_qwertz_comma_nodead +- <_description>Hungarian (101/qwertz/comma/eliminate dead keys) ++ Hungarian (101/qwertz/comma/eliminate dead keys) + + + + + 101_qwertz_dot_dead +- <_description>Hungarian (101/qwertz/dot/dead keys) ++ Hungarian (101/qwertz/dot/dead keys) + + + + + 101_qwertz_dot_nodead +- <_description>Hungarian (101/qwertz/dot/eliminate dead keys) ++ Hungarian (101/qwertz/dot/eliminate dead keys) + + + + + 101_qwerty_comma_dead +- <_description>Hungarian (101/qwerty/comma/dead keys) ++ Hungarian (101/qwerty/comma/dead keys) + + + + + 101_qwerty_comma_nodead +- <_description>Hungarian (101/qwerty/comma/eliminate dead keys) ++ Hungarian (101/qwerty/comma/eliminate dead keys) + + + + + 101_qwerty_dot_dead +- <_description>Hungarian (101/qwerty/dot/dead keys) ++ Hungarian (101/qwerty/dot/dead keys) + + + + + 101_qwerty_dot_nodead +- <_description>Hungarian (101/qwerty/dot/eliminate dead keys) ++ Hungarian (101/qwerty/dot/eliminate dead keys) + + + + + 102_qwertz_comma_dead +- <_description>Hungarian (102/qwertz/comma/dead keys) ++ Hungarian (102/qwertz/comma/dead keys) + + + + + 102_qwertz_comma_nodead +- <_description>Hungarian (102/qwertz/comma/eliminate dead keys) ++ Hungarian (102/qwertz/comma/eliminate dead keys) + + + + + 102_qwertz_dot_dead +- <_description>Hungarian (102/qwertz/dot/dead keys) ++ Hungarian (102/qwertz/dot/dead keys) + + + + + 102_qwertz_dot_nodead +- <_description>Hungarian (102/qwertz/dot/eliminate dead keys) ++ Hungarian (102/qwertz/dot/eliminate dead keys) + + + + + 102_qwerty_comma_dead +- <_description>Hungarian (102/qwerty/comma/dead keys) ++ Hungarian (102/qwerty/comma/dead keys) + + + + + 102_qwerty_comma_nodead +- <_description>Hungarian (102/qwerty/comma/eliminate dead keys) ++ Hungarian (102/qwerty/comma/eliminate dead keys) + + + + + 102_qwerty_dot_dead +- <_description>Hungarian (102/qwerty/dot/dead keys) ++ Hungarian (102/qwerty/dot/dead keys) + + + + + 102_qwerty_dot_nodead +- <_description>Hungarian (102/qwerty/dot/eliminate dead keys) ++ Hungarian (102/qwerty/dot/eliminate dead keys) + + + +@@ -3463,9 +3463,9 @@ + + + is +- +- <_shortDescription>is +- <_description>Icelandic ++ ++ is ++ Icelandic + + ice + +@@ -3474,25 +3474,25 @@ + + + Sundeadkeys +- <_description>Icelandic (Sun dead keys) ++ Icelandic (Sun dead keys) + + + + + nodeadkeys +- <_description>Icelandic (eliminate dead keys) ++ Icelandic (eliminate dead keys) + + + + + mac +- <_description>Icelandic (Macintosh) ++ Icelandic (Macintosh) + + + + + dvorak +- <_description>Icelandic (Dvorak) ++ Icelandic (Dvorak) + + + +@@ -3500,9 +3500,9 @@ + + + il +- +- <_shortDescription>he +- <_description>Hebrew ++ ++ he ++ Hebrew + + heb + +@@ -3511,19 +3511,19 @@ + + + lyx +- <_description>Hebrew (lyx) ++ Hebrew (lyx) + + + + + phonetic +- <_description>Hebrew (phonetic) ++ Hebrew (phonetic) + + + + + biblical +- <_description>Hebrew (Biblical, Tiro) ++ Hebrew (Biblical, Tiro) + + + +@@ -3531,9 +3531,9 @@ + + + it +- +- <_shortDescription>it +- <_description>Italian ++ ++ it ++ Italian + + ita + +@@ -3542,25 +3542,25 @@ + + + nodeadkeys +- <_description>Italian (eliminate dead keys) ++ Italian (eliminate dead keys) + + + + + mac +- <_description>Italian (Macintosh) ++ Italian (Macintosh) + + + + + us +- <_description>Italian (US keyboard with Italian letters) ++ Italian (US keyboard with Italian letters) + + + + + geo +- <_description>Georgian (Italy) ++ Georgian (Italy) + + geo + +@@ -3569,7 +3569,7 @@ + + + ibm +- <_description>Italian (IBM 142) ++ Italian (IBM 142) + + + +@@ -3577,9 +3577,9 @@ + + + jp +- +- <_shortDescription>ja +- <_description>Japanese ++ ++ ja ++ Japanese + + jpn + +@@ -3588,31 +3588,31 @@ + + + kana +- <_description>Japanese (Kana) ++ Japanese (Kana) + + + + + kana86 +- <_description>Japanese (Kana 86) ++ Japanese (Kana 86) + + + + + OADG109A +- <_description>Japanese (OADG 109A) ++ Japanese (OADG 109A) + + + + + mac +- <_description>Japanese (Macintosh) ++ Japanese (Macintosh) + + + + + dvorak +- <_description>Japanese (Dvorak) ++ Japanese (Dvorak) + + + +@@ -3620,9 +3620,9 @@ + + + kg +- +- <_shortDescription>ki +- <_description>Kyrgyz ++ ++ ki ++ Kyrgyz + + kir + +@@ -3631,7 +3631,7 @@ + + + phonetic +- <_description>Kyrgyz (phonetic) ++ Kyrgyz (phonetic) + + + +@@ -3639,9 +3639,9 @@ + + + kh +- +- <_shortDescription>km +- <_description>Khmer (Cambodia) ++ ++ km ++ Khmer (Cambodia) + + khm + +@@ -3651,9 +3651,9 @@ + + + kz +- +- <_shortDescription>kk +- <_description>Kazakh ++ ++ kk ++ Kazakh + + kaz + +@@ -3662,9 +3662,9 @@ + + + ruskaz +- +- <_shortDescription>ru +- <_description>Russian (Kazakhstan, with Kazakh) ++ ++ ru ++ Russian (Kazakhstan, with Kazakh) + kaz + rus + +@@ -3672,7 +3672,7 @@ + + + kazrus +- <_description>Kazakh (with Russian) ++ Kazakh (with Russian) + kaz + rus + +@@ -3682,9 +3682,9 @@ + + + la +- +- <_shortDescription>lo +- <_description>Lao ++ ++ lo ++ Lao + + lao + +@@ -3693,7 +3693,7 @@ + + + stea +- <_description>Lao (STEA proposed standard layout) ++ Lao (STEA proposed standard layout) + lao + + +@@ -3703,9 +3703,9 @@ + + + latam +- +- <_shortDescription>es +- <_description>Spanish (Latin American) ++ ++ es ++ Spanish (Latin American) + + AR + BO +@@ -3737,19 +3737,19 @@ + + + nodeadkeys +- <_description>Spanish (Latin American, eliminate dead keys) ++ Spanish (Latin American, eliminate dead keys) + + + + + deadtilde +- <_description>Spanish (Latin American, include dead tilde) ++ Spanish (Latin American, include dead tilde) + + + + + sundeadkeys +- <_description>Spanish (Latin American, Sun dead keys) ++ Spanish (Latin American, Sun dead keys) + + + +@@ -3757,9 +3757,9 @@ + + + lt +- +- <_shortDescription>lt +- <_description>Lithuanian ++ ++ lt ++ Lithuanian + + lit + +@@ -3768,31 +3768,31 @@ + + + std +- <_description>Lithuanian (standard) ++ Lithuanian (standard) + + + + + us +- <_description>Lithuanian (US keyboard with Lithuanian letters) ++ Lithuanian (US keyboard with Lithuanian letters) + + + + + ibm +- <_description>Lithuanian (IBM LST 1205-92) ++ Lithuanian (IBM LST 1205-92) + + + + + lekp +- <_description>Lithuanian (LEKP) ++ Lithuanian (LEKP) + + + + + lekpa +- <_description>Lithuanian (LEKPa) ++ Lithuanian (LEKPa) + + + +@@ -3800,9 +3800,9 @@ + + + lv +- +- <_shortDescription>lv +- <_description>Latvian ++ ++ lv ++ Latvian + + lav + +@@ -3811,37 +3811,37 @@ + + + apostrophe +- <_description>Latvian (apostrophe variant) ++ Latvian (apostrophe variant) + + + + + tilde +- <_description>Latvian (tilde variant) ++ Latvian (tilde variant) + + + + + fkey +- <_description>Latvian (F variant) ++ Latvian (F variant) + + + + + modern +- <_description>Latvian (modern) ++ Latvian (modern) + + + + + ergonomic +- <_description>Latvian (ergonomic, ŪGJRMV) ++ Latvian (ergonomic, ŪGJRMV) + + + + + adapted +- <_description>Latvian (adapted) ++ Latvian (adapted) + + + +@@ -3849,9 +3849,9 @@ + + + mao +- +- <_shortDescription>mi +- <_description>Maori ++ ++ mi ++ Maori + + mao + +@@ -3861,9 +3861,9 @@ + + + me +- +- <_shortDescription>sr +- <_description>Montenegrin ++ ++ sr ++ Montenegrin + + srp + +@@ -3872,43 +3872,43 @@ + + + cyrillic +- <_description>Montenegrin (Cyrillic) ++ Montenegrin (Cyrillic) + + + + + cyrillicyz +- <_description>Montenegrin (Cyrillic, Z and ZHE swapped) ++ Montenegrin (Cyrillic, Z and ZHE swapped) + + + + + latinunicode +- <_description>Montenegrin (Latin Unicode) ++ Montenegrin (Latin Unicode) + + + + + latinyz +- <_description>Montenegrin (Latin qwerty) ++ Montenegrin (Latin qwerty) + + + + + latinunicodeyz +- <_description>Montenegrin (Latin Unicode qwerty) ++ Montenegrin (Latin Unicode qwerty) + + + + + cyrillicalternatequotes +- <_description>Montenegrin (Cyrillic with guillemets) ++ Montenegrin (Cyrillic with guillemets) + + + + + latinalternatequotes +- <_description>Montenegrin (Latin with guillemets) ++ Montenegrin (Latin with guillemets) + + + +@@ -3916,9 +3916,9 @@ + + + mk +- +- <_shortDescription>mk +- <_description>Macedonian ++ ++ mk ++ Macedonian + + mkd + +@@ -3927,7 +3927,7 @@ + + + nodeadkeys +- <_description>Macedonian (eliminate dead keys) ++ Macedonian (eliminate dead keys) + + + +@@ -3935,9 +3935,9 @@ + + + mt +- +- <_shortDescription>mt +- <_description>Maltese ++ ++ mt ++ Maltese + + mlt + +@@ -3946,7 +3946,7 @@ + + + us +- <_description>Maltese (with US layout) ++ Maltese (with US layout) + + + +@@ -3954,9 +3954,9 @@ + + + mn +- +- <_shortDescription>mn +- <_description>Mongolian ++ ++ mn ++ Mongolian + + mon + +@@ -3966,9 +3966,9 @@ + + + no +- +- <_shortDescription>no +- <_description>Norwegian ++ ++ no ++ Norwegian + + nor + nob +@@ -3979,19 +3979,19 @@ + + + nodeadkeys +- <_description>Norwegian (eliminate dead keys) ++ Norwegian (eliminate dead keys) + + + + + dvorak +- <_description>Norwegian (Dvorak) ++ Norwegian (Dvorak) + + + + + smi +- <_description>Northern Saami (Norway) ++ Northern Saami (Norway) + + sme + +@@ -4000,7 +4000,7 @@ + + + smi_nodeadkeys +- <_description>Northern Saami (Norway, eliminate dead keys) ++ Northern Saami (Norway, eliminate dead keys) + + sme + +@@ -4009,19 +4009,19 @@ + + + mac +- <_description>Norwegian (Macintosh) ++ Norwegian (Macintosh) + + + + + mac_nodeadkeys +- <_description>Norwegian (Macintosh, eliminate dead keys) ++ Norwegian (Macintosh, eliminate dead keys) + + + + + colemak +- <_description>Norwegian (Colemak) ++ Norwegian (Colemak) + + + +@@ -4029,9 +4029,9 @@ + + + pl +- +- <_shortDescription>pl +- <_description>Polish ++ ++ pl ++ Polish + + pol + +@@ -4040,37 +4040,37 @@ + + + legacy +- <_description>Polish (legacy) ++ Polish (legacy) + + + + + qwertz +- <_description>Polish (qwertz) ++ Polish (qwertz) + + + + + dvorak +- <_description>Polish (Dvorak) ++ Polish (Dvorak) + + + + + dvorak_quotes +- <_description>Polish (Dvorak, Polish quotes on quotemark key) ++ Polish (Dvorak, Polish quotes on quotemark key) + + + + + dvorak_altquotes +- <_description>Polish (Dvorak, Polish quotes on key 1) ++ Polish (Dvorak, Polish quotes on key 1) + + + + + csb +- <_description>Kashubian ++ Kashubian + + csb + +@@ -4086,9 +4086,9 @@ + + + ru_phonetic_dvorak +- +- <_shortDescription>ru +- <_description>Russian (Poland, phonetic Dvorak) ++ ++ ru ++ Russian (Poland, phonetic Dvorak) + + rus + +@@ -4097,7 +4097,7 @@ + + + dvp +- <_description>Polish (programmer Dvorak) ++ Polish (programmer Dvorak) + + + +@@ -4105,9 +4105,9 @@ + + + pt +- +- <_shortDescription>pt +- <_description>Portuguese ++ ++ pt ++ Portuguese + + por + +@@ -4116,49 +4116,49 @@ + + + nodeadkeys +- <_description>Portuguese (eliminate dead keys) ++ Portuguese (eliminate dead keys) + + + + + sundeadkeys +- <_description>Portuguese (Sun dead keys) ++ Portuguese (Sun dead keys) + + + + + mac +- <_description>Portuguese (Macintosh) ++ Portuguese (Macintosh) + + + + + mac_nodeadkeys +- <_description>Portuguese (Macintosh, eliminate dead keys) ++ Portuguese (Macintosh, eliminate dead keys) + + + + + mac_sundeadkeys +- <_description>Portuguese (Macintosh, Sun dead keys) ++ Portuguese (Macintosh, Sun dead keys) + + + + + nativo +- <_description>Portuguese (Nativo) ++ Portuguese (Nativo) + + + + + nativo-us +- <_description>Portuguese (Nativo for US keyboards) ++ Portuguese (Nativo for US keyboards) + + + + + nativo-epo +- <_description>Esperanto (Portugal, Nativo) ++ Esperanto (Portugal, Nativo) + + epo + +@@ -4169,9 +4169,9 @@ + + + ro +- +- <_shortDescription>ro +- <_description>Romanian ++ ++ ro ++ Romanian + + rum + +@@ -4180,25 +4180,25 @@ + + + cedilla +- <_description>Romanian (cedilla) ++ Romanian (cedilla) + + + + + std +- <_description>Romanian (standard) ++ Romanian (standard) + + + + + std_cedilla +- <_description>Romanian (standard cedilla) ++ Romanian (standard cedilla) + + + + + winkeys +- <_description>Romanian (WinKeys) ++ Romanian (WinKeys) + + + +@@ -4206,9 +4206,9 @@ + + + ru +- +- <_shortDescription>ru +- <_description>Russian ++ ++ ru ++ Russian + + rus + +@@ -4217,37 +4217,37 @@ + + + phonetic +- <_description>Russian (phonetic) ++ Russian (phonetic) + + + + + phonetic_winkeys +- <_description>Russian (phonetic WinKeys) ++ Russian (phonetic WinKeys) + + + + + typewriter +- <_description>Russian (typewriter) ++ Russian (typewriter) + + + + + legacy +- <_description>Russian (legacy) ++ Russian (legacy) + + + + + typewriter-legacy +- <_description>Russian (typewriter, legacy) ++ Russian (typewriter, legacy) + + + + + tt +- <_description>Tatar ++ Tatar + + tat + +@@ -4256,7 +4256,7 @@ + + + os_legacy +- <_description>Ossetian (legacy) ++ Ossetian (legacy) + + oss + +@@ -4265,7 +4265,7 @@ + + + os_winkeys +- <_description>Ossetian (WinKeys) ++ Ossetian (WinKeys) + + oss + +@@ -4274,7 +4274,7 @@ + + + cv +- <_description>Chuvash ++ Chuvash + + chv + +@@ -4283,7 +4283,7 @@ + + + cv_latin +- <_description>Chuvash (Latin) ++ Chuvash (Latin) + + chv + +@@ -4292,7 +4292,7 @@ + + + udm +- <_description>Udmurt ++ Udmurt + + udm + +@@ -4301,7 +4301,7 @@ + + + kom +- <_description>Komi ++ Komi + + kom + +@@ -4310,7 +4310,7 @@ + + + sah +- <_description>Yakut ++ Yakut + + sah + +@@ -4319,7 +4319,7 @@ + + + xal +- <_description>Kalmyk ++ Kalmyk + + xal + +@@ -4328,19 +4328,19 @@ + + + dos +- <_description>Russian (DOS) ++ Russian (DOS) + + + + + mac +- <_description>Russian (Macintosh) ++ Russian (Macintosh) + + + + + srp +- <_description>Serbian (Russia) ++ Serbian (Russia) + rus + srp + +@@ -4348,7 +4348,7 @@ + + + bak +- <_description>Bashkirian ++ Bashkirian + + bak + +@@ -4357,7 +4357,7 @@ + + + chm +- <_description>Mari ++ Mari + + chm + +@@ -4368,9 +4368,9 @@ + + + rs +- +- <_shortDescription>sr +- <_description>Serbian ++ ++ sr ++ Serbian + + srp + +@@ -4379,49 +4379,49 @@ + + + yz +- <_description>Serbian (Cyrillic, Z and ZHE swapped) ++ Serbian (Cyrillic, Z and ZHE swapped) + + + + + latin +- <_description>Serbian (Latin) ++ Serbian (Latin) + + + + + latinunicode +- <_description>Serbian (Latin Unicode) ++ Serbian (Latin Unicode) + + + + + latinyz +- <_description>Serbian (Latin qwerty) ++ Serbian (Latin qwerty) + + + + + latinunicodeyz +- <_description>Serbian (Latin Unicode qwerty) ++ Serbian (Latin Unicode qwerty) + + + + + alternatequotes +- <_description>Serbian (Cyrillic with guillemets) ++ Serbian (Cyrillic with guillemets) + + + + + latinalternatequotes +- <_description>Serbian (Latin with guillemets) ++ Serbian (Latin with guillemets) + + + + + rue +- <_description>Pannonian Rusyn ++ Pannonian Rusyn + + rue + +@@ -4432,9 +4432,9 @@ + + + si +- +- <_shortDescription>sl +- <_description>Slovenian ++ ++ sl ++ Slovenian + + slv + +@@ -4443,13 +4443,13 @@ + + + alternatequotes +- <_description>Slovenian (use guillemets for quotes) ++ Slovenian (use guillemets for quotes) + + + + + us +- <_description>Slovenian (US keyboard with Slovenian letters) ++ Slovenian (US keyboard with Slovenian letters) + + + +@@ -4457,9 +4457,9 @@ + + + sk +- +- <_shortDescription>sk +- <_description>Slovak ++ ++ sk ++ Slovak + + slo + +@@ -4468,19 +4468,19 @@ + + + bksl +- <_description>Slovak (extended Backslash) ++ Slovak (extended Backslash) + + + + + qwerty +- <_description>Slovak (qwerty) ++ Slovak (qwerty) + + + + + qwerty_bksl +- <_description>Slovak (qwerty, extended Backslash) ++ Slovak (qwerty, extended Backslash) + + + +@@ -4488,9 +4488,9 @@ + + + es +- +- <_shortDescription>es +- <_description>Spanish ++ ++ es ++ Spanish + + spa + +@@ -4499,31 +4499,31 @@ + + + nodeadkeys +- <_description>Spanish (eliminate dead keys) ++ Spanish (eliminate dead keys) + + + + + deadtilde +- <_description>Spanish (include dead tilde) ++ Spanish (include dead tilde) + + + + + sundeadkeys +- <_description>Spanish (Sun dead keys) ++ Spanish (Sun dead keys) + + + + + dvorak +- <_description>Spanish (Dvorak) ++ Spanish (Dvorak) + + + + + ast +- <_description>Asturian (Spain, with bottom-dot H and bottom-dot L) ++ Asturian (Spain, with bottom-dot H and bottom-dot L) + + ast + +@@ -4532,7 +4532,7 @@ + + + cat +- <_description>Catalan (Spain, with middle-dot L) ++ Catalan (Spain, with middle-dot L) + + cat + +@@ -4541,7 +4541,7 @@ + + + mac +- <_description>Spanish (Macintosh) ++ Spanish (Macintosh) + + + +@@ -4549,9 +4549,9 @@ + + + se +- +- <_shortDescription>sv +- <_description>Swedish ++ ++ sv ++ Swedish + + swe + +@@ -4560,21 +4560,21 @@ + + + nodeadkeys +- <_description>Swedish (eliminate dead keys) ++ Swedish (eliminate dead keys) + + + + + dvorak +- <_description>Swedish (Dvorak) ++ Swedish (Dvorak) + + + + + rus +- +- <_shortDescription>ru +- <_description>Russian (Sweden, phonetic) ++ ++ ru ++ Russian (Sweden, phonetic) + + rus + +@@ -4583,9 +4583,9 @@ + + + rus_nodeadkeys +- +- <_shortDescription>ru +- <_description>Russian (Sweden, phonetic, eliminate dead keys) ++ ++ ru ++ Russian (Sweden, phonetic, eliminate dead keys) + + rus + +@@ -4594,7 +4594,7 @@ + + + smi +- <_description>Northern Saami (Sweden) ++ Northern Saami (Sweden) + + sme + +@@ -4603,19 +4603,19 @@ + + + mac +- <_description>Swedish (Macintosh) ++ Swedish (Macintosh) + + + + + svdvorak +- <_description>Swedish (Svdvorak) ++ Swedish (Svdvorak) + + + + + swl +- <_description>Swedish Sign Language ++ Swedish Sign Language + swl + + +@@ -4624,9 +4624,9 @@ + + + ch +- +- <_shortDescription>de +- <_description>German (Switzerland) ++ ++ de ++ German (Switzerland) + ger + gsw + +@@ -4634,31 +4634,31 @@ + + + legacy +- <_description>German (Switzerland, legacy) ++ German (Switzerland, legacy) + + + + + de_nodeadkeys +- +- <_shortDescription>de +- <_description>German (Switzerland, eliminate dead keys) ++ ++ de ++ German (Switzerland, eliminate dead keys) + + + + + de_sundeadkeys +- +- <_shortDescription>de +- <_description>German (Switzerland, Sun dead keys) ++ ++ de ++ German (Switzerland, Sun dead keys) + + + + + fr +- +- <_shortDescription>fr +- <_description>French (Switzerland) ++ ++ fr ++ French (Switzerland) + + fra + +@@ -4667,9 +4667,9 @@ + + + fr_nodeadkeys +- +- <_shortDescription>fr +- <_description>French (Switzerland, eliminate dead keys) ++ ++ fr ++ French (Switzerland, eliminate dead keys) + + fra + +@@ -4678,9 +4678,9 @@ + + + fr_sundeadkeys +- +- <_shortDescription>fr +- <_description>French (Switzerland, Sun dead keys) ++ ++ fr ++ French (Switzerland, Sun dead keys) + + fra + +@@ -4689,9 +4689,9 @@ + + + fr_mac +- +- <_shortDescription>fr +- <_description>French (Switzerland, Macintosh) ++ ++ fr ++ French (Switzerland, Macintosh) + + fra + +@@ -4700,9 +4700,9 @@ + + + de_mac +- +- <_shortDescription>de +- <_description>German (Switzerland, Macintosh) ++ ++ de ++ German (Switzerland, Macintosh) + + + +@@ -4710,9 +4710,9 @@ + + + sy +- +- <_shortDescription>ar +- <_description>Arabic (Syria) ++ ++ ar ++ Arabic (Syria) + + syr + +@@ -4721,25 +4721,25 @@ + + + syc +- +- <_shortDescription>syc +- <_description>Syriac ++ ++ syc ++ Syriac + + + + + syc_phonetic +- +- <_shortDescription>syc +- <_description>Syriac (phonetic) ++ ++ syc ++ Syriac (phonetic) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, Latin Q) ++ ++ ku ++ Kurdish (Syria, Latin Q) + + kur + +@@ -4748,9 +4748,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, F) ++ ++ ku ++ Kurdish (Syria, F) + + kur + +@@ -4759,9 +4759,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, Latin Alt-Q) ++ ++ ku ++ Kurdish (Syria, Latin Alt-Q) + + kur + +@@ -4772,9 +4772,9 @@ + + + tj +- +- <_shortDescription>tg +- <_description>Tajik ++ ++ tg ++ Tajik + + tgk + +@@ -4783,7 +4783,7 @@ + + + legacy +- <_description>Tajik (legacy) ++ Tajik (legacy) + + + +@@ -4791,9 +4791,9 @@ + + + lk +- +- <_shortDescription>si +- <_description>Sinhala (phonetic) ++ ++ si ++ Sinhala (phonetic) + + sin + +@@ -4802,9 +4802,9 @@ + + + tam_unicode +- +- <_shortDescription>ta +- <_description>Tamil (Sri Lanka, Unicode) ++ ++ ta ++ Tamil (Sri Lanka, Unicode) + + tam + +@@ -4813,7 +4813,7 @@ + + + tam_TAB +- <_description>Tamil (Sri Lanka, TAB Typewriter) ++ Tamil (Sri Lanka, TAB Typewriter) + + tam + +@@ -4824,9 +4824,9 @@ + + + th +- +- <_shortDescription>th +- <_description>Thai ++ ++ th ++ Thai + + tha + +@@ -4835,13 +4835,13 @@ + + + tis +- <_description>Thai (TIS-820.2538) ++ Thai (TIS-820.2538) + + + + + pat +- <_description>Thai (Pattachote) ++ Thai (Pattachote) + + + +@@ -4849,9 +4849,9 @@ + + + tr +- +- <_shortDescription>tr +- <_description>Turkish ++ ++ tr ++ Turkish + + tur + +@@ -4860,27 +4860,27 @@ + + + f +- <_description>Turkish (F) ++ Turkish (F) + + + + + alt +- <_description>Turkish (Alt-Q) ++ Turkish (Alt-Q) + + + + + sundeadkeys +- <_description>Turkish (Sun dead keys) ++ Turkish (Sun dead keys) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, Latin Q) ++ ++ ku ++ Kurdish (Turkey, Latin Q) + + kur + +@@ -4889,9 +4889,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, F) ++ ++ ku ++ Kurdish (Turkey, F) + + kur + +@@ -4900,9 +4900,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, Latin Alt-Q) ++ ++ ku ++ Kurdish (Turkey, Latin Alt-Q) + + kur + +@@ -4911,15 +4911,15 @@ + + + intl +- <_description>Turkish (international with dead keys) ++ Turkish (international with dead keys) + + + + + crh +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish Q) ++ ++ crh ++ Crimean Tatar (Turkish Q) + + crh + +@@ -4928,9 +4928,9 @@ + + + crh_f +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish F) ++ ++ crh ++ Crimean Tatar (Turkish F) + + crh + +@@ -4939,9 +4939,9 @@ + + + crh_alt +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish Alt-Q) ++ ++ crh ++ Crimean Tatar (Turkish Alt-Q) + + crh + +@@ -4952,9 +4952,9 @@ + + + tw +- +- <_shortDescription>zh +- <_description>Taiwanese ++ ++ zh ++ Taiwanese + + fox + +@@ -4963,7 +4963,7 @@ + + + indigenous +- <_description>Taiwanese (indigenous) ++ Taiwanese (indigenous) + + ami + tay +@@ -4987,9 +4987,9 @@ + + + saisiyat +- +- <_shortDescription>xsy +- <_description>Saisiyat (Taiwan) ++ ++ xsy ++ Saisiyat (Taiwan) + + xsy + +@@ -5000,9 +5000,9 @@ + + + ua +- +- <_shortDescription>uk +- <_description>Ukrainian ++ ++ uk ++ Ukrainian + + ukr + +@@ -5011,43 +5011,43 @@ + + + phonetic +- <_description>Ukrainian (phonetic) ++ Ukrainian (phonetic) + + + + + typewriter +- <_description>Ukrainian (typewriter) ++ Ukrainian (typewriter) + + + + + winkeys +- <_description>Ukrainian (WinKeys) ++ Ukrainian (WinKeys) + + + + + legacy +- <_description>Ukrainian (legacy) ++ Ukrainian (legacy) + + + + + rstu +- <_description>Ukrainian (standard RSTU) ++ Ukrainian (standard RSTU) + + + + + rstu_ru +- <_description>Russian (Ukraine, standard RSTU) ++ Russian (Ukraine, standard RSTU) + + + + + homophonic +- <_description>Ukrainian (homophonic) ++ Ukrainian (homophonic) + + + +@@ -5055,9 +5055,9 @@ + + + gb +- +- <_shortDescription>en +- <_description>English (UK) ++ ++ en ++ English (UK) + + eng + +@@ -5066,43 +5066,43 @@ + + + extd +- <_description>English (UK, extended WinKeys) ++ English (UK, extended WinKeys) + + + + + intl +- <_description>English (UK, international with dead keys) ++ English (UK, international with dead keys) + + + + + dvorak +- <_description>English (UK, Dvorak) ++ English (UK, Dvorak) + + + + + dvorakukp +- <_description>English (UK, Dvorak with UK punctuation) ++ English (UK, Dvorak with UK punctuation) + + + + + mac +- <_description>English (UK, Macintosh) ++ English (UK, Macintosh) + + + + + mac_intl +- <_description>English (UK, Macintosh international) ++ English (UK, Macintosh international) + + + + + colemak +- <_description>English (UK, Colemak) ++ English (UK, Colemak) + + + +@@ -5110,9 +5110,9 @@ + + + uz +- +- <_shortDescription>uz +- <_description>Uzbek ++ ++ uz ++ Uzbek + + uzb + +@@ -5121,7 +5121,7 @@ + + + latin +- <_description>Uzbek (Latin) ++ Uzbek (Latin) + + + +@@ -5129,9 +5129,9 @@ + + + vn +- +- <_shortDescription>vi +- <_description>Vietnamese ++ ++ vi ++ Vietnamese + + vie + +@@ -5141,9 +5141,9 @@ + + + kr +- +- <_shortDescription>ko +- <_description>Korean ++ ++ ko ++ Korean + + kor + +@@ -5152,7 +5152,7 @@ + + + kr104 +- <_description>Korean (101/104 key compatible) ++ Korean (101/104 key compatible) + + + +@@ -5160,9 +5160,9 @@ + + + nec_vndr/jp +- +- <_shortDescription>ja +- <_description>Japanese (PC-98xx Series) ++ ++ ja ++ Japanese (PC-98xx Series) + + JP + +@@ -5175,9 +5175,9 @@ + + + ie +- +- <_shortDescription>ie +- <_description>Irish ++ ++ ie ++ Irish + + eng + +@@ -5186,7 +5186,7 @@ + + + CloGaelach +- <_description>CloGaelach ++ CloGaelach + + gle + +@@ -5195,13 +5195,13 @@ + + + UnicodeExpert +- <_description>Irish (UnicodeExpert) ++ Irish (UnicodeExpert) + + + + + ogam +- <_description>Ogham ++ Ogham + + sga + +@@ -5210,7 +5210,7 @@ + + + ogam_is434 +- <_description>Ogham (IS434) ++ Ogham (IS434) + + sga + +@@ -5221,9 +5221,9 @@ + + + pk +- +- <_shortDescription>ur +- <_description>Urdu (Pakistan) ++ ++ ur ++ Urdu (Pakistan) + + urd + +@@ -5232,20 +5232,20 @@ + + + urd-crulp +- <_description>Urdu (Pakistan, CRULP) ++ Urdu (Pakistan, CRULP) + + + + + urd-nla +- <_description>Urdu (Pakistan, NLA) ++ Urdu (Pakistan, NLA) + + + + + ara +- <_shortDescription>ar +- <_description>Arabic (Pakistan) ++ ar ++ Arabic (Pakistan) + + ara + +@@ -5254,9 +5254,9 @@ + + + snd +- +- <_shortDescription>sd +- <_description>Sindhi ++ ++ sd ++ Sindhi + + snd + +@@ -5267,9 +5267,9 @@ + + + mv +- +- <_shortDescription>dv +- <_description>Dhivehi ++ ++ dv ++ Dhivehi + + div + +@@ -5279,9 +5279,9 @@ + + + za +- +- <_shortDescription>en +- <_description>English (South Africa) ++ ++ en ++ English (South Africa) + + eng + +@@ -5290,9 +5290,9 @@ + + + epo +- +- <_shortDescription>eo +- <_description>Esperanto ++ ++ eo ++ Esperanto + + epo + +@@ -5301,7 +5301,7 @@ + + + legacy +- <_description>Esperanto (displaced semicolon and quote, obsolete) ++ Esperanto (displaced semicolon and quote, obsolete) + + + +@@ -5309,9 +5309,9 @@ + + + np +- +- <_shortDescription>ne +- <_description>Nepali ++ ++ ne ++ Nepali + + nep + +@@ -5320,9 +5320,9 @@ + + + ng +- +- <_shortDescription>en +- <_description>English (Nigeria) ++ ++ en ++ English (Nigeria) + + eng + +@@ -5331,9 +5331,9 @@ + + + igbo +- +- <_shortDescription>ig +- <_description>Igbo ++ ++ ig ++ Igbo + + ibo + +@@ -5342,9 +5342,9 @@ + + + yoruba +- +- <_shortDescription>yo +- <_description>Yoruba ++ ++ yo ++ Yoruba + + yor + +@@ -5353,9 +5353,9 @@ + + + hausa +- +- <_shortDescription>ha +- <_description>Hausa ++ ++ ha ++ Hausa + + hau + +@@ -5366,9 +5366,9 @@ + + + et +- +- <_shortDescription>am +- <_description>Amharic ++ ++ am ++ Amharic + + amh + +@@ -5378,9 +5378,9 @@ + + + sn +- +- <_shortDescription>wo +- <_description>Wolof ++ ++ wo ++ Wolof + + wol + +@@ -5390,21 +5390,21 @@ + + + brai +- +- <_shortDescription>brl +- <_description>Braille ++ ++ brl ++ Braille + + + + + left_hand +- <_description>Braille (left hand) ++ Braille (left hand) + + + + + right_hand +- <_description>Braille (right hand) ++ Braille (right hand) + + + +@@ -5412,9 +5412,9 @@ + + + tm +- +- <_shortDescription>tk +- <_description>Turkmen ++ ++ tk ++ Turkmen + + tuk + +@@ -5423,7 +5423,7 @@ + + + alt +- <_description>Turkmen (Alt-Q) ++ Turkmen (Alt-Q) + + + +@@ -5431,9 +5431,9 @@ + + + ml +- +- <_shortDescription>bm +- <_description>Bambara ++ ++ bm ++ Bambara + + bam + +@@ -5442,9 +5442,9 @@ + + + fr-oss +- +- <_shortDescription>fr +- <_description>French (Mali, alternative) ++ ++ fr ++ French (Mali, alternative) + + fra + +@@ -5453,9 +5453,9 @@ + + + us-mac +- +- <_shortDescription>en +- <_description>English (Mali, US Macintosh) ++ ++ en ++ English (Mali, US Macintosh) + + eng + +@@ -5464,9 +5464,9 @@ + + + us-intl +- +- <_shortDescription>en +- <_description>English (Mali, US international) ++ ++ en ++ English (Mali, US international) + + eng + +@@ -5477,9 +5477,9 @@ + + + tz +- +- <_shortDescription>sw +- <_description>Swahili (Tanzania) ++ ++ sw ++ Swahili (Tanzania) + + swa + +@@ -5488,9 +5488,9 @@ + + + ke +- +- <_shortDescription>sw +- <_description>Swahili (Kenya) ++ ++ sw ++ Swahili (Kenya) + + swa + +@@ -5499,9 +5499,9 @@ + + + kik +- +- <_shortDescription>ki +- <_description>Kikuyu ++ ++ ki ++ Kikuyu + + kik + +@@ -5512,9 +5512,9 @@ + + + bw +- +- <_shortDescription>tn +- <_description>Tswana ++ ++ tn ++ Tswana + + tsn + +@@ -5523,9 +5523,9 @@ + + + ph +- +- <_shortDescription>ph +- <_description>Filipino ++ ++ ph ++ Filipino + eng + bik + ceb +@@ -5542,7 +5542,7 @@ + + + qwerty-bay +- <_description>Filipino (QWERTY Baybayin) ++ Filipino (QWERTY Baybayin) + bik + ceb + fil +@@ -5558,13 +5558,13 @@ + + + capewell-dvorak +- <_description>Filipino (Capewell-Dvorak Latin) ++ Filipino (Capewell-Dvorak Latin) + + + + + capewell-dvorak-bay +- <_description>Filipino (Capewell-Dvorak Baybayin) ++ Filipino (Capewell-Dvorak Baybayin) + bik + ceb + fil +@@ -5580,13 +5580,13 @@ + + + capewell-qwerf2k6 +- <_description>Filipino (Capewell-QWERF 2006 Latin) ++ Filipino (Capewell-QWERF 2006 Latin) + + + + + capewell-qwerf2k6-bay +- <_description>Filipino (Capewell-QWERF 2006 Baybayin) ++ Filipino (Capewell-QWERF 2006 Baybayin) + bik + ceb + fil +@@ -5602,13 +5602,13 @@ + + + colemak +- <_description>Filipino (Colemak Latin) ++ Filipino (Colemak Latin) + + + + + colemak-bay +- <_description>Filipino (Colemak Baybayin) ++ Filipino (Colemak Baybayin) + bik + ceb + fil +@@ -5624,13 +5624,13 @@ + + + dvorak +- <_description>Filipino (Dvorak Latin) ++ Filipino (Dvorak Latin) + + + + + dvorak-bay +- <_description>Filipino (Dvorak Baybayin) ++ Filipino (Dvorak Baybayin) + bik + ceb + fil +@@ -5648,16 +5648,16 @@ + + + md +- <_shortDescription>md +- <_description>Moldavian ++ md ++ Moldavian + rum + + + + + gag +- <_shortDescription>gag +- <_description>Moldavian (Gagauz) ++ gag ++ Moldavian (Gagauz) + gag + + +@@ -5666,1183 +5666,1142 @@ + + + +- ++ + + grp +- <_description>Switching to another layout ++ Switching to another layout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- ++ + + lv3 +- <_description>Key to choose 3rd level ++ Key to choose 3rd level + + + + + + + + + + + + + + + + + + + + +- ++ + + ctrl +- <_description>Ctrl key position ++ Ctrl key position + + + + + + + + + + + + + + +- ++ + + grp_led +- <_description>Use keyboard LED to show alternative layout ++ Use keyboard LED to show alternative layout + + + + + + +- ++ + + keypad +- <_description>Layout of numeric keypad ++ Layout of numeric keypad + + + + + + + + + + +- ++ + +- ++ + + kpdl +- <_description>Numeric keypad delete key behaviour ++ Numeric keypad delete key behaviour + + + + + + + + + + + +- ++ + + caps +- <_description>Caps Lock key behavior ++ Caps Lock key behavior + + + + + + + + + + + + + + + + + +- ++ + + altwin +- <_description>Alt/Win key behavior ++ Alt/Win key behavior + + + + + + + + + + + + + +- ++ + + Compose key +- <_description>Position of Compose key ++ Position of Compose key + + + + + + + + + + + + + + + + + + + + + + + compat +- <_description>Miscellaneous compatibility options ++ Miscellaneous compatibility options + + + + + + + + + + + + + + + + + +- ++ + + currencysign +- <_description>Adding currency signs to certain keys ++ Adding currency signs to certain keys + + + + + + + + + + lv5 +- <_description>Key to choose 5th level ++ Key to choose 5th level + + + + + +- ++ + + +- ++ + + nbsp +- <_description>Using space key to input non-breakable space character ++ Using space key to input non-breakable space character + + + + + + + + + + + + + + + + + + + + + japan +- <_description>Japanese keyboard options ++ Japanese keyboard options + + + + + + + + esperanto +- <_description>Adding Esperanto supersigned letters ++ Adding Esperanto supersigned letters + + + + + + + + solaris +- <_description>Maintain key compatibility with old Solaris keycodes ++ Maintain key compatibility with old Solaris keycodes + + + + + + terminate +- <_description>Key sequence to kill the X server ++ Key sequence to kill the X server + + + + +- ++ +\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in b/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in new file mode 100644 index 000000000..185ded7f8 --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_evdev_extras_xml_in @@ -0,0 +1,855 @@ +--- xkeyboard-config-2.11.orig/rules/evdev.extras.xml.in 2013-12-24 00:49:09.000000000 +0100 ++++ xkeyboard-config-2.11/rules/evdev.extras.xml.in 2014-03-04 14:31:30.000000000 +0100 +@@ -1,4 +1,4 @@ +- ++ + + + +@@ -6,8 +6,8 @@ + + + apl +- <_shortDescription>apl +- <_description>APL keyboard symbols ++ apl ++ APL keyboard symbols + eng + + +@@ -58,29 +58,29 @@ + + + ca +- <_shortDescription>fr +- <_description>French (Canada) ++ fr ++ French (Canada) + fra + + + + + kut +- <_shortDescription>kut +- <_description>Kutenai ++ kut ++ Kutenai + + + + + shs +- <_shortDescription>shs +- <_description>Secwepemctsin ++ shs ++ Secwepemctsin + + + + + sun_type6 +- <_description>Multilingual (Canada, Sun Type 6/7) ++ Multilingual (Canada, Sun Type 6/7) + + + +@@ -88,8 +88,8 @@ + + + de +- <_shortDescription>de +- <_description>German ++ de ++ German + + ger + +@@ -98,7 +98,7 @@ + + + us +- <_description>German (US keyboard with German letters) ++ German (US keyboard with German letters) + + eng + +@@ -107,7 +107,7 @@ + + + hu +- <_description>German (with Hungarian letters and no dead keys) ++ German (with Hungarian letters and no dead keys) + + ger + hun +@@ -117,7 +117,7 @@ + + + sun_type6 +- <_description>German (Sun Type 6/7) ++ German (Sun Type 6/7) + + + +@@ -125,15 +125,15 @@ + + + ir +- <_shortDescription>fa +- <_description>Persian ++ fa ++ Persian + per + + + + + ave +- <_description>Avestan ++ Avestan + ave + + +@@ -142,21 +142,21 @@ + + + lt +- <_shortDescription>lt +- <_description>Lithuanian ++ lt ++ Lithuanian + lit + + + + + us_dvorak +- <_description>Lithuanian (US Dvorak with Lithuanian letters) ++ Lithuanian (US Dvorak with Lithuanian letters) + + + + + sun_type6 +- <_description>Lithuanian (Sun Type 6/7) ++ Lithuanian (Sun Type 6/7) + + + +@@ -164,8 +164,8 @@ + + + lv +- <_shortDescription>lv +- <_description>Latvian ++ lv ++ Latvian + + lav + +@@ -174,55 +174,55 @@ + + + dvorak +- <_description>Latvian (US Dvorak) ++ Latvian (US Dvorak) + + + + + ykeydvorak +- <_description>Latvian (US Dvorak, Y variant) ++ Latvian (US Dvorak, Y variant) + + + + + minuskeydvorak +- <_description>Latvian (US Dvorak, minus variant) ++ Latvian (US Dvorak, minus variant) + + + + + dvorakprogr +- <_description>Latvian (programmer US Dvorak) ++ Latvian (programmer US Dvorak) + + + + + ykeydvorakprogr +- <_description>Latvian (programmer US Dvorak, Y variant) ++ Latvian (programmer US Dvorak, Y variant) + + + + + minuskeydvorakprogr +- <_description>Latvian (programmer US Dvorak, minus variant) ++ Latvian (programmer US Dvorak, minus variant) + + + + + colemak +- <_description>Latvian (US Colemak) ++ Latvian (US Colemak) + + + + + apostrophecolemak +- <_description>Latvian (US Colemak, apostrophe variant) ++ Latvian (US Colemak, apostrophe variant) + + + + + sun_type6 +- <_description>Latvian (Sun Type 6/7) ++ Latvian (Sun Type 6/7) + + + +@@ -230,34 +230,34 @@ + + + us +- <_shortDescription>en +- <_description>English (US) ++ en ++ English (US) + eng + + + + + intl-unicode +- <_description>English (US, international AltGr Unicode combining) ++ English (US, international AltGr Unicode combining) + + + + + alt-intl-unicode +- <_description>English (US, international AltGr Unicode combining, alternative) ++ English (US, international AltGr Unicode combining, alternative) + + + + + ats +- <_description>Atsina +- ++ Atsina ++ + + + + + crd +- <_description>Coeur d'Alene Salish ++ Coeur d'Alene Salish + crd + + +@@ -274,13 +274,13 @@ + + + sun_type6 +- <_description>English (US, Sun Type 6/7) ++ English (US, Sun Type 6/7) + + + + + norman +- <_description>English (Norman) ++ English (Norman) + + + +@@ -288,27 +288,27 @@ + + + pl +- <_shortDescription>pl +- <_description>Polish ++ pl ++ Polish + pol + + + + + intl +- <_description>Polish (international with dead keys) ++ Polish (international with dead keys) + + + + + colemak +- <_description>Polish (Colemak) ++ Polish (Colemak) + + + + + sun_type6 +- <_description>Polish (Sun Type 6/7) ++ Polish (Sun Type 6/7) + + + +@@ -316,16 +316,16 @@ + + + ro +- <_shortDescription>ro +- <_description>Romanian ++ ro ++ Romanian + rum + + + + + crh_dobruja +- <_shortDescription>crh +- <_description>Crimean Tatar (Dobruja Q) ++ crh ++ Crimean Tatar (Dobruja Q) + + crh + +@@ -334,13 +334,13 @@ + + + ergonomic +- <_description>Romanian (ergonomic Touchtype) ++ Romanian (ergonomic Touchtype) + + + + + sun_type6 +- <_description>Romanian (Sun Type 6/7) ++ Romanian (Sun Type 6/7) + + + +@@ -348,15 +348,15 @@ + + + rs +- <_shortDescription>sr +- <_description>Serbian ++ sr ++ Serbian + srp + + + + + combiningkeys +- <_description>Serbian (combining accents instead of dead keys) ++ Serbian (combining accents instead of dead keys) + + + +@@ -364,8 +364,8 @@ + + + ru +- <_shortDescription>ru +- <_description>Russian ++ ru ++ Russian + + + +@@ -378,8 +378,8 @@ + + + ruu +- <_shortDescription>ru +- <_description>Russian (with Ukrainian-Belorussian layout) ++ ru ++ Russian (with Ukrainian-Belorussian layout) + rus + ukr + bel +@@ -388,7 +388,7 @@ + + + sun_type6 +- <_description>Russian (Sun Type 6/7) ++ Russian (Sun Type 6/7) + + + +@@ -396,8 +396,8 @@ + + + am +- <_shortDescription>hy +- <_description>Armenian ++ hy ++ Armenian + + hye + +@@ -406,7 +406,7 @@ + + + olpc-phonetic +- <_description>Armenian (OLPC phonetic) ++ Armenian (OLPC phonetic) + + + +@@ -414,15 +414,15 @@ + + + il +- <_shortDescription>he +- <_description>Hebrew ++ he ++ Hebrew + heb + + + + + biblicalSIL +- <_description>Hebrew (Biblical, SIL phonetic) ++ Hebrew (Biblical, SIL phonetic) + heb + + +@@ -431,14 +431,14 @@ + + + ara +- <_shortDescription>ar +- <_description>Arabic ++ ar ++ Arabic + + + + + sun_type6 +- <_description>Arabic (Sun Type 6/7) ++ Arabic (Sun Type 6/7) + + + +@@ -446,14 +446,14 @@ + + + be +- <_shortDescription>be +- <_description>Belgian ++ be ++ Belgian + + + + + sun_type6 +- <_description>Belgian (Sun Type 6/7) ++ Belgian (Sun Type 6/7) + + + +@@ -461,14 +461,14 @@ + + + br +- <_shortDescription>pt +- <_description>Portuguese (Brazil) ++ pt ++ Portuguese (Brazil) + + + + + sun_type6 +- <_description>Portuguese (Brazil, Sun Type 6/7) ++ Portuguese (Brazil, Sun Type 6/7) + + + +@@ -476,14 +476,14 @@ + + + cz +- <_shortDescription>cs +- <_description>Czech ++ cs ++ Czech + + + + + sun_type6 +- <_description>Czech (Sun Type 6/7) ++ Czech (Sun Type 6/7) + + + +@@ -491,14 +491,14 @@ + + + dk +- <_shortDescription>da +- <_description>Danish ++ da ++ Danish + + + + + sun_type6 +- <_description>Danish (Sun Type 6/7) ++ Danish (Sun Type 6/7) + + + +@@ -506,14 +506,14 @@ + + + nl +- <_shortDescription>nl +- <_description>Dutch ++ nl ++ Dutch + + + + + sun_type6 +- <_description>Dutch (Sun Type 6/7) ++ Dutch (Sun Type 6/7) + + + +@@ -521,14 +521,14 @@ + + + ee +- <_shortDescription>et +- <_description>Estonian ++ et ++ Estonian + + + + + sun_type6 +- <_description>Estonian (Sun Type 6/7) ++ Estonian (Sun Type 6/7) + + + +@@ -536,14 +536,14 @@ + + + fi +- <_shortDescription>fi +- <_description>Finnish ++ fi ++ Finnish + + + + + sun_type6 +- <_description>Finnish (Sun Type 6/7) ++ Finnish (Sun Type 6/7) + + + +@@ -551,14 +551,14 @@ + + + fr +- <_shortDescription>fr +- <_description>French ++ fr ++ French + + + + + sun_type6 +- <_description>French (Sun Type 6/7) ++ French (Sun Type 6/7) + + + +@@ -566,14 +566,14 @@ + + + gr +- <_shortDescription>gr +- <_description>Greek ++ gr ++ Greek + + + + + sun_type6 +- <_description>Greek (Sun Type 6/7) ++ Greek (Sun Type 6/7) + + + +@@ -581,14 +581,14 @@ + + + it +- <_shortDescription>it +- <_description>Italian ++ it ++ Italian + + + + + sun_type6 +- <_description>Italian (Sun Type 6/7) ++ Italian (Sun Type 6/7) + + + +@@ -596,26 +596,26 @@ + + + jp +- <_shortDescription>ja +- <_description>Japanese ++ ja ++ Japanese + + + + + sun_type6 +- <_description>Japanese (Sun Type 6) ++ Japanese (Sun Type 6) + + + + + sun_type7 +- <_description>Japanese (Sun Type 7 - pc compatible) ++ Japanese (Sun Type 7 - pc compatible) + + + + + sun_type7_suncompat +- <_description>Japanese (Sun Type 7 - sun compatible) ++ Japanese (Sun Type 7 - sun compatible) + + + +@@ -623,14 +623,14 @@ + + + no +- <_shortDescription>no +- <_description>Norwegian ++ no ++ Norwegian + + + + + sun_type6 +- <_description>Norwegian (Sun Type 6/7) ++ Norwegian (Sun Type 6/7) + + + +@@ -638,14 +638,14 @@ + + + pt +- <_shortDescription>pt +- <_description>Portuguese ++ pt ++ Portuguese + + + + + sun_type6 +- <_description>Portuguese (Sun Type 6/7) ++ Portuguese (Sun Type 6/7) + + + +@@ -653,14 +653,14 @@ + + + sk +- <_shortDescription>sk +- <_description>Slovak ++ sk ++ Slovak + + + + + sun_type6 +- <_description>Slovak (Sun Type 6/7) ++ Slovak (Sun Type 6/7) + + + +@@ -668,14 +668,14 @@ + + + es +- <_shortDescription>es +- <_description>Spanish ++ es ++ Spanish + + + + + sun_type6 +- <_description>Spanish (Sun Type 6/7) ++ Spanish (Sun Type 6/7) + + + +@@ -683,14 +683,14 @@ + + + se +- <_shortDescription>sv +- <_description>Swedish ++ sv ++ Swedish + + + + + sun_type6 +- <_description>Swedish (Sun Type 6/7) ++ Swedish (Sun Type 6/7) + + + +@@ -698,20 +698,20 @@ + + + ch +- <_shortDescription>de +- <_description>German (Switzerland) ++ de ++ German (Switzerland) + + + + + sun_type6_de +- <_description>German (Switzerland, Sun Type 6/7) ++ German (Switzerland, Sun Type 6/7) + + + + + sun_type6_fr +- <_description>French (Switzerland, Sun Type 6/7) ++ French (Switzerland, Sun Type 6/7) + + + +@@ -719,14 +719,14 @@ + + + tr +- <_shortDescription>tr +- <_description>Turkish ++ tr ++ Turkish + + + + + sun_type6 +- <_description>Turkish (Sun Type 6/7) ++ Turkish (Sun Type 6/7) + + + +@@ -734,14 +734,14 @@ + + + ua +- <_shortDescription>uk +- <_description>Ukrainian ++ uk ++ Ukrainian + + + + + sun_type6 +- <_description>Ukrainian (Sun Type 6/7) ++ Ukrainian (Sun Type 6/7) + + + +@@ -749,14 +749,14 @@ + + + gb +- <_shortDescription>en +- <_description>English (UK) ++ en ++ English (UK) + + + + + sun_type6 +- <_description>English (UK, Sun Type 6/7) ++ English (UK, Sun Type 6/7) + + + +@@ -764,18 +764,18 @@ + + + kr +- <_shortDescription>ko +- <_description>Korean ++ ko ++ Korean + + + + + sun_type6 +- <_description>Korean (Sun Type 6/7) ++ Korean (Sun Type 6/7) + + + + + + +- ++ +\ No newline at end of file diff --git a/package/xkeyboard-config/patches/patch-rules_evdev_xml_in b/package/xkeyboard-config/patches/patch-rules_evdev_xml_in new file mode 100644 index 000000000..57eb6df34 --- /dev/null +++ b/package/xkeyboard-config/patches/patch-rules_evdev_xml_in @@ -0,0 +1,7654 @@ +--- xkeyboard-config-2.11.orig/rules/evdev.xml.in 2014-01-15 02:05:04.000000000 +0100 ++++ xkeyboard-config-2.11/rules/evdev.xml.in 2014-03-04 14:30:54.000000000 +0100 +@@ -5,627 +5,627 @@ + + + pc101 +- <_description>Generic 101-key PC ++ Generic 101-key PC + Generic + + + + + pc102 +- <_description>Generic 102-key (Intl) PC ++ Generic 102-key (Intl) PC + Generic + + + + + pc104 +- <_description>Generic 104-key PC ++ Generic 104-key PC + Generic + + + + + pc105 +- <_description>Generic 105-key (Intl) PC ++ Generic 105-key (Intl) PC + Generic + + + + + dell101 +- <_description>Dell 101-key PC ++ Dell 101-key PC + Dell + + + + + latitude +- <_description>Dell Latitude series laptop ++ Dell Latitude series laptop + Dell + + + + + dellm65 +- <_description>Dell Precision M65 ++ Dell Precision M65 + Dell + + + + + everex +- <_description>Everex STEPnote ++ Everex STEPnote + Everex + + + + + flexpro +- <_description>Keytronic FlexPro ++ Keytronic FlexPro + Keytronic + + + + + microsoft +- <_description>Microsoft Natural ++ Microsoft Natural + Microsoft Inc. + + + + + omnikey101 +- <_description>Northgate OmniKey 101 ++ Northgate OmniKey 101 + Northgate + + + + + winbook +- <_description>Winbook Model XP5 ++ Winbook Model XP5 + Generic + + + + + pc98 +- <_description>PC-98xx Series ++ PC-98xx Series + Generic + + + + + a4techKB21 +- <_description>A4Tech KB-21 ++ A4Tech KB-21 + A4Tech + + + + + a4techKBS8 +- <_description>A4Tech KBS-8 ++ A4Tech KBS-8 + A4Tech + + + + + a4_rfkb23 +- <_description>A4Tech Wireless Desktop RFKB-23 ++ A4Tech Wireless Desktop RFKB-23 + A4Tech + + + + + airkey +- <_description>Acer AirKey V ++ Acer AirKey V + Acer + + + + + azonaRF2300 +- <_description>Azona RF2300 wireless Internet Keyboard ++ Azona RF2300 wireless Internet Keyboard + Azona + + + + + scorpius +- <_description>Advance Scorpius KI ++ Advance Scorpius KI + Scorpius + + + + + brother +- <_description>Brother Internet Keyboard ++ Brother Internet Keyboard + Brother + + + + + btc5113rf +- <_description>BTC 5113RF Multimedia ++ BTC 5113RF Multimedia + BTC + + + + + btc5126t +- <_description>BTC 5126T ++ BTC 5126T + BTC + + + + + btc6301urf +- <_description>BTC 6301URF ++ BTC 6301URF + BTC + + + + + btc9000 +- <_description>BTC 9000 ++ BTC 9000 + BTC + + + + + btc9000a +- <_description>BTC 9000A ++ BTC 9000A + BTC + + + + + btc9001ah +- <_description>BTC 9001AH ++ BTC 9001AH + BTC + + + + + btc5090 +- <_description>BTC 5090 ++ BTC 5090 + BTC + + + + + btc9019u +- <_description>BTC 9019U ++ BTC 9019U + BTC + + + + + btc9116u +- <_description>BTC 9116U Mini Wireless Internet and Gaming ++ BTC 9116U Mini Wireless Internet and Gaming + + + + + cherryblue +- <_description>Cherry Blue Line CyBo@rd ++ Cherry Blue Line CyBo@rd + + + + + cherryblueb +- <_description>Cherry CyMotion Master XPress ++ Cherry CyMotion Master XPress + Cherry + + + + + cherrybluea +- <_description>Cherry Blue Line CyBo@rd (alternate option) ++ Cherry Blue Line CyBo@rd (alternate option) + Cherry + + + + + cherrycyboard +- <_description>Cherry CyBo@rd USB-Hub ++ Cherry CyBo@rd USB-Hub + Cherry + + + + + cherrycmexpert +- <_description>Cherry CyMotion Expert ++ Cherry CyMotion Expert + Cherry + + + + + cherrybunlim +- <_description>Cherry B.UNLIMITED ++ Cherry B.UNLIMITED + Cherry + + + + + chicony +- <_description>Chicony Internet Keyboard ++ Chicony Internet Keyboard + Chicony + + + + + chicony0108 +- <_description>Chicony KU-0108 ++ Chicony KU-0108 + Chicony + + + + + chicony0420 +- <_description>Chicony KU-0420 ++ Chicony KU-0420 + Chicony + + + + + chicony9885 +- <_description>Chicony KB-9885 ++ Chicony KB-9885 + Chicony + + + + + compaqeak8 +- <_description>Compaq Easy Access Keyboard ++ Compaq Easy Access Keyboard + Compaq + + + + + compaqik7 +- <_description>Compaq Internet Keyboard (7 keys) ++ Compaq Internet Keyboard (7 keys) + Compaq + + + + + compaqik13 +- <_description>Compaq Internet Keyboard (13 keys) ++ Compaq Internet Keyboard (13 keys) + Compaq + + + + + compaqik18 +- <_description>Compaq Internet Keyboard (18 keys) ++ Compaq Internet Keyboard (18 keys) + Compaq + + + + + cymotionlinux +- <_description>Cherry CyMotion Master Linux ++ Cherry CyMotion Master Linux + Cherry + + + + + armada +- <_description>Laptop/notebook Compaq (eg. Armada) Laptop Keyboard ++ Laptop/notebook Compaq (eg. Armada) Laptop Keyboard + Compaq + + + + + presario +- <_description>Laptop/notebook Compaq (eg. Presario) Internet Keyboard ++ Laptop/notebook Compaq (eg. Presario) Internet Keyboard + Compaq + + + + + ipaq +- <_description>Compaq iPaq Keyboard ++ Compaq iPaq Keyboard + Compaq + + + + + dell +- <_description>Dell ++ Dell + Dell + + + + + dellsk8125 +- <_description>Dell SK-8125 ++ Dell SK-8125 + Dell + + + + + dellsk8135 +- <_description>Dell SK-8135 ++ Dell SK-8135 + Dell + + + + + dellusbmm +- <_description>Dell USB Multimedia Keyboard ++ Dell USB Multimedia Keyboard + Dell + + + + + inspiron +- <_description>Dell Laptop/notebook Inspiron 6xxx/8xxx ++ Dell Laptop/notebook Inspiron 6xxx/8xxx + Dell + + + + + precision_m +- <_description>Dell Laptop/notebook Precision M series ++ Dell Laptop/notebook Precision M series + Dell + + + + + dexxa +- <_description>Dexxa Wireless Desktop Keyboard ++ Dexxa Wireless Desktop Keyboard + Dexxa + + + + + diamond +- <_description>Diamond 9801 / 9802 series ++ Diamond 9801 / 9802 series + Diamond + + + + + dtk2000 +- <_description>DTK2000 ++ DTK2000 + + + + + ennyah_dkb1008 +- <_description>Ennyah DKB-1008 ++ Ennyah DKB-1008 + Ennyah + + + + + fscaa1667g +- <_description>Fujitsu-Siemens Computers AMILO laptop ++ Fujitsu-Siemens Computers AMILO laptop + Fujitsu-Siemens + + + + + genius +- <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910 ++ Genius Comfy KB-16M / Genius MM Keyboard KWD-910 + Genius + + + + + geniuscomfy +- <_description>Genius Comfy KB-12e ++ Genius Comfy KB-12e + Genius + + + + + geniuscomfy2 +- <_description>Genius Comfy KB-21e-Scroll ++ Genius Comfy KB-21e-Scroll + Genius + + + + + geniuskb19e +- <_description>Genius KB-19e NB ++ Genius KB-19e NB + Genius + + + + + geniuskkb2050hs +- <_description>Genius KKB-2050HS ++ Genius KKB-2050HS + Genius + + + + + gyration +- <_description>Gyration ++ Gyration + Gyration + + + + + htcdream +- <_description>HTC Dream ++ HTC Dream + HTC + + + + + kinesis +- <_description>Kinesis ++ Kinesis + Kinesis + + + + + logitech_base +- <_description>Logitech Generic Keyboard ++ Logitech Generic Keyboard + Logitech + + + + + logitech_g15 +- <_description>Logitech G15 extra keys via G15daemon ++ Logitech G15 extra keys via G15daemon + Logitech + + + + + hpi6 +- <_description>Hewlett-Packard Internet Keyboard ++ Hewlett-Packard Internet Keyboard + Hewlett-Packard + + + + + hp250x +- <_description>Hewlett-Packard SK-250x Multimedia Keyboard ++ Hewlett-Packard SK-250x Multimedia Keyboard + Hewlett-Packard + + + + + hpxe3gc +- <_description>Hewlett-Packard Omnibook XE3 GC ++ Hewlett-Packard Omnibook XE3 GC + Hewlett-Packard + + + + + hpxe3gf +- <_description>Hewlett-Packard Omnibook XE3 GF ++ Hewlett-Packard Omnibook XE3 GF + Hewlett-Packard + + + + + hpxt1000 +- <_description>Hewlett-Packard Omnibook XT1000 ++ Hewlett-Packard Omnibook XT1000 + Hewlett-Packard + + + + + hpdv5 +- <_description>Hewlett-Packard Pavilion dv5 ++ Hewlett-Packard Pavilion dv5 + Hewlett-Packard + + + + + hpzt11xx +- <_description>Hewlett-Packard Pavilion ZT11xx ++ Hewlett-Packard Pavilion ZT11xx + Hewlett-Packard + + + + + hp500fa +- <_description>Hewlett-Packard Omnibook 500 FA ++ Hewlett-Packard Omnibook 500 FA + Hewlett-Packard + + + + + hp5xx +- <_description>Hewlett-Packard Omnibook 5xx ++ Hewlett-Packard Omnibook 5xx + Hewlett-Packard + + + + + hpnx9020 +- <_description>Hewlett-Packard nx9020 ++ Hewlett-Packard nx9020 + Hewlett-Packard + + + + + hp6000 +- <_description>Hewlett-Packard Omnibook 6000/6100 ++ Hewlett-Packard Omnibook 6000/6100 + Hewlett-Packard + + + + + honeywell_euroboard +- <_description>Honeywell Euroboard ++ Honeywell Euroboard + Hewlett-Packard + + + + + hpmini110 +- <_description>Hewlett-Packard Mini 110 Notebook ++ Hewlett-Packard Mini 110 Notebook + Hewlett-Packard + + + + + rapidaccess +- <_description>IBM Rapid Access ++ IBM Rapid Access + Lenovo (previously IBM) + + + + + rapidaccess2 +- <_description>IBM Rapid Access II ++ IBM Rapid Access II + Lenovo (previously IBM) + + + + + thinkpad +- <_description>IBM ThinkPad 560Z/600/600E/A22E ++ IBM ThinkPad 560Z/600/600E/A22E + Lenovo (previously IBM) + + + + + thinkpad60 +- <_description>IBM ThinkPad R60/T60/R61/T61 ++ IBM ThinkPad R60/T60/R61/T61 + Lenovo (previously IBM) + + + + + thinkpadz60 +- <_description>IBM ThinkPad Z60m/Z60t/Z61m/Z61t ++ IBM ThinkPad Z60m/Z60t/Z61m/Z61t + Lenovo (previously IBM) + + + + + ibm_spacesaver +- <_description>IBM Space Saver ++ IBM Space Saver + Lenovo (previously IBM) + + + + + logiaccess +- <_description>Logitech Access Keyboard ++ Logitech Access Keyboard + Logitech + + + + + logiclx300 +- <_description>Logitech Cordless Desktop LX-300 ++ Logitech Cordless Desktop LX-300 + Logitech + + + + + logii350 +- <_description>Logitech Internet 350 Keyboard ++ Logitech Internet 350 Keyboard + Logitech + 046d:c313 + +@@ -633,665 +633,665 @@ + + + logimel +- <_description>Logitech Media Elite Keyboard ++ Logitech Media Elite Keyboard + Logitech + + + + + logicd +- <_description>Logitech Cordless Desktop ++ Logitech Cordless Desktop + Logitech + + + + + logicd_it +- <_description>Logitech Cordless Desktop iTouch ++ Logitech Cordless Desktop iTouch + Logitech + + + + + logicd_nav +- <_description>Logitech Cordless Desktop Navigator ++ Logitech Cordless Desktop Navigator + Logitech + + + + + logicd_opt +- <_description>Logitech Cordless Desktop Optical ++ Logitech Cordless Desktop Optical + Logitech + + + + + logicda +- <_description>Logitech Cordless Desktop (alternate option) ++ Logitech Cordless Desktop (alternate option) + Logitech + + + + + logicdpa2 +- <_description>Logitech Cordless Desktop Pro (alternate option 2) ++ Logitech Cordless Desktop Pro (alternate option 2) + Logitech + + + + + logicfn +- <_description>Logitech Cordless Freedom/Desktop Navigator ++ Logitech Cordless Freedom/Desktop Navigator + Logitech + + + + + logicdn +- <_description>Logitech Cordless Desktop Navigator ++ Logitech Cordless Desktop Navigator + Logitech + + + + + logiitc +- <_description>Logitech iTouch Cordless Keyboard (model Y-RB6) ++ Logitech iTouch Cordless Keyboard (model Y-RB6) + Logitech + + + + + logiik +- <_description>Logitech Internet Keyboard ++ Logitech Internet Keyboard + Logitech + + + + + itouch +- <_description>Logitech iTouch ++ Logitech iTouch + Logitech + + + + + logicink +- <_description>Logitech Internet Navigator Keyboard ++ Logitech Internet Navigator Keyboard + Logitech + + + + + logiex110 +- <_description>Logitech Cordless Desktop EX110 ++ Logitech Cordless Desktop EX110 + Logitech + + + + + logiinkse +- <_description>Logitech iTouch Internet Navigator Keyboard SE ++ Logitech iTouch Internet Navigator Keyboard SE + Logitech + + + + + logiinkseusb +- <_description>Logitech iTouch Internet Navigator Keyboard SE (USB) ++ Logitech iTouch Internet Navigator Keyboard SE (USB) + Logitech + + + + + logiultrax +- <_description>Logitech Ultra-X Keyboard ++ Logitech Ultra-X Keyboard + Logitech + + + + + logiultraxc +- <_description>Logitech Ultra-X Cordless Media Desktop Keyboard ++ Logitech Ultra-X Cordless Media Desktop Keyboard + Logitech + + + + + logidinovo +- <_description>Logitech diNovo Keyboard ++ Logitech diNovo Keyboard + Logitech + + + + + logidinovoedge +- <_description>Logitech diNovo Edge Keyboard ++ Logitech diNovo Edge Keyboard + Logitech + + + + + mx1998 +- <_description>Memorex MX1998 ++ Memorex MX1998 + Memorex + + + + + mx2500 +- <_description>Memorex MX2500 EZ-Access Keyboard ++ Memorex MX2500 EZ-Access Keyboard + Memorex + + + + + mx2750 +- <_description>Memorex MX2750 ++ Memorex MX2750 + Memorex + + + + + microsoft4000 +- <_description>Microsoft Natural Wireless Ergonomic Keyboard 4000 ++ Microsoft Natural Wireless Ergonomic Keyboard 4000 + Microsoft Inc. + + + + + microsoft7000 +- <_description>Microsoft Natural Wireless Ergonomic Keyboard 7000 ++ Microsoft Natural Wireless Ergonomic Keyboard 7000 + Microsoft Inc. + + + + + microsoftinet +- <_description>Microsoft Internet Keyboard ++ Microsoft Internet Keyboard + Microsoft Inc. + + + + + microsoftpro +- <_description>Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro ++ Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro + Microsoft Inc. + + + + + microsoftprousb +- <_description>Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro ++ Microsoft Natural Keyboard Pro USB / Microsoft Internet Keyboard Pro + Microsoft Inc. + + + + + microsoftprooem +- <_description>Microsoft Natural Keyboard Pro OEM ++ Microsoft Natural Keyboard Pro OEM + Microsoft Inc. + + + + + vsonku306 +- <_description>ViewSonic KU-306 Internet Keyboard ++ ViewSonic KU-306 Internet Keyboard + ViewSonic + + + + + microsoftprose +- <_description>Microsoft Internet Keyboard Pro, Swedish ++ Microsoft Internet Keyboard Pro, Swedish + Microsoft Inc. + + + + + microsoftoffice +- <_description>Microsoft Office Keyboard ++ Microsoft Office Keyboard + Microsoft Inc. + + + + + microsoftmult +- <_description>Microsoft Wireless Multimedia Keyboard 1.0A ++ Microsoft Wireless Multimedia Keyboard 1.0A + Microsoft Inc. + + + + + microsoftelite +- <_description>Microsoft Natural Keyboard Elite ++ Microsoft Natural Keyboard Elite + Microsoft Inc. + + + + + microsoftccurve2k +- <_description>Microsoft Comfort Curve Keyboard 2000 ++ Microsoft Comfort Curve Keyboard 2000 + Microsoft Inc. + + + + + oretec +- <_description>Ortek MCK-800 MM/Internet keyboard ++ Ortek MCK-800 MM/Internet keyboard + Ortek + + + + + propeller +- <_description>Propeller Voyager (KTEZ-1000) ++ Propeller Voyager (KTEZ-1000) + KeyTronic + + + + + qtronix +- <_description>QTronix Scorpius 98N+ ++ QTronix Scorpius 98N+ + QTronix + + + + + samsung4500 +- <_description>Samsung SDM 4500P ++ Samsung SDM 4500P + Samsung + + + + + samsung4510 +- <_description>Samsung SDM 4510P ++ Samsung SDM 4510P + Samsung + + + + + sanwaskbkg3 +- <_description>Sanwa Supply SKB-KG3 ++ Sanwa Supply SKB-KG3 + Sanwa Supply Inc. + + + + + sk1300 +- <_description>SK-1300 ++ SK-1300 + NEC + + + + + sk2500 +- <_description>SK-2500 ++ SK-2500 + NEC + + + + + sk6200 +- <_description>SK-6200 ++ SK-6200 + NEC + + + + + sk7100 +- <_description>SK-7100 ++ SK-7100 + NEC + + + + + sp_inet +- <_description>Super Power Multimedia Keyboard ++ Super Power Multimedia Keyboard + Generic + + + + + sven +- <_description>SVEN Ergonomic 2500 ++ SVEN Ergonomic 2500 + SVEN + + + + + sven303 +- <_description>SVEN Slim 303 ++ SVEN Slim 303 + SVEN + + + + + symplon +- <_description>Symplon PaceBook (tablet PC) ++ Symplon PaceBook (tablet PC) + Symplon + + + + + toshiba_s3000 +- <_description>Toshiba Satellite S3000 ++ Toshiba Satellite S3000 + Toshiba + + + + + trust +- <_description>Trust Wireless Keyboard Classic ++ Trust Wireless Keyboard Classic + Trust + + + + + trustda +- <_description>Trust Direct Access Keyboard ++ Trust Direct Access Keyboard + Trust + + + + + trust_slimline +- <_description>Trust Slimline ++ Trust Slimline + Trust + + + + + tm2020 +- <_description>TypeMatrix EZ-Reach 2020 ++ TypeMatrix EZ-Reach 2020 + TypeMatrix + + + + + tm2030PS2 +- <_description>TypeMatrix EZ-Reach 2030 PS2 ++ TypeMatrix EZ-Reach 2030 PS2 + TypeMatrix + + + + + tm2030USB +- <_description>TypeMatrix EZ-Reach 2030 USB ++ TypeMatrix EZ-Reach 2030 USB + TypeMatrix + + + + + tm2030USB-102 +- <_description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) ++ TypeMatrix EZ-Reach 2030 USB (102/105:EU mode) + TypeMatrix + + + + + tm2030USB-106 +- <_description>TypeMatrix EZ-Reach 2030 USB (106:JP mode) ++ TypeMatrix EZ-Reach 2030 USB (106:JP mode) + TypeMatrix + + + + + yahoo +- <_description>Yahoo! Internet Keyboard ++ Yahoo! Internet Keyboard + Yahoo! + + + + + macbook78 +- <_description>MacBook/MacBook Pro ++ MacBook/MacBook Pro + Apple + + + + + macbook79 +- <_description>MacBook/MacBook Pro (Intl) ++ MacBook/MacBook Pro (Intl) + Apple + + + + + macintosh +- <_description>Macintosh ++ Macintosh + Apple + + + + + macintosh_old +- <_description>Macintosh Old ++ Macintosh Old + Apple + + + + + macintosh_hhk +- <_description>Happy Hacking Keyboard for Mac ++ Happy Hacking Keyboard for Mac + Fujitsu + + + + + acer_c300 +- <_description>Acer C300 ++ Acer C300 + Acer + + + + + acer_ferrari4k +- <_description>Acer Ferrari 4000 ++ Acer Ferrari 4000 + Acer + + + + + acer_laptop +- <_description>Acer Laptop ++ Acer Laptop + Acer + + + + + asus_laptop +- <_description>Asus Laptop ++ Asus Laptop + Asus + + + + + apple +- <_description>Apple ++ Apple + Apple + + + + + apple_laptop +- <_description>Apple Laptop ++ Apple Laptop + Apple + + + + + applealu_ansi +- <_description>Apple Aluminium Keyboard (ANSI) ++ Apple Aluminium Keyboard (ANSI) + Apple + + + + + applealu_iso +- <_description>Apple Aluminium Keyboard (ISO) ++ Apple Aluminium Keyboard (ISO) + Apple + + + + + applealu_jis +- <_description>Apple Aluminium Keyboard (JIS) ++ Apple Aluminium Keyboard (JIS) + Apple + + + + + silvercrest +- <_description>SILVERCREST Multimedia Wireless Keyboard ++ SILVERCREST Multimedia Wireless Keyboard + Silvercrest + + + + + emachines +- <_description>Laptop/notebook eMachines m68xx ++ Laptop/notebook eMachines m68xx + eMachines + + + + + benqx +- <_description>BenQ X-Touch ++ BenQ X-Touch + BenQ + + + + + benqx730 +- <_description>BenQ X-Touch 730 ++ BenQ X-Touch 730 + BenQ + + + + + benqx800 +- <_description>BenQ X-Touch 800 ++ BenQ X-Touch 800 + BenQ + + + + + hhk +- <_description>Happy Hacking Keyboard ++ Happy Hacking Keyboard + Fujitsu + + + + + classmate +- <_description>Classmate PC ++ Classmate PC + Intel + + + + + olpc +- <_description>OLPC ++ OLPC + OLPC + + + + + sun_type7_usb +- <_description>Sun Type 7 USB ++ Sun Type 7 USB + Sun Microsystems + + + + + sun_type7_euro_usb +- <_description>Sun Type 7 USB (European layout) ++ Sun Type 7 USB (European layout) + Sun Microsystems + + + + + sun_type7_unix_usb +- <_description>Sun Type 7 USB (Unix layout) ++ Sun Type 7 USB (Unix layout) + Sun Microsystems + + + + + sun_type7_jp_usb +- <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key ++ Sun Type 7 USB (Japanese layout) / Japanese 106-key + Sun Microsystems + + + + + sun_type6_usb +- <_description>Sun Type 6/7 USB ++ Sun Type 6/7 USB + Sun Microsystems + + + + + sun_type6_euro_usb +- <_description>Sun Type 6/7 USB (European layout) ++ Sun Type 6/7 USB (European layout) + Sun Microsystems + + + + + sun_type6_unix_usb +- <_description>Sun Type 6 USB (Unix layout) ++ Sun Type 6 USB (Unix layout) + Sun Microsystems + + + + + sun_type6_jp_usb +- <_description>Sun Type 6 USB (Japanese layout) ++ Sun Type 6 USB (Japanese layout) + Sun Microsystems + + + + + sun_type6_jp +- <_description>Sun Type 6 (Japanese layout) ++ Sun Type 6 (Japanese layout) + Sun Microsystems + + + + + targa_v811 +- <_description>Targa Visionary 811 ++ Targa Visionary 811 + Targa + + + + + unitekkb1925 +- <_description>Unitek KB-1925 ++ Unitek KB-1925 + Unitek Group + + + + + compalfl90 +- <_description>FL90 ++ FL90 + Compal Electronics Inc. + + + + + creativedw7000 +- <_description>Creative Desktop Wireless 7000 ++ Creative Desktop Wireless 7000 + Creative + + + + + htcdream +- <_description>Htc Dream phone ++ Htc Dream phone + htc + + +@@ -1300,9 +1300,9 @@ + + + us +- +- <_shortDescription>en +- <_description>English (US) ++ ++ en ++ English (US) + + eng + +@@ -1311,9 +1311,9 @@ + + + chr +- +- <_shortDescription>chr +- <_description>Cherokee ++ ++ chr ++ Cherokee + + chr + +@@ -1322,75 +1322,75 @@ + + + euro +- <_description>English (US, with euro on 5) ++ English (US, with euro on 5) + + + + + intl +- <_description>English (US, international with dead keys) ++ English (US, international with dead keys) + + + + + alt-intl +- <_description>English (US, alternative international) ++ English (US, alternative international) + + + + + colemak +- <_description>English (Colemak) ++ English (Colemak) + + + + + dvorak +- <_description>English (Dvorak) ++ English (Dvorak) + + + + + dvorak-intl +- <_description>English (Dvorak, international with dead keys) ++ English (Dvorak, international with dead keys) + + + + + dvorak-alt-intl +- <_description>English (Dvorak alternative international no dead keys) ++ English (Dvorak alternative international no dead keys) + + + + + dvorak-l +- <_description>English (left handed Dvorak) ++ English (left handed Dvorak) + + + + + dvorak-r +- <_description>English (right handed Dvorak) ++ English (right handed Dvorak) + + + + + dvorak-classic +- <_description>English (classic Dvorak) ++ English (classic Dvorak) + + + + + dvp +- <_description>English (programmer Dvorak) ++ English (programmer Dvorak) + + + + + rus +- +- <_shortDescription>ru +- <_description>Russian (US, phonetic) ++ ++ ru ++ Russian (US, phonetic) + + rus + +@@ -1399,13 +1399,13 @@ + + + mac +- <_description>English (Macintosh) ++ English (Macintosh) + + + + + altgr-intl +- <_description>English (international AltGr dead keys) ++ English (international AltGr dead keys) + eng + fra + ger +@@ -1414,13 +1414,13 @@ + + + olpc2 +- <_description>English (the divide/multiply keys toggle the layout) ++ English (the divide/multiply keys toggle the layout) + + + + + hbs +- <_description>Serbo-Croatian (US) ++ Serbo-Croatian (US) + eng + bos + hbs +@@ -1431,13 +1431,13 @@ + + + workman +- <_description>English (Workman) ++ English (Workman) + + + + + workman-intl +- <_description>English (Workman, international with dead keys) ++ English (Workman, international with dead keys) + + + +@@ -1445,17 +1445,17 @@ + + + af +- +- <_shortDescription>fa +- <_description>Afghani ++ ++ fa ++ Afghani + + + + + ps +- +- <_shortDescription>ps +- <_description>Pashto ++ ++ ps ++ Pashto + + pus + +@@ -1464,9 +1464,9 @@ + + + uz +- +- <_shortDescription>uz +- <_description>Uzbek (Afghanistan) ++ ++ uz ++ Uzbek (Afghanistan) + + uzb + +@@ -1475,9 +1475,9 @@ + + + olpc-ps +- +- <_shortDescription>ps +- <_description>Pashto (Afghanistan, OLPC) ++ ++ ps ++ Pashto (Afghanistan, OLPC) + + pus + +@@ -1486,17 +1486,17 @@ + + + fa-olpc +- +- <_shortDescription>fa +- <_description>Persian (Afghanistan, Dari OLPC) ++ ++ fa ++ Persian (Afghanistan, Dari OLPC) + + + + + uz-olpc +- +- <_shortDescription>uz +- <_description>Uzbek (Afghanistan, OLPC) ++ ++ uz ++ Uzbek (Afghanistan, OLPC) + + uzb + +@@ -1507,9 +1507,9 @@ + + + ara +- +- <_shortDescription>ar +- <_description>Arabic ++ ++ ar ++ Arabic + + AE + BH +@@ -1539,37 +1539,37 @@ + + + azerty +- <_description>Arabic (azerty) ++ Arabic (azerty) + + + + + azerty_digits +- <_description>Arabic (azerty/digits) ++ Arabic (azerty/digits) + + + + + digits +- <_description>Arabic (digits) ++ Arabic (digits) + + + + + qwerty +- <_description>Arabic (qwerty) ++ Arabic (qwerty) + + + + + qwerty_digits +- <_description>Arabic (qwerty/digits) ++ Arabic (qwerty/digits) + + + + + buckwalter +- <_description>Arabic (Buckwalter) ++ Arabic (Buckwalter) + + + +@@ -1577,9 +1577,9 @@ + + + al +- +- <_shortDescription>sq +- <_description>Albanian ++ ++ sq ++ Albanian + + alb + +@@ -1589,9 +1589,9 @@ + + + am +- +- <_shortDescription>hy +- <_description>Armenian ++ ++ hy ++ Armenian + + hye + +@@ -1600,31 +1600,31 @@ + + + phonetic +- <_description>Armenian (phonetic) ++ Armenian (phonetic) + + + + + phonetic-alt +- <_description>Armenian (alternative phonetic) ++ Armenian (alternative phonetic) + + + + + eastern +- <_description>Armenian (eastern) ++ Armenian (eastern) + + + + + western +- <_description>Armenian (western) ++ Armenian (western) + + + + + eastern-alt +- <_description>Armenian (alternative eastern) ++ Armenian (alternative eastern) + + + +@@ -1632,9 +1632,9 @@ + + + at +- +- <_shortDescription>de +- <_description>German (Austria) ++ ++ de ++ German (Austria) + + ger + +@@ -1643,19 +1643,19 @@ + + + nodeadkeys +- <_description>German (Austria, eliminate dead keys) ++ German (Austria, eliminate dead keys) + + + + + sundeadkeys +- <_description>German (Austria, Sun dead keys) ++ German (Austria, Sun dead keys) + + + + + mac +- <_description>German (Austria, Macintosh) ++ German (Austria, Macintosh) + + + +@@ -1663,9 +1663,9 @@ + + + az +- +- <_shortDescription>az +- <_description>Azerbaijani ++ ++ az ++ Azerbaijani + + aze + +@@ -1674,7 +1674,7 @@ + + + cyrillic +- <_description>Azerbaijani (Cyrillic) ++ Azerbaijani (Cyrillic) + + + +@@ -1682,9 +1682,9 @@ + + + by +- +- <_shortDescription>by +- <_description>Belarusian ++ ++ by ++ Belarusian + + bel + +@@ -1693,13 +1693,13 @@ + + + legacy +- <_description>Belarusian (legacy) ++ Belarusian (legacy) + + + + + latin +- <_description>Belarusian (Latin) ++ Belarusian (Latin) + + + +@@ -1707,9 +1707,9 @@ + + + be +- +- <_shortDescription>be +- <_description>Belgian ++ ++ be ++ Belgian + ger + nld + fra +@@ -1718,43 +1718,43 @@ + + + oss +- <_description>Belgian (alternative) ++ Belgian (alternative) + + + + + oss_latin9 +- <_description>Belgian (alternative, Latin-9 only) ++ Belgian (alternative, Latin-9 only) + + + + + oss_sundeadkeys +- <_description>Belgian (alternative, Sun dead keys) ++ Belgian (alternative, Sun dead keys) + + + + + iso-alternate +- <_description>Belgian (ISO alternate) ++ Belgian (ISO alternate) + + + + + nodeadkeys +- <_description>Belgian (eliminate dead keys) ++ Belgian (eliminate dead keys) + + + + + sundeadkeys +- <_description>Belgian (Sun dead keys) ++ Belgian (Sun dead keys) + + + + + wang +- <_description>Belgian (Wang model 724 azerty) ++ Belgian (Wang model 724 azerty) + + + +@@ -1762,9 +1762,9 @@ + + + bd +- +- <_shortDescription>bn +- <_description>Bangla ++ ++ bn ++ Bangla + + ben + +@@ -1773,7 +1773,7 @@ + + + probhat +- <_description>Bangla (Probhat) ++ Bangla (Probhat) + + + +@@ -1781,17 +1781,17 @@ + + + in +- +- <_shortDescription>in +- <_description>Indian ++ ++ in ++ Indian + + + + + ben +- +- <_shortDescription>bn +- <_description>Bangla (India) ++ ++ bn ++ Bangla (India) + + ben + +@@ -1800,9 +1800,9 @@ + + + ben_probhat +- +- <_shortDescription>bn +- <_description>Bangla (India, Probhat) ++ ++ bn ++ Bangla (India, Probhat) + + ben + +@@ -1811,28 +1811,28 @@ + + + ben_baishakhi +- <_description>Bangla (India, Baishakhi) ++ Bangla (India, Baishakhi) + ben + + + + + ben_bornona +- <_description>Bangla (India, Bornona) ++ Bangla (India, Bornona) + ben + + + + + ben_gitanjali +- <_description>Bangla (India, Uni Gitanjali) ++ Bangla (India, Uni Gitanjali) + ben + + + + + ben_inscript +- <_description>Bangla (India, Baishakhi Inscript) ++ Bangla (India, Baishakhi Inscript) + ben + + +@@ -1846,9 +1846,9 @@ + + + guj +- +- <_shortDescription>gu +- <_description>Gujarati ++ ++ gu ++ Gujarati + + guj + +@@ -1857,9 +1857,9 @@ + + + guru +- +- <_shortDescription>pa +- <_description>Punjabi (Gurmukhi) ++ ++ pa ++ Punjabi (Gurmukhi) + + pan + +@@ -1868,9 +1868,9 @@ + + + jhelum +- +- <_shortDescription>pa +- <_description>Punjabi (Gurmukhi Jhelum) ++ ++ pa ++ Punjabi (Gurmukhi Jhelum) + + pan + +@@ -1879,9 +1879,9 @@ + + + kan +- +- <_shortDescription>kn +- <_description>Kannada ++ ++ kn ++ Kannada + + kan + +@@ -1890,9 +1890,9 @@ + + + kan-kagapa +- +- <_shortDescription>kn +- <_description>Kannada (KaGaPa phonetic) ++ ++ kn ++ Kannada (KaGaPa phonetic) + + kan + +@@ -1901,9 +1901,9 @@ + + + mal +- +- <_shortDescription>ml +- <_description>Malayalam ++ ++ ml ++ Malayalam + + mal + +@@ -1912,9 +1912,9 @@ + + + mal_lalitha +- +- <_shortDescription>ml +- <_description>Malayalam (Lalitha) ++ ++ ml ++ Malayalam (Lalitha) + + mal + +@@ -1923,18 +1923,18 @@ + + + mal_enhanced +- +- <_shortDescription>ml +- <_description>Malayalam (enhanced Inscript with Rupee Sign) ++ ++ ml ++ Malayalam (enhanced Inscript with Rupee Sign) + mal + + + + + ori +- +- <_shortDescription>or +- <_description>Oriya ++ ++ or ++ Oriya + + ori + +@@ -1943,9 +1943,9 @@ + + + tam_unicode +- +- <_shortDescription>ta +- <_description>Tamil (Unicode) ++ ++ ta ++ Tamil (Unicode) + + tam + +@@ -1954,9 +1954,9 @@ + + + tam_keyboard_with_numerals +- +- <_shortDescription>ta +- <_description>Tamil (keyboard with numerals) ++ ++ ta ++ Tamil (keyboard with numerals) + + tam + +@@ -1965,9 +1965,9 @@ + + + tam_TAB +- +- <_shortDescription>ta +- <_description>Tamil (TAB typewriter) ++ ++ ta ++ Tamil (TAB typewriter) + + tam + +@@ -1976,9 +1976,9 @@ + + + tam_TSCII +- +- <_shortDescription>ta +- <_description>Tamil (TSCII typewriter) ++ ++ ta ++ Tamil (TSCII typewriter) + + tam + +@@ -1987,9 +1987,9 @@ + + + tam +- +- <_shortDescription>ta +- <_description>Tamil ++ ++ ta ++ Tamil + + tam + +@@ -1998,9 +1998,9 @@ + + + tel +- +- <_shortDescription>te +- <_description>Telugu ++ ++ te ++ Telugu + + tel + +@@ -2009,9 +2009,9 @@ + + + tel-kagapa +- +- <_shortDescription>te +- <_description>Telugu (KaGaPa phonetic) ++ ++ te ++ Telugu (KaGaPa phonetic) + + tel + +@@ -2020,9 +2020,9 @@ + + + urd-phonetic +- +- <_shortDescription>ur +- <_description>Urdu (phonetic) ++ ++ ur ++ Urdu (phonetic) + + urd + +@@ -2031,9 +2031,9 @@ + + + urd-phonetic3 +- +- <_shortDescription>ur +- <_description>Urdu (alternative phonetic) ++ ++ ur ++ Urdu (alternative phonetic) + + urd + +@@ -2042,9 +2042,9 @@ + + + urd-winkeys +- +- <_shortDescription>ur +- <_description>Urdu (WinKeys) ++ ++ ur ++ Urdu (WinKeys) + + urd + +@@ -2053,9 +2053,9 @@ + + + bolnagri +- +- <_shortDescription>hi +- <_description>Hindi (Bolnagri) ++ ++ hi ++ Hindi (Bolnagri) + + hin + +@@ -2064,9 +2064,9 @@ + + + hin-wx +- +- <_shortDescription>hi +- <_description>Hindi (Wx) ++ ++ hi ++ Hindi (Wx) + + hin + +@@ -2075,9 +2075,9 @@ + + + hin-kagapa +- +- <_shortDescription>hi +- <_description>Hindi (KaGaPa phonetic) ++ ++ hi ++ Hindi (KaGaPa phonetic) + + hin + +@@ -2086,9 +2086,9 @@ + + + san-kagapa +- +- <_shortDescription>sa +- <_description>Sanskrit (KaGaPa phonetic) ++ ++ sa ++ Sanskrit (KaGaPa phonetic) + + san + +@@ -2097,9 +2097,9 @@ + + + mar-kagapa +- +- <_shortDescription>mr +- <_description>Marathi (KaGaPa phonetic) ++ ++ mr ++ Marathi (KaGaPa phonetic) + + mar + +@@ -2108,9 +2108,9 @@ + + + eng +- +- <_shortDescription>en +- <_description>English (India, with RupeeSign) ++ ++ en ++ English (India, with RupeeSign) + + eng + +@@ -2121,9 +2121,9 @@ + + + ba +- +- <_shortDescription>bs +- <_description>Bosnian ++ ++ bs ++ Bosnian + + bos + +@@ -2132,25 +2132,25 @@ + + + alternatequotes +- <_description>Bosnian (use guillemets for quotes) ++ Bosnian (use guillemets for quotes) + + + + + unicode +- <_description>Bosnian (use Bosnian digraphs) ++ Bosnian (use Bosnian digraphs) + + + + + unicodeus +- <_description>Bosnian (US keyboard with Bosnian digraphs) ++ Bosnian (US keyboard with Bosnian digraphs) + + + + + us +- <_description>Bosnian (US keyboard with Bosnian letters) ++ Bosnian (US keyboard with Bosnian letters) + + + +@@ -2158,9 +2158,9 @@ + + + br +- +- <_shortDescription>pt +- <_description>Portuguese (Brazil) ++ ++ pt ++ Portuguese (Brazil) + + por + +@@ -2169,31 +2169,31 @@ + + + nodeadkeys +- <_description>Portuguese (Brazil, eliminate dead keys) ++ Portuguese (Brazil, eliminate dead keys) + + + + + dvorak +- <_description>Portuguese (Brazil, Dvorak) ++ Portuguese (Brazil, Dvorak) + + + + + nativo +- <_description>Portuguese (Brazil, Nativo) ++ Portuguese (Brazil, Nativo) + + + + + nativo-us +- <_description>Portuguese (Brazil, Nativo for US keyboards) ++ Portuguese (Brazil, Nativo for US keyboards) + + + + + nativo-epo +- <_description>Esperanto (Brazil, Nativo) ++ Esperanto (Brazil, Nativo) + + epo + +@@ -2204,9 +2204,9 @@ + + + bg +- +- <_shortDescription>bg +- <_description>Bulgarian ++ ++ bg ++ Bulgarian + + bul + +@@ -2215,13 +2215,13 @@ + + + phonetic +- <_description>Bulgarian (traditional phonetic) ++ Bulgarian (traditional phonetic) + + + + + bas_phonetic +- <_description>Bulgarian (new phonetic) ++ Bulgarian (new phonetic) + + + +@@ -2229,17 +2229,17 @@ + + + ma +- +- <_shortDescription>ar +- <_description>Arabic (Morocco) ++ ++ ar ++ Arabic (Morocco) + + + + + french +- +- <_shortDescription>fr +- <_description>French (Morocco) ++ ++ fr ++ French (Morocco) + + fra + +@@ -2248,9 +2248,9 @@ + + + tifinagh +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh) ++ ++ ber ++ Berber (Morocco, Tifinagh) + + ber + +@@ -2259,9 +2259,9 @@ + + + tifinagh-alt +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh alternative) ++ ++ ber ++ Berber (Morocco, Tifinagh alternative) + + ber + +@@ -2270,9 +2270,9 @@ + + + tifinagh-alt-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh alternative phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh alternative phonetic) + + ber + +@@ -2281,9 +2281,9 @@ + + + tifinagh-extended +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh extended) ++ ++ ber ++ Berber (Morocco, Tifinagh extended) + + ber + +@@ -2292,9 +2292,9 @@ + + + tifinagh-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh phonetic) + + ber + +@@ -2303,9 +2303,9 @@ + + + tifinagh-extended-phonetic +- +- <_shortDescription>ber +- <_description>Berber (Morocco, Tifinagh extended phonetic) ++ ++ ber ++ Berber (Morocco, Tifinagh extended phonetic) + + ber + +@@ -2316,23 +2316,23 @@ + + + cm +- +- <_shortDescription>cm +- <_description>English (Cameroon) ++ ++ cm ++ English (Cameroon) + eng + + + + + french +- <_description>French (Cameroon) ++ French (Cameroon) + fra + + + + + qwerty +- <_description>Cameroon Multilingual (qwerty) ++ Cameroon Multilingual (qwerty) + + eng + bas +@@ -2369,7 +2369,7 @@ + + + azerty +- <_description>Cameroon Multilingual (azerty) ++ Cameroon Multilingual (azerty) + + fra + bas +@@ -2406,7 +2406,7 @@ + + + dvorak +- <_description>Cameroon Multilingual (Dvorak) ++ Cameroon Multilingual (Dvorak) + + + +@@ -2414,9 +2414,9 @@ + + + mm +- +- <_shortDescription>my +- <_description>Burmese ++ ++ my ++ Burmese + + mya + +@@ -2426,9 +2426,9 @@ + + + ca +- +- <_shortDescription>fr +- <_description>French (Canada) ++ ++ fr ++ French (Canada) + + fra + +@@ -2437,43 +2437,43 @@ + + + fr-dvorak +- +- <_shortDescription>fr +- <_description>French (Canada, Dvorak) ++ ++ fr ++ French (Canada, Dvorak) + + + + + fr-legacy +- +- <_shortDescription>fr +- <_description>French (Canada, legacy) ++ ++ fr ++ French (Canada, legacy) + + + + + multix +- <_description>Canadian Multilingual ++ Canadian Multilingual + + + + + multi +- <_description>Canadian Multilingual (first part) ++ Canadian Multilingual (first part) + + + + + multi-2gr +- <_description>Canadian Multilingual (second part) ++ Canadian Multilingual (second part) + + + + + ike +- +- <_shortDescription>ike +- <_description>Inuktitut ++ ++ ike ++ Inuktitut + + iku + +@@ -2482,9 +2482,9 @@ + + + eng +- +- <_shortDescription>en +- <_description>English (Canada) ++ ++ en ++ English (Canada) + + eng + +@@ -2495,9 +2495,9 @@ + + + cd +- +- <_shortDescription>fr +- <_description>French (Democratic Republic of the Congo) ++ ++ fr ++ French (Democratic Republic of the Congo) + + fra + +@@ -2507,9 +2507,9 @@ + + + cn +- +- <_shortDescription>zh +- <_description>Chinese ++ ++ zh ++ Chinese + + chi + +@@ -2518,7 +2518,7 @@ + + + tib +- <_description>Tibetan ++ Tibetan + + tib + +@@ -2527,7 +2527,7 @@ + + + tib_asciinum +- <_description>Tibetan (with ASCII numerals) ++ Tibetan (with ASCII numerals) + + tib + +@@ -2536,8 +2536,8 @@ + + + ug +- <_shortDescription>ug +- <_description>Uyghur ++ ug ++ Uyghur + + ug + +@@ -2548,9 +2548,9 @@ + + + hr +- +- <_shortDescription>hr +- <_description>Croatian ++ ++ hr ++ Croatian + + hrv + +@@ -2559,25 +2559,25 @@ + + + alternatequotes +- <_description>Croatian (use guillemets for quotes) ++ Croatian (use guillemets for quotes) + + + + + unicode +- <_description>Croatian (use Croatian digraphs) ++ Croatian (use Croatian digraphs) + + + + + unicodeus +- <_description>Croatian (US keyboard with Croatian digraphs) ++ Croatian (US keyboard with Croatian digraphs) + + + + + us +- <_description>Croatian (US keyboard with Croatian letters) ++ Croatian (US keyboard with Croatian letters) + + + +@@ -2585,9 +2585,9 @@ + + + cz +- +- <_shortDescription>cs +- <_description>Czech ++ ++ cs ++ Czech + + cze + +@@ -2596,31 +2596,31 @@ + + + bksl +- <_description>Czech (with <\|> key) ++ Czech (with <\|> key) + + + + + qwerty +- <_description>Czech (qwerty) ++ Czech (qwerty) + + + + + qwerty_bksl +- <_description>Czech (qwerty, extended Backslash) ++ Czech (qwerty, extended Backslash) + + + + + ucw +- <_description>Czech (UCW layout, accented letters only) ++ Czech (UCW layout, accented letters only) + + + + + dvorak-ucw +- <_description>Czech (US Dvorak with CZ UCW support) ++ Czech (US Dvorak with CZ UCW support) + + + +@@ -2628,9 +2628,9 @@ + + + dk +- +- <_shortDescription>da +- <_description>Danish ++ ++ da ++ Danish + + dan + +@@ -2639,25 +2639,25 @@ + + + nodeadkeys +- <_description>Danish (eliminate dead keys) ++ Danish (eliminate dead keys) + + + + + mac +- <_description>Danish (Macintosh) ++ Danish (Macintosh) + + + + + mac_nodeadkeys +- <_description>Danish (Macintosh, eliminate dead keys) ++ Danish (Macintosh, eliminate dead keys) + + + + + dvorak +- <_description>Danish (Dvorak) ++ Danish (Dvorak) + + + +@@ -2665,9 +2665,9 @@ + + + nl +- +- <_shortDescription>nl +- <_description>Dutch ++ ++ nl ++ Dutch + + nld + +@@ -2676,19 +2676,19 @@ + + + sundeadkeys +- <_description>Dutch (Sun dead keys) ++ Dutch (Sun dead keys) + + + + + mac +- <_description>Dutch (Macintosh) ++ Dutch (Macintosh) + + + + + std +- <_description>Dutch (standard) ++ Dutch (standard) + + + +@@ -2696,9 +2696,9 @@ + + + bt +- +- <_shortDescription>dz +- <_description>Dzongkha ++ ++ dz ++ Dzongkha + + dzo + +@@ -2707,9 +2707,9 @@ + + + ee +- +- <_shortDescription>et +- <_description>Estonian ++ ++ et ++ Estonian + + est + +@@ -2718,19 +2718,19 @@ + + + nodeadkeys +- <_description>Estonian (eliminate dead keys) ++ Estonian (eliminate dead keys) + + + + + dvorak +- <_description>Estonian (Dvorak) ++ Estonian (Dvorak) + + + + + us +- <_description>Estonian (US keyboard with Estonian letters) ++ Estonian (US keyboard with Estonian letters) + + + +@@ -2738,9 +2738,9 @@ + + + ir +- +- <_shortDescription>fa +- <_description>Persian ++ ++ fa ++ Persian + + per + +@@ -2749,15 +2749,15 @@ + + + pes_keypad +- <_description>Persian (with Persian Keypad) ++ Persian (with Persian Keypad) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Latin Q) ++ ++ ku ++ Kurdish (Iran, Latin Q) + + kur + +@@ -2766,9 +2766,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, F) ++ ++ ku ++ Kurdish (Iran, F) + + kur + +@@ -2777,9 +2777,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Latin Alt-Q) ++ ++ ku ++ Kurdish (Iran, Latin Alt-Q) + + kur + +@@ -2788,9 +2788,9 @@ + + + ku_ara +- +- <_shortDescription>ku +- <_description>Kurdish (Iran, Arabic-Latin) ++ ++ ku ++ Kurdish (Iran, Arabic-Latin) + + kur + +@@ -2801,9 +2801,9 @@ + + + iq +- +- <_shortDescription>ar +- <_description>Iraqi ++ ++ ar ++ Iraqi + ara + kur + +@@ -2811,9 +2811,9 @@ + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Latin Q) ++ ++ ku ++ Kurdish (Iraq, Latin Q) + + kur + +@@ -2822,9 +2822,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, F) ++ ++ ku ++ Kurdish (Iraq, F) + + kur + +@@ -2833,9 +2833,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Latin Alt-Q) ++ ++ ku ++ Kurdish (Iraq, Latin Alt-Q) + + kur + +@@ -2844,9 +2844,9 @@ + + + ku_ara +- +- <_shortDescription>ku +- <_description>Kurdish (Iraq, Arabic-Latin) ++ ++ ku ++ Kurdish (Iraq, Arabic-Latin) + + kur + +@@ -2857,9 +2857,9 @@ + + + fo +- +- <_shortDescription>fo +- <_description>Faroese ++ ++ fo ++ Faroese + + fao + +@@ -2868,7 +2868,7 @@ + + + nodeadkeys +- <_description>Faroese (eliminate dead keys) ++ Faroese (eliminate dead keys) + + + +@@ -2876,9 +2876,9 @@ + + + fi +- +- <_shortDescription>fi +- <_description>Finnish ++ ++ fi ++ Finnish + + fin + +@@ -2887,26 +2887,26 @@ + + + classic +- <_description>Finnish (classic) ++ Finnish (classic) + + + + + nodeadkeys +- <_description>Finnish (classic, eliminate dead keys) ++ Finnish (classic, eliminate dead keys) + + + + + smi +- <_description>Northern Saami (Finland) ++ Northern Saami (Finland) + sme + + + + + mac +- <_description>Finnish (Macintosh) ++ Finnish (Macintosh) + + + +@@ -2914,9 +2914,9 @@ + + + fr +- +- <_shortDescription>fr +- <_description>French ++ ++ fr ++ French + + fra + +@@ -2925,91 +2925,91 @@ + + + nodeadkeys +- <_description>French (eliminate dead keys) ++ French (eliminate dead keys) + + + + + sundeadkeys +- <_description>French (Sun dead keys) ++ French (Sun dead keys) + + + + + oss +- <_description>French (alternative) ++ French (alternative) + + + + + oss_latin9 +- <_description>French (alternative, Latin-9 only) ++ French (alternative, Latin-9 only) + + + + + oss_nodeadkeys +- <_description>French (alternative, eliminate dead keys) ++ French (alternative, eliminate dead keys) + + + + + oss_sundeadkeys +- <_description>French (alternative, Sun dead keys) ++ French (alternative, Sun dead keys) + + + + + latin9 +- <_description>French (legacy, alternative) ++ French (legacy, alternative) + + + + + latin9_nodeadkeys +- <_description>French (legacy, alternative, eliminate dead keys) ++ French (legacy, alternative, eliminate dead keys) + + + + + latin9_sundeadkeys +- <_description>French (legacy, alternative, Sun dead keys) ++ French (legacy, alternative, Sun dead keys) + + + + + bepo +- <_description>French (Bepo, ergonomic, Dvorak way) ++ French (Bepo, ergonomic, Dvorak way) + + + + + bepo_latin9 +- <_description>French (Bepo, ergonomic, Dvorak way, Latin-9 only) ++ French (Bepo, ergonomic, Dvorak way, Latin-9 only) + + + + + dvorak +- <_description>French (Dvorak) ++ French (Dvorak) + + + + + mac +- <_description>French (Macintosh) ++ French (Macintosh) + + + + + bre +- <_description>French (Breton) ++ French (Breton) + + + + + oci +- <_description>Occitan ++ Occitan + + oci + +@@ -3018,7 +3018,7 @@ + + + geo +- <_description>Georgian (France, AZERTY Tskapo) ++ Georgian (France, AZERTY Tskapo) + + geo + +@@ -3029,9 +3029,9 @@ + + + gh +- +- <_shortDescription>en +- <_description>English (Ghana) ++ ++ en ++ English (Ghana) + + eng + +@@ -3040,15 +3040,15 @@ + + + generic +- <_description>English (Ghana, multilingual) ++ English (Ghana, multilingual) + + + + + akan +- +- <_shortDescription>ak +- <_description>Akan ++ ++ ak ++ Akan + + aka + +@@ -3057,9 +3057,9 @@ + + + ewe +- +- <_shortDescription>ee +- <_description>Ewe ++ ++ ee ++ Ewe + + ewe + +@@ -3068,9 +3068,9 @@ + + + fula +- +- <_shortDescription>ff +- <_description>Fula ++ ++ ff ++ Fula + + ful + +@@ -3079,9 +3079,9 @@ + + + ga +- +- <_shortDescription>gaa +- <_description>Ga ++ ++ gaa ++ Ga + + gaa + +@@ -3090,9 +3090,9 @@ + + + hausa +- +- <_shortDescription>ha +- <_description>Hausa ++ ++ ha ++ Hausa + + hau + +@@ -3101,9 +3101,9 @@ + + + avn +- +- <_shortDescription>avn +- <_description>Avatime ++ ++ avn ++ Avatime + + avn + +@@ -3112,7 +3112,7 @@ + + + gillbt +- <_description>English (Ghana, GILLBT) ++ English (Ghana, GILLBT) + + + +@@ -3120,9 +3120,9 @@ + + + gn +- +- <_shortDescription>fr +- <_description>French (Guinea) ++ ++ fr ++ French (Guinea) + + fra + +@@ -3132,9 +3132,9 @@ + + + ge +- +- <_shortDescription>ka +- <_description>Georgian ++ ++ ka ++ Georgian + + geo + +@@ -3143,21 +3143,21 @@ + + + ergonomic +- <_description>Georgian (ergonomic) ++ Georgian (ergonomic) + + + + + mess +- <_description>Georgian (MESS) ++ Georgian (MESS) + + + + + ru +- +- <_shortDescription>ru +- <_description>Russian (Georgia) ++ ++ ru ++ Russian (Georgia) + + rus + +@@ -3166,7 +3166,7 @@ + + + os +- <_description>Ossetian (Georgia) ++ Ossetian (Georgia) + + oss + +@@ -3177,9 +3177,9 @@ + + + de +- +- <_shortDescription>de +- <_description>German ++ ++ de ++ German + + ger + +@@ -3188,75 +3188,75 @@ + + + deadacute +- <_description>German (dead acute) ++ German (dead acute) + + + + + deadgraveacute +- <_description>German (dead grave acute) ++ German (dead grave acute) + + + + + nodeadkeys +- <_description>German (eliminate dead keys) ++ German (eliminate dead keys) + + + + + T3 +- <_description>German (T3) ++ German (T3) + + + + + ro +- <_description>Romanian (Germany) ++ Romanian (Germany) + rum + + + + + ro_nodeadkeys +- <_description>Romanian (Germany, eliminate dead keys) ++ Romanian (Germany, eliminate dead keys) + rum + + + + + dvorak +- <_description>German (Dvorak) ++ German (Dvorak) + + + + + sundeadkeys +- <_description>German (Sun dead keys) ++ German (Sun dead keys) + + + + + neo +- <_description>German (Neo 2) ++ German (Neo 2) + + + + + mac +- <_description>German (Macintosh) ++ German (Macintosh) + + + + + mac_nodeadkeys +- <_description>German (Macintosh, eliminate dead keys) ++ German (Macintosh, eliminate dead keys) + + + + + dsb +- <_description>Lower Sorbian ++ Lower Sorbian + + dsb + +@@ -3265,7 +3265,7 @@ + + + dsb_qwertz +- <_description>Lower Sorbian (qwertz) ++ Lower Sorbian (qwertz) + + dsb + +@@ -3274,15 +3274,15 @@ + + + qwerty +- <_description>German (qwerty) ++ German (qwerty) + + + + + ru +- +- <_shortDescription>ru +- <_description>Russian (Germany, phonetic) ++ ++ ru ++ Russian (Germany, phonetic) + + rus + +@@ -3291,7 +3291,7 @@ + + + legacy +- <_description>German (legacy) ++ German (legacy) + + + +@@ -3299,9 +3299,9 @@ + + + gr +- +- <_shortDescription>gr +- <_description>Greek ++ ++ gr ++ Greek + + gre + +@@ -3310,25 +3310,25 @@ + + + simple +- <_description>Greek (simple) ++ Greek (simple) + + + + + extended +- <_description>Greek (extended) ++ Greek (extended) + + + + + nodeadkeys +- <_description>Greek (eliminate dead keys) ++ Greek (eliminate dead keys) + + + + + polytonic +- <_description>Greek (polytonic) ++ Greek (polytonic) + + + +@@ -3336,9 +3336,9 @@ + + + hu +- +- <_shortDescription>hu +- <_description>Hungarian ++ ++ hu ++ Hungarian + + hun + +@@ -3347,115 +3347,115 @@ + + + standard +- <_description>Hungarian (standard) ++ Hungarian (standard) + + + + + nodeadkeys +- <_description>Hungarian (eliminate dead keys) ++ Hungarian (eliminate dead keys) + + + + + qwerty +- <_description>Hungarian (qwerty) ++ Hungarian (qwerty) + + + + + 101_qwertz_comma_dead +- <_description>Hungarian (101/qwertz/comma/dead keys) ++ Hungarian (101/qwertz/comma/dead keys) + + + + + 101_qwertz_comma_nodead +- <_description>Hungarian (101/qwertz/comma/eliminate dead keys) ++ Hungarian (101/qwertz/comma/eliminate dead keys) + + + + + 101_qwertz_dot_dead +- <_description>Hungarian (101/qwertz/dot/dead keys) ++ Hungarian (101/qwertz/dot/dead keys) + + + + + 101_qwertz_dot_nodead +- <_description>Hungarian (101/qwertz/dot/eliminate dead keys) ++ Hungarian (101/qwertz/dot/eliminate dead keys) + + + + + 101_qwerty_comma_dead +- <_description>Hungarian (101/qwerty/comma/dead keys) ++ Hungarian (101/qwerty/comma/dead keys) + + + + + 101_qwerty_comma_nodead +- <_description>Hungarian (101/qwerty/comma/eliminate dead keys) ++ Hungarian (101/qwerty/comma/eliminate dead keys) + + + + + 101_qwerty_dot_dead +- <_description>Hungarian (101/qwerty/dot/dead keys) ++ Hungarian (101/qwerty/dot/dead keys) + + + + + 101_qwerty_dot_nodead +- <_description>Hungarian (101/qwerty/dot/eliminate dead keys) ++ Hungarian (101/qwerty/dot/eliminate dead keys) + + + + + 102_qwertz_comma_dead +- <_description>Hungarian (102/qwertz/comma/dead keys) ++ Hungarian (102/qwertz/comma/dead keys) + + + + + 102_qwertz_comma_nodead +- <_description>Hungarian (102/qwertz/comma/eliminate dead keys) ++ Hungarian (102/qwertz/comma/eliminate dead keys) + + + + + 102_qwertz_dot_dead +- <_description>Hungarian (102/qwertz/dot/dead keys) ++ Hungarian (102/qwertz/dot/dead keys) + + + + + 102_qwertz_dot_nodead +- <_description>Hungarian (102/qwertz/dot/eliminate dead keys) ++ Hungarian (102/qwertz/dot/eliminate dead keys) + + + + + 102_qwerty_comma_dead +- <_description>Hungarian (102/qwerty/comma/dead keys) ++ Hungarian (102/qwerty/comma/dead keys) + + + + + 102_qwerty_comma_nodead +- <_description>Hungarian (102/qwerty/comma/eliminate dead keys) ++ Hungarian (102/qwerty/comma/eliminate dead keys) + + + + + 102_qwerty_dot_dead +- <_description>Hungarian (102/qwerty/dot/dead keys) ++ Hungarian (102/qwerty/dot/dead keys) + + + + + 102_qwerty_dot_nodead +- <_description>Hungarian (102/qwerty/dot/eliminate dead keys) ++ Hungarian (102/qwerty/dot/eliminate dead keys) + + + +@@ -3463,9 +3463,9 @@ + + + is +- +- <_shortDescription>is +- <_description>Icelandic ++ ++ is ++ Icelandic + + ice + +@@ -3474,25 +3474,25 @@ + + + Sundeadkeys +- <_description>Icelandic (Sun dead keys) ++ Icelandic (Sun dead keys) + + + + + nodeadkeys +- <_description>Icelandic (eliminate dead keys) ++ Icelandic (eliminate dead keys) + + + + + mac +- <_description>Icelandic (Macintosh) ++ Icelandic (Macintosh) + + + + + dvorak +- <_description>Icelandic (Dvorak) ++ Icelandic (Dvorak) + + + +@@ -3500,9 +3500,9 @@ + + + il +- +- <_shortDescription>he +- <_description>Hebrew ++ ++ he ++ Hebrew + + heb + +@@ -3511,19 +3511,19 @@ + + + lyx +- <_description>Hebrew (lyx) ++ Hebrew (lyx) + + + + + phonetic +- <_description>Hebrew (phonetic) ++ Hebrew (phonetic) + + + + + biblical +- <_description>Hebrew (Biblical, Tiro) ++ Hebrew (Biblical, Tiro) + + + +@@ -3531,9 +3531,9 @@ + + + it +- +- <_shortDescription>it +- <_description>Italian ++ ++ it ++ Italian + + ita + +@@ -3542,25 +3542,25 @@ + + + nodeadkeys +- <_description>Italian (eliminate dead keys) ++ Italian (eliminate dead keys) + + + + + mac +- <_description>Italian (Macintosh) ++ Italian (Macintosh) + + + + + us +- <_description>Italian (US keyboard with Italian letters) ++ Italian (US keyboard with Italian letters) + + + + + geo +- <_description>Georgian (Italy) ++ Georgian (Italy) + + geo + +@@ -3569,7 +3569,7 @@ + + + ibm +- <_description>Italian (IBM 142) ++ Italian (IBM 142) + + + +@@ -3577,9 +3577,9 @@ + + + jp +- +- <_shortDescription>ja +- <_description>Japanese ++ ++ ja ++ Japanese + + jpn + +@@ -3588,31 +3588,31 @@ + + + kana +- <_description>Japanese (Kana) ++ Japanese (Kana) + + + + + kana86 +- <_description>Japanese (Kana 86) ++ Japanese (Kana 86) + + + + + OADG109A +- <_description>Japanese (OADG 109A) ++ Japanese (OADG 109A) + + + + + mac +- <_description>Japanese (Macintosh) ++ Japanese (Macintosh) + + + + + dvorak +- <_description>Japanese (Dvorak) ++ Japanese (Dvorak) + + + +@@ -3620,9 +3620,9 @@ + + + kg +- +- <_shortDescription>ki +- <_description>Kyrgyz ++ ++ ki ++ Kyrgyz + + kir + +@@ -3631,7 +3631,7 @@ + + + phonetic +- <_description>Kyrgyz (phonetic) ++ Kyrgyz (phonetic) + + + +@@ -3639,9 +3639,9 @@ + + + kh +- +- <_shortDescription>km +- <_description>Khmer (Cambodia) ++ ++ km ++ Khmer (Cambodia) + + khm + +@@ -3651,9 +3651,9 @@ + + + kz +- +- <_shortDescription>kk +- <_description>Kazakh ++ ++ kk ++ Kazakh + + kaz + +@@ -3662,9 +3662,9 @@ + + + ruskaz +- +- <_shortDescription>ru +- <_description>Russian (Kazakhstan, with Kazakh) ++ ++ ru ++ Russian (Kazakhstan, with Kazakh) + kaz + rus + +@@ -3672,7 +3672,7 @@ + + + kazrus +- <_description>Kazakh (with Russian) ++ Kazakh (with Russian) + kaz + rus + +@@ -3682,9 +3682,9 @@ + + + la +- +- <_shortDescription>lo +- <_description>Lao ++ ++ lo ++ Lao + + lao + +@@ -3693,7 +3693,7 @@ + + + stea +- <_description>Lao (STEA proposed standard layout) ++ Lao (STEA proposed standard layout) + lao + + +@@ -3703,9 +3703,9 @@ + + + latam +- +- <_shortDescription>es +- <_description>Spanish (Latin American) ++ ++ es ++ Spanish (Latin American) + + AR + BO +@@ -3737,19 +3737,19 @@ + + + nodeadkeys +- <_description>Spanish (Latin American, eliminate dead keys) ++ Spanish (Latin American, eliminate dead keys) + + + + + deadtilde +- <_description>Spanish (Latin American, include dead tilde) ++ Spanish (Latin American, include dead tilde) + + + + + sundeadkeys +- <_description>Spanish (Latin American, Sun dead keys) ++ Spanish (Latin American, Sun dead keys) + + + +@@ -3757,9 +3757,9 @@ + + + lt +- +- <_shortDescription>lt +- <_description>Lithuanian ++ ++ lt ++ Lithuanian + + lit + +@@ -3768,31 +3768,31 @@ + + + std +- <_description>Lithuanian (standard) ++ Lithuanian (standard) + + + + + us +- <_description>Lithuanian (US keyboard with Lithuanian letters) ++ Lithuanian (US keyboard with Lithuanian letters) + + + + + ibm +- <_description>Lithuanian (IBM LST 1205-92) ++ Lithuanian (IBM LST 1205-92) + + + + + lekp +- <_description>Lithuanian (LEKP) ++ Lithuanian (LEKP) + + + + + lekpa +- <_description>Lithuanian (LEKPa) ++ Lithuanian (LEKPa) + + + +@@ -3800,9 +3800,9 @@ + + + lv +- +- <_shortDescription>lv +- <_description>Latvian ++ ++ lv ++ Latvian + + lav + +@@ -3811,37 +3811,37 @@ + + + apostrophe +- <_description>Latvian (apostrophe variant) ++ Latvian (apostrophe variant) + + + + + tilde +- <_description>Latvian (tilde variant) ++ Latvian (tilde variant) + + + + + fkey +- <_description>Latvian (F variant) ++ Latvian (F variant) + + + + + modern +- <_description>Latvian (modern) ++ Latvian (modern) + + + + + ergonomic +- <_description>Latvian (ergonomic, ŪGJRMV) ++ Latvian (ergonomic, ŪGJRMV) + + + + + adapted +- <_description>Latvian (adapted) ++ Latvian (adapted) + + + +@@ -3849,9 +3849,9 @@ + + + mao +- +- <_shortDescription>mi +- <_description>Maori ++ ++ mi ++ Maori + + mao + +@@ -3861,9 +3861,9 @@ + + + me +- +- <_shortDescription>sr +- <_description>Montenegrin ++ ++ sr ++ Montenegrin + + srp + +@@ -3872,43 +3872,43 @@ + + + cyrillic +- <_description>Montenegrin (Cyrillic) ++ Montenegrin (Cyrillic) + + + + + cyrillicyz +- <_description>Montenegrin (Cyrillic, Z and ZHE swapped) ++ Montenegrin (Cyrillic, Z and ZHE swapped) + + + + + latinunicode +- <_description>Montenegrin (Latin Unicode) ++ Montenegrin (Latin Unicode) + + + + + latinyz +- <_description>Montenegrin (Latin qwerty) ++ Montenegrin (Latin qwerty) + + + + + latinunicodeyz +- <_description>Montenegrin (Latin Unicode qwerty) ++ Montenegrin (Latin Unicode qwerty) + + + + + cyrillicalternatequotes +- <_description>Montenegrin (Cyrillic with guillemets) ++ Montenegrin (Cyrillic with guillemets) + + + + + latinalternatequotes +- <_description>Montenegrin (Latin with guillemets) ++ Montenegrin (Latin with guillemets) + + + +@@ -3916,9 +3916,9 @@ + + + mk +- +- <_shortDescription>mk +- <_description>Macedonian ++ ++ mk ++ Macedonian + + mkd + +@@ -3927,7 +3927,7 @@ + + + nodeadkeys +- <_description>Macedonian (eliminate dead keys) ++ Macedonian (eliminate dead keys) + + + +@@ -3935,9 +3935,9 @@ + + + mt +- +- <_shortDescription>mt +- <_description>Maltese ++ ++ mt ++ Maltese + + mlt + +@@ -3946,7 +3946,7 @@ + + + us +- <_description>Maltese (with US layout) ++ Maltese (with US layout) + + + +@@ -3954,9 +3954,9 @@ + + + mn +- +- <_shortDescription>mn +- <_description>Mongolian ++ ++ mn ++ Mongolian + + mon + +@@ -3966,9 +3966,9 @@ + + + no +- +- <_shortDescription>no +- <_description>Norwegian ++ ++ no ++ Norwegian + + nor + nob +@@ -3979,19 +3979,19 @@ + + + nodeadkeys +- <_description>Norwegian (eliminate dead keys) ++ Norwegian (eliminate dead keys) + + + + + dvorak +- <_description>Norwegian (Dvorak) ++ Norwegian (Dvorak) + + + + + smi +- <_description>Northern Saami (Norway) ++ Northern Saami (Norway) + + sme + +@@ -4000,7 +4000,7 @@ + + + smi_nodeadkeys +- <_description>Northern Saami (Norway, eliminate dead keys) ++ Northern Saami (Norway, eliminate dead keys) + + sme + +@@ -4009,19 +4009,19 @@ + + + mac +- <_description>Norwegian (Macintosh) ++ Norwegian (Macintosh) + + + + + mac_nodeadkeys +- <_description>Norwegian (Macintosh, eliminate dead keys) ++ Norwegian (Macintosh, eliminate dead keys) + + + + + colemak +- <_description>Norwegian (Colemak) ++ Norwegian (Colemak) + + + +@@ -4029,9 +4029,9 @@ + + + pl +- +- <_shortDescription>pl +- <_description>Polish ++ ++ pl ++ Polish + + pol + +@@ -4040,37 +4040,37 @@ + + + legacy +- <_description>Polish (legacy) ++ Polish (legacy) + + + + + qwertz +- <_description>Polish (qwertz) ++ Polish (qwertz) + + + + + dvorak +- <_description>Polish (Dvorak) ++ Polish (Dvorak) + + + + + dvorak_quotes +- <_description>Polish (Dvorak, Polish quotes on quotemark key) ++ Polish (Dvorak, Polish quotes on quotemark key) + + + + + dvorak_altquotes +- <_description>Polish (Dvorak, Polish quotes on key 1) ++ Polish (Dvorak, Polish quotes on key 1) + + + + + csb +- <_description>Kashubian ++ Kashubian + + csb + +@@ -4086,9 +4086,9 @@ + + + ru_phonetic_dvorak +- +- <_shortDescription>ru +- <_description>Russian (Poland, phonetic Dvorak) ++ ++ ru ++ Russian (Poland, phonetic Dvorak) + + rus + +@@ -4097,7 +4097,7 @@ + + + dvp +- <_description>Polish (programmer Dvorak) ++ Polish (programmer Dvorak) + + + +@@ -4105,9 +4105,9 @@ + + + pt +- +- <_shortDescription>pt +- <_description>Portuguese ++ ++ pt ++ Portuguese + + por + +@@ -4116,49 +4116,49 @@ + + + nodeadkeys +- <_description>Portuguese (eliminate dead keys) ++ Portuguese (eliminate dead keys) + + + + + sundeadkeys +- <_description>Portuguese (Sun dead keys) ++ Portuguese (Sun dead keys) + + + + + mac +- <_description>Portuguese (Macintosh) ++ Portuguese (Macintosh) + + + + + mac_nodeadkeys +- <_description>Portuguese (Macintosh, eliminate dead keys) ++ Portuguese (Macintosh, eliminate dead keys) + + + + + mac_sundeadkeys +- <_description>Portuguese (Macintosh, Sun dead keys) ++ Portuguese (Macintosh, Sun dead keys) + + + + + nativo +- <_description>Portuguese (Nativo) ++ Portuguese (Nativo) + + + + + nativo-us +- <_description>Portuguese (Nativo for US keyboards) ++ Portuguese (Nativo for US keyboards) + + + + + nativo-epo +- <_description>Esperanto (Portugal, Nativo) ++ Esperanto (Portugal, Nativo) + + epo + +@@ -4169,9 +4169,9 @@ + + + ro +- +- <_shortDescription>ro +- <_description>Romanian ++ ++ ro ++ Romanian + + rum + +@@ -4180,25 +4180,25 @@ + + + cedilla +- <_description>Romanian (cedilla) ++ Romanian (cedilla) + + + + + std +- <_description>Romanian (standard) ++ Romanian (standard) + + + + + std_cedilla +- <_description>Romanian (standard cedilla) ++ Romanian (standard cedilla) + + + + + winkeys +- <_description>Romanian (WinKeys) ++ Romanian (WinKeys) + + + +@@ -4206,9 +4206,9 @@ + + + ru +- +- <_shortDescription>ru +- <_description>Russian ++ ++ ru ++ Russian + + rus + +@@ -4217,37 +4217,37 @@ + + + phonetic +- <_description>Russian (phonetic) ++ Russian (phonetic) + + + + + phonetic_winkeys +- <_description>Russian (phonetic WinKeys) ++ Russian (phonetic WinKeys) + + + + + typewriter +- <_description>Russian (typewriter) ++ Russian (typewriter) + + + + + legacy +- <_description>Russian (legacy) ++ Russian (legacy) + + + + + typewriter-legacy +- <_description>Russian (typewriter, legacy) ++ Russian (typewriter, legacy) + + + + + tt +- <_description>Tatar ++ Tatar + + tat + +@@ -4256,7 +4256,7 @@ + + + os_legacy +- <_description>Ossetian (legacy) ++ Ossetian (legacy) + + oss + +@@ -4265,7 +4265,7 @@ + + + os_winkeys +- <_description>Ossetian (WinKeys) ++ Ossetian (WinKeys) + + oss + +@@ -4274,7 +4274,7 @@ + + + cv +- <_description>Chuvash ++ Chuvash + + chv + +@@ -4283,7 +4283,7 @@ + + + cv_latin +- <_description>Chuvash (Latin) ++ Chuvash (Latin) + + chv + +@@ -4292,7 +4292,7 @@ + + + udm +- <_description>Udmurt ++ Udmurt + + udm + +@@ -4301,7 +4301,7 @@ + + + kom +- <_description>Komi ++ Komi + + kom + +@@ -4310,7 +4310,7 @@ + + + sah +- <_description>Yakut ++ Yakut + + sah + +@@ -4319,7 +4319,7 @@ + + + xal +- <_description>Kalmyk ++ Kalmyk + + xal + +@@ -4328,19 +4328,19 @@ + + + dos +- <_description>Russian (DOS) ++ Russian (DOS) + + + + + mac +- <_description>Russian (Macintosh) ++ Russian (Macintosh) + + + + + srp +- <_description>Serbian (Russia) ++ Serbian (Russia) + rus + srp + +@@ -4348,7 +4348,7 @@ + + + bak +- <_description>Bashkirian ++ Bashkirian + + bak + +@@ -4357,7 +4357,7 @@ + + + chm +- <_description>Mari ++ Mari + + chm + +@@ -4368,9 +4368,9 @@ + + + rs +- +- <_shortDescription>sr +- <_description>Serbian ++ ++ sr ++ Serbian + + srp + +@@ -4379,49 +4379,49 @@ + + + yz +- <_description>Serbian (Cyrillic, Z and ZHE swapped) ++ Serbian (Cyrillic, Z and ZHE swapped) + + + + + latin +- <_description>Serbian (Latin) ++ Serbian (Latin) + + + + + latinunicode +- <_description>Serbian (Latin Unicode) ++ Serbian (Latin Unicode) + + + + + latinyz +- <_description>Serbian (Latin qwerty) ++ Serbian (Latin qwerty) + + + + + latinunicodeyz +- <_description>Serbian (Latin Unicode qwerty) ++ Serbian (Latin Unicode qwerty) + + + + + alternatequotes +- <_description>Serbian (Cyrillic with guillemets) ++ Serbian (Cyrillic with guillemets) + + + + + latinalternatequotes +- <_description>Serbian (Latin with guillemets) ++ Serbian (Latin with guillemets) + + + + + rue +- <_description>Pannonian Rusyn ++ Pannonian Rusyn + + rue + +@@ -4432,9 +4432,9 @@ + + + si +- +- <_shortDescription>sl +- <_description>Slovenian ++ ++ sl ++ Slovenian + + slv + +@@ -4443,13 +4443,13 @@ + + + alternatequotes +- <_description>Slovenian (use guillemets for quotes) ++ Slovenian (use guillemets for quotes) + + + + + us +- <_description>Slovenian (US keyboard with Slovenian letters) ++ Slovenian (US keyboard with Slovenian letters) + + + +@@ -4457,9 +4457,9 @@ + + + sk +- +- <_shortDescription>sk +- <_description>Slovak ++ ++ sk ++ Slovak + + slo + +@@ -4468,19 +4468,19 @@ + + + bksl +- <_description>Slovak (extended Backslash) ++ Slovak (extended Backslash) + + + + + qwerty +- <_description>Slovak (qwerty) ++ Slovak (qwerty) + + + + + qwerty_bksl +- <_description>Slovak (qwerty, extended Backslash) ++ Slovak (qwerty, extended Backslash) + + + +@@ -4488,9 +4488,9 @@ + + + es +- +- <_shortDescription>es +- <_description>Spanish ++ ++ es ++ Spanish + + spa + +@@ -4499,31 +4499,31 @@ + + + nodeadkeys +- <_description>Spanish (eliminate dead keys) ++ Spanish (eliminate dead keys) + + + + + deadtilde +- <_description>Spanish (include dead tilde) ++ Spanish (include dead tilde) + + + + + sundeadkeys +- <_description>Spanish (Sun dead keys) ++ Spanish (Sun dead keys) + + + + + dvorak +- <_description>Spanish (Dvorak) ++ Spanish (Dvorak) + + + + + ast +- <_description>Asturian (Spain, with bottom-dot H and bottom-dot L) ++ Asturian (Spain, with bottom-dot H and bottom-dot L) + + ast + +@@ -4532,7 +4532,7 @@ + + + cat +- <_description>Catalan (Spain, with middle-dot L) ++ Catalan (Spain, with middle-dot L) + + cat + +@@ -4541,7 +4541,7 @@ + + + mac +- <_description>Spanish (Macintosh) ++ Spanish (Macintosh) + + + +@@ -4549,9 +4549,9 @@ + + + se +- +- <_shortDescription>sv +- <_description>Swedish ++ ++ sv ++ Swedish + + swe + +@@ -4560,21 +4560,21 @@ + + + nodeadkeys +- <_description>Swedish (eliminate dead keys) ++ Swedish (eliminate dead keys) + + + + + dvorak +- <_description>Swedish (Dvorak) ++ Swedish (Dvorak) + + + + + rus +- +- <_shortDescription>ru +- <_description>Russian (Sweden, phonetic) ++ ++ ru ++ Russian (Sweden, phonetic) + + rus + +@@ -4583,9 +4583,9 @@ + + + rus_nodeadkeys +- +- <_shortDescription>ru +- <_description>Russian (Sweden, phonetic, eliminate dead keys) ++ ++ ru ++ Russian (Sweden, phonetic, eliminate dead keys) + + rus + +@@ -4594,7 +4594,7 @@ + + + smi +- <_description>Northern Saami (Sweden) ++ Northern Saami (Sweden) + + sme + +@@ -4603,19 +4603,19 @@ + + + mac +- <_description>Swedish (Macintosh) ++ Swedish (Macintosh) + + + + + svdvorak +- <_description>Swedish (Svdvorak) ++ Swedish (Svdvorak) + + + + + swl +- <_description>Swedish Sign Language ++ Swedish Sign Language + swl + + +@@ -4624,9 +4624,9 @@ + + + ch +- +- <_shortDescription>de +- <_description>German (Switzerland) ++ ++ de ++ German (Switzerland) + ger + gsw + +@@ -4634,31 +4634,31 @@ + + + legacy +- <_description>German (Switzerland, legacy) ++ German (Switzerland, legacy) + + + + + de_nodeadkeys +- +- <_shortDescription>de +- <_description>German (Switzerland, eliminate dead keys) ++ ++ de ++ German (Switzerland, eliminate dead keys) + + + + + de_sundeadkeys +- +- <_shortDescription>de +- <_description>German (Switzerland, Sun dead keys) ++ ++ de ++ German (Switzerland, Sun dead keys) + + + + + fr +- +- <_shortDescription>fr +- <_description>French (Switzerland) ++ ++ fr ++ French (Switzerland) + + fra + +@@ -4667,9 +4667,9 @@ + + + fr_nodeadkeys +- +- <_shortDescription>fr +- <_description>French (Switzerland, eliminate dead keys) ++ ++ fr ++ French (Switzerland, eliminate dead keys) + + fra + +@@ -4678,9 +4678,9 @@ + + + fr_sundeadkeys +- +- <_shortDescription>fr +- <_description>French (Switzerland, Sun dead keys) ++ ++ fr ++ French (Switzerland, Sun dead keys) + + fra + +@@ -4689,9 +4689,9 @@ + + + fr_mac +- +- <_shortDescription>fr +- <_description>French (Switzerland, Macintosh) ++ ++ fr ++ French (Switzerland, Macintosh) + + fra + +@@ -4700,9 +4700,9 @@ + + + de_mac +- +- <_shortDescription>de +- <_description>German (Switzerland, Macintosh) ++ ++ de ++ German (Switzerland, Macintosh) + + + +@@ -4710,9 +4710,9 @@ + + + sy +- +- <_shortDescription>ar +- <_description>Arabic (Syria) ++ ++ ar ++ Arabic (Syria) + + syr + +@@ -4721,25 +4721,25 @@ + + + syc +- +- <_shortDescription>syc +- <_description>Syriac ++ ++ syc ++ Syriac + + + + + syc_phonetic +- +- <_shortDescription>syc +- <_description>Syriac (phonetic) ++ ++ syc ++ Syriac (phonetic) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, Latin Q) ++ ++ ku ++ Kurdish (Syria, Latin Q) + + kur + +@@ -4748,9 +4748,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, F) ++ ++ ku ++ Kurdish (Syria, F) + + kur + +@@ -4759,9 +4759,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Syria, Latin Alt-Q) ++ ++ ku ++ Kurdish (Syria, Latin Alt-Q) + + kur + +@@ -4772,9 +4772,9 @@ + + + tj +- +- <_shortDescription>tg +- <_description>Tajik ++ ++ tg ++ Tajik + + tgk + +@@ -4783,7 +4783,7 @@ + + + legacy +- <_description>Tajik (legacy) ++ Tajik (legacy) + + + +@@ -4791,9 +4791,9 @@ + + + lk +- +- <_shortDescription>si +- <_description>Sinhala (phonetic) ++ ++ si ++ Sinhala (phonetic) + + sin + +@@ -4802,9 +4802,9 @@ + + + tam_unicode +- +- <_shortDescription>ta +- <_description>Tamil (Sri Lanka, Unicode) ++ ++ ta ++ Tamil (Sri Lanka, Unicode) + + tam + +@@ -4813,7 +4813,7 @@ + + + tam_TAB +- <_description>Tamil (Sri Lanka, TAB Typewriter) ++ Tamil (Sri Lanka, TAB Typewriter) + + tam + +@@ -4824,9 +4824,9 @@ + + + th +- +- <_shortDescription>th +- <_description>Thai ++ ++ th ++ Thai + + tha + +@@ -4835,13 +4835,13 @@ + + + tis +- <_description>Thai (TIS-820.2538) ++ Thai (TIS-820.2538) + + + + + pat +- <_description>Thai (Pattachote) ++ Thai (Pattachote) + + + +@@ -4849,9 +4849,9 @@ + + + tr +- +- <_shortDescription>tr +- <_description>Turkish ++ ++ tr ++ Turkish + + tur + +@@ -4860,27 +4860,27 @@ + + + f +- <_description>Turkish (F) ++ Turkish (F) + + + + + alt +- <_description>Turkish (Alt-Q) ++ Turkish (Alt-Q) + + + + + sundeadkeys +- <_description>Turkish (Sun dead keys) ++ Turkish (Sun dead keys) + + + + + ku +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, Latin Q) ++ ++ ku ++ Kurdish (Turkey, Latin Q) + + kur + +@@ -4889,9 +4889,9 @@ + + + ku_f +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, F) ++ ++ ku ++ Kurdish (Turkey, F) + + kur + +@@ -4900,9 +4900,9 @@ + + + ku_alt +- +- <_shortDescription>ku +- <_description>Kurdish (Turkey, Latin Alt-Q) ++ ++ ku ++ Kurdish (Turkey, Latin Alt-Q) + + kur + +@@ -4911,15 +4911,15 @@ + + + intl +- <_description>Turkish (international with dead keys) ++ Turkish (international with dead keys) + + + + + crh +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish Q) ++ ++ crh ++ Crimean Tatar (Turkish Q) + + crh + +@@ -4928,9 +4928,9 @@ + + + crh_f +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish F) ++ ++ crh ++ Crimean Tatar (Turkish F) + + crh + +@@ -4939,9 +4939,9 @@ + + + crh_alt +- +- <_shortDescription>crh +- <_description>Crimean Tatar (Turkish Alt-Q) ++ ++ crh ++ Crimean Tatar (Turkish Alt-Q) + + crh + +@@ -4952,9 +4952,9 @@ + + + tw +- +- <_shortDescription>zh +- <_description>Taiwanese ++ ++ zh ++ Taiwanese + + fox + +@@ -4963,7 +4963,7 @@ + + + indigenous +- <_description>Taiwanese (indigenous) ++ Taiwanese (indigenous) + + ami + tay +@@ -4987,9 +4987,9 @@ + + + saisiyat +- +- <_shortDescription>xsy +- <_description>Saisiyat (Taiwan) ++ ++ xsy ++ Saisiyat (Taiwan) + + xsy + +@@ -5000,9 +5000,9 @@ + + + ua +- +- <_shortDescription>uk +- <_description>Ukrainian ++ ++ uk ++ Ukrainian + + ukr + +@@ -5011,43 +5011,43 @@ + + + phonetic +- <_description>Ukrainian (phonetic) ++ Ukrainian (phonetic) + + + + + typewriter +- <_description>Ukrainian (typewriter) ++ Ukrainian (typewriter) + + + + + winkeys +- <_description>Ukrainian (WinKeys) ++ Ukrainian (WinKeys) + + + + + legacy +- <_description>Ukrainian (legacy) ++ Ukrainian (legacy) + + + + + rstu +- <_description>Ukrainian (standard RSTU) ++ Ukrainian (standard RSTU) + + + + + rstu_ru +- <_description>Russian (Ukraine, standard RSTU) ++ Russian (Ukraine, standard RSTU) + + + + + homophonic +- <_description>Ukrainian (homophonic) ++ Ukrainian (homophonic) + + + +@@ -5055,9 +5055,9 @@ + + + gb +- +- <_shortDescription>en +- <_description>English (UK) ++ ++ en ++ English (UK) + + eng + +@@ -5066,43 +5066,43 @@ + + + extd +- <_description>English (UK, extended WinKeys) ++ English (UK, extended WinKeys) + + + + + intl +- <_description>English (UK, international with dead keys) ++ English (UK, international with dead keys) + + + + + dvorak +- <_description>English (UK, Dvorak) ++ English (UK, Dvorak) + + + + + dvorakukp +- <_description>English (UK, Dvorak with UK punctuation) ++ English (UK, Dvorak with UK punctuation) + + + + + mac +- <_description>English (UK, Macintosh) ++ English (UK, Macintosh) + + + + + mac_intl +- <_description>English (UK, Macintosh international) ++ English (UK, Macintosh international) + + + + + colemak +- <_description>English (UK, Colemak) ++ English (UK, Colemak) + + + +@@ -5110,9 +5110,9 @@ + + + uz +- +- <_shortDescription>uz +- <_description>Uzbek ++ ++ uz ++ Uzbek + + uzb + +@@ -5121,7 +5121,7 @@ + + + latin +- <_description>Uzbek (Latin) ++ Uzbek (Latin) + + + +@@ -5129,9 +5129,9 @@ + + + vn +- +- <_shortDescription>vi +- <_description>Vietnamese ++ ++ vi ++ Vietnamese + + vie + +@@ -5141,9 +5141,9 @@ + + + kr +- +- <_shortDescription>ko +- <_description>Korean ++ ++ ko ++ Korean + + kor + +@@ -5152,7 +5152,7 @@ + + + kr104 +- <_description>Korean (101/104 key compatible) ++ Korean (101/104 key compatible) + + + +@@ -5160,9 +5160,9 @@ + + + nec_vndr/jp +- +- <_shortDescription>ja +- <_description>Japanese (PC-98xx Series) ++ ++ ja ++ Japanese (PC-98xx Series) + + JP + +@@ -5175,9 +5175,9 @@ + + + ie +- +- <_shortDescription>ie +- <_description>Irish ++ ++ ie ++ Irish + + eng + +@@ -5186,7 +5186,7 @@ + + + CloGaelach +- <_description>CloGaelach ++ CloGaelach + + gle + +@@ -5195,13 +5195,13 @@ + + + UnicodeExpert +- <_description>Irish (UnicodeExpert) ++ Irish (UnicodeExpert) + + + + + ogam +- <_description>Ogham ++ Ogham + + sga + +@@ -5210,7 +5210,7 @@ + + + ogam_is434 +- <_description>Ogham (IS434) ++ Ogham (IS434) + + sga + +@@ -5221,9 +5221,9 @@ + + + pk +- +- <_shortDescription>ur +- <_description>Urdu (Pakistan) ++ ++ ur ++ Urdu (Pakistan) + + urd + +@@ -5232,20 +5232,20 @@ + + + urd-crulp +- <_description>Urdu (Pakistan, CRULP) ++ Urdu (Pakistan, CRULP) + + + + + urd-nla +- <_description>Urdu (Pakistan, NLA) ++ Urdu (Pakistan, NLA) + + + + + ara +- <_shortDescription>ar +- <_description>Arabic (Pakistan) ++ ar ++ Arabic (Pakistan) + + ara + +@@ -5254,9 +5254,9 @@ + + + snd +- +- <_shortDescription>sd +- <_description>Sindhi ++ ++ sd ++ Sindhi + + snd + +@@ -5267,9 +5267,9 @@ + + + mv +- +- <_shortDescription>dv +- <_description>Dhivehi ++ ++ dv ++ Dhivehi + + div + +@@ -5279,9 +5279,9 @@ + + + za +- +- <_shortDescription>en +- <_description>English (South Africa) ++ ++ en ++ English (South Africa) + + eng + +@@ -5290,9 +5290,9 @@ + + + epo +- +- <_shortDescription>eo +- <_description>Esperanto ++ ++ eo ++ Esperanto + + epo + +@@ -5301,7 +5301,7 @@ + + + legacy +- <_description>Esperanto (displaced semicolon and quote, obsolete) ++ Esperanto (displaced semicolon and quote, obsolete) + + + +@@ -5309,9 +5309,9 @@ + + + np +- +- <_shortDescription>ne +- <_description>Nepali ++ ++ ne ++ Nepali + + nep + +@@ -5320,9 +5320,9 @@ + + + ng +- +- <_shortDescription>en +- <_description>English (Nigeria) ++ ++ en ++ English (Nigeria) + + eng + +@@ -5331,9 +5331,9 @@ + + + igbo +- +- <_shortDescription>ig +- <_description>Igbo ++ ++ ig ++ Igbo + + ibo + +@@ -5342,9 +5342,9 @@ + + + yoruba +- +- <_shortDescription>yo +- <_description>Yoruba ++ ++ yo ++ Yoruba + + yor + +@@ -5353,9 +5353,9 @@ + + + hausa +- +- <_shortDescription>ha +- <_description>Hausa ++ ++ ha ++ Hausa + + hau + +@@ -5366,9 +5366,9 @@ + + + et +- +- <_shortDescription>am +- <_description>Amharic ++ ++ am ++ Amharic + + amh + +@@ -5378,9 +5378,9 @@ + + + sn +- +- <_shortDescription>wo +- <_description>Wolof ++ ++ wo ++ Wolof + + wol + +@@ -5390,21 +5390,21 @@ + + + brai +- +- <_shortDescription>brl +- <_description>Braille ++ ++ brl ++ Braille + + + + + left_hand +- <_description>Braille (left hand) ++ Braille (left hand) + + + + + right_hand +- <_description>Braille (right hand) ++ Braille (right hand) + + + +@@ -5412,9 +5412,9 @@ + + + tm +- +- <_shortDescription>tk +- <_description>Turkmen ++ ++ tk ++ Turkmen + + tuk + +@@ -5423,7 +5423,7 @@ + + + alt +- <_description>Turkmen (Alt-Q) ++ Turkmen (Alt-Q) + + + +@@ -5431,9 +5431,9 @@ + + + ml +- +- <_shortDescription>bm +- <_description>Bambara ++ ++ bm ++ Bambara + + bam + +@@ -5442,9 +5442,9 @@ + + + fr-oss +- +- <_shortDescription>fr +- <_description>French (Mali, alternative) ++ ++ fr ++ French (Mali, alternative) + + fra + +@@ -5453,9 +5453,9 @@ + + + us-mac +- +- <_shortDescription>en +- <_description>English (Mali, US Macintosh) ++ ++ en ++ English (Mali, US Macintosh) + + eng + +@@ -5464,9 +5464,9 @@ + + + us-intl +- +- <_shortDescription>en +- <_description>English (Mali, US international) ++ ++ en ++ English (Mali, US international) + + eng + +@@ -5477,9 +5477,9 @@ + + + tz +- +- <_shortDescription>sw +- <_description>Swahili (Tanzania) ++ ++ sw ++ Swahili (Tanzania) + + swa + +@@ -5488,9 +5488,9 @@ + + + ke +- +- <_shortDescription>sw +- <_description>Swahili (Kenya) ++ ++ sw ++ Swahili (Kenya) + + swa + +@@ -5499,9 +5499,9 @@ + + + kik +- +- <_shortDescription>ki +- <_description>Kikuyu ++ ++ ki ++ Kikuyu + + kik + +@@ -5512,9 +5512,9 @@ + + + bw +- +- <_shortDescription>tn +- <_description>Tswana ++ ++ tn ++ Tswana + + tsn + +@@ -5523,9 +5523,9 @@ + + + ph +- +- <_shortDescription>ph +- <_description>Filipino ++ ++ ph ++ Filipino + eng + bik + ceb +@@ -5542,7 +5542,7 @@ + + + qwerty-bay +- <_description>Filipino (QWERTY Baybayin) ++ Filipino (QWERTY Baybayin) + bik + ceb + fil +@@ -5558,13 +5558,13 @@ + + + capewell-dvorak +- <_description>Filipino (Capewell-Dvorak Latin) ++ Filipino (Capewell-Dvorak Latin) + + + + + capewell-dvorak-bay +- <_description>Filipino (Capewell-Dvorak Baybayin) ++ Filipino (Capewell-Dvorak Baybayin) + bik + ceb + fil +@@ -5580,13 +5580,13 @@ + + + capewell-qwerf2k6 +- <_description>Filipino (Capewell-QWERF 2006 Latin) ++ Filipino (Capewell-QWERF 2006 Latin) + + + + + capewell-qwerf2k6-bay +- <_description>Filipino (Capewell-QWERF 2006 Baybayin) ++ Filipino (Capewell-QWERF 2006 Baybayin) + bik + ceb + fil +@@ -5602,13 +5602,13 @@ + + + colemak +- <_description>Filipino (Colemak Latin) ++ Filipino (Colemak Latin) + + + + + colemak-bay +- <_description>Filipino (Colemak Baybayin) ++ Filipino (Colemak Baybayin) + bik + ceb + fil +@@ -5624,13 +5624,13 @@ + + + dvorak +- <_description>Filipino (Dvorak Latin) ++ Filipino (Dvorak Latin) + + + + + dvorak-bay +- <_description>Filipino (Dvorak Baybayin) ++ Filipino (Dvorak Baybayin) + bik + ceb + fil +@@ -5648,16 +5648,16 @@ + + + md +- <_shortDescription>md +- <_description>Moldavian ++ md ++ Moldavian + rum + + + + + gag +- <_shortDescription>gag +- <_description>Moldavian (Gagauz) ++ gag ++ Moldavian (Gagauz) + gag + + +@@ -5666,1183 +5666,1142 @@ + + + +- ++ + + grp +- <_description>Switching to another layout ++ Switching to another layout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- ++ + + lv3 +- <_description>Key to choose 3rd level ++ Key to choose 3rd level + + + + + + + + + + + + + + + + + + + + +- ++ + + ctrl +- <_description>Ctrl key position ++ Ctrl key position + + + + + + + + + + + + + + +- ++ + + grp_led +- <_description>Use keyboard LED to show alternative layout ++ Use keyboard LED to show alternative layout + + + + + + +- ++ + + keypad +- <_description>Layout of numeric keypad ++ Layout of numeric keypad + + + + + + + + + + +- ++ + +- ++ + + kpdl +- <_description>Numeric keypad delete key behaviour ++ Numeric keypad delete key behaviour + + + + + + + + + + + +- ++ + + caps +- <_description>Caps Lock key behavior ++ Caps Lock key behavior + + + + + + + + + + + + + + + + + +- ++ + + altwin +- <_description>Alt/Win key behavior ++ Alt/Win key behavior + + + + + + + + + + + + + +- ++ + + Compose key +- <_description>Position of Compose key ++ Position of Compose key + + + + + + + + + + + + + + + + + + + + + + + compat +- <_description>Miscellaneous compatibility options ++ Miscellaneous compatibility options + + + + + + + + + + + + + + + + + +- ++ + + currencysign +- <_description>Adding currency signs to certain keys ++ Adding currency signs to certain keys + + + + + + + + + + lv5 +- <_description>Key to choose 5th level ++ Key to choose 5th level + + + + + +- ++ + + +- ++ + + nbsp +- <_description>Using space key to input non-breakable space character ++ Using space key to input non-breakable space character + + + + + + + + + + + + + + + + + + + + + japan +- <_description>Japanese keyboard options ++ Japanese keyboard options + + + + + + + + esperanto +- <_description>Adding Esperanto supersigned letters ++ Adding Esperanto supersigned letters + + + + + + + + solaris +- <_description>Maintain key compatibility with old Solaris keycodes ++ Maintain key compatibility with old Solaris keycodes + + + + + + terminate +- <_description>Key sequence to kill the X server ++ Key sequence to kill the X server + + + + +- ++ +\ No newline at end of file -- cgit v1.2.3 From 7d2b38ba6e51a5da5250ef394b9fe69a72783459 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 17:47:21 +0100 Subject: fix qemu-ppc64 building on Darwin, use --with-cpu=ultrasparc for qemu-sparc64, still another issue exist. --- Makefile | 2 +- mk/build.mk | 2 +- target/config/Config.in | 2 +- .../patches/3.13.5/ppc64-missing_arch_random.patch | 11 ++++++++ toolchain/gcc/Makefile | 4 +++ toolchain/glibc/patches/glibc-cross.patch | 33 +++++++++++----------- toolchain/glibc/patches/sparc64.patch | 21 -------------- 7 files changed, 34 insertions(+), 41 deletions(-) create mode 100644 target/linux/patches/3.13.5/ppc64-missing_arch_random.patch delete mode 100644 toolchain/glibc/patches/sparc64.patch diff --git a/Makefile b/Makefile index b703f6656..9d3d982d7 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. _UNLIMIT= __limit=$$(ulimit -dH 2>/dev/null); \ - test -n "$$__limit" && ulimit -Sd $$__limit; + test -n "$$__limit" && ulimit -Sd $$__limit; ulimit -n 1024; all: checkreloc .prereq_done @${_UNLIMIT} ${GMAKE_INV} all diff --git a/mk/build.mk b/mk/build.mk index 8c1e73743..ce0f88ae0 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -561,7 +561,7 @@ test-framework: for libc in uclibc glibc musl;do \ mkdir -p $(TOPDIR)/firmware/$(SYSTEM)_$(ARCH)_$$libc; \ ( \ - for arch in arm mips mipsel i686 x86_64;do \ + for arch in arm mips mipsel mips64 mips64el ppc ppc64 sparc sparc64 i686 x86_64;do \ tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#"); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ $(GMAKE) prereq && \ diff --git a/target/config/Config.in b/target/config/Config.in index c8e566cc8..ab6bf353b 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -579,7 +579,7 @@ config ADK_TARGET_CFLAGS default "-march=atom" if ADK_CPU_ATOM default "-march=amdfam10" if ADK_CPU_AMDFAM10 default "-mcpu=v8" if ADK_CPU_SPARC_V8 - default "-m64 -mcpu=v9" if ADK_CPU_SPARC_V9 + default "-m64 -mcpu=ultrasparc" if ADK_CPU_SPARC_V9 default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F default "-march=mips32" if ADK_CPU_MIPS32 default "-march=mips64" if ADK_CPU_MIPS64 diff --git a/target/linux/patches/3.13.5/ppc64-missing_arch_random.patch b/target/linux/patches/3.13.5/ppc64-missing_arch_random.patch new file mode 100644 index 000000000..b341a7be5 --- /dev/null +++ b/target/linux/patches/3.13.5/ppc64-missing_arch_random.patch @@ -0,0 +1,11 @@ +diff -Nur linux-3.13.5.orig/arch/powerpc/platforms/pseries/Kconfig linux-3.13.5/arch/powerpc/platforms/pseries/Kconfig +--- linux-3.13.5.orig/arch/powerpc/platforms/pseries/Kconfig 2014-02-22 22:35:30.000000000 +0100 ++++ linux-3.13.5/arch/powerpc/platforms/pseries/Kconfig 2014-03-04 13:55:06.000000000 +0100 +@@ -20,6 +20,7 @@ + select PPC_DOORBELL + select HAVE_CONTEXT_TRACKING + select HOTPLUG_CPU if SMP ++ select ARCH_RANDOM + default y + + config PPC_SPLPAR diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index bbbd3d09c..138e3a0d0 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -100,6 +100,10 @@ ifeq ($(ADK_CPU_CORTEX_A9),y) GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon endif +ifeq ($(ADK_CPU_SPARC_V9),y) +GCC_CONFOPTS+= --with-cpu=ultrasparc +endif + ifneq ($(ADK_TARGET_MIPS_ABI),) GCC_CONFOPTS+= --with-abi=${ADK_TARGET_MIPS_ABI} endif diff --git a/toolchain/glibc/patches/glibc-cross.patch b/toolchain/glibc/patches/glibc-cross.patch index 4084fd20d..a1903179d 100644 --- a/toolchain/glibc/patches/glibc-cross.patch +++ b/toolchain/glibc/patches/glibc-cross.patch @@ -1,8 +1,8 @@ -diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h ---- glibc-2.18.orig/sunrpc/rpc/types.h 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/sunrpc/rpc/types.h 2013-09-13 08:25:18.000000000 +0200 -@@ -69,19 +69,25 @@ - #include +diff -Nur glibc-2.19.orig/sunrpc/rpc/types.h glibc-2.19/sunrpc/rpc/types.h +--- glibc-2.19.orig/sunrpc/rpc/types.h 2014-02-07 10:04:38.000000000 +0100 ++++ glibc-2.19/sunrpc/rpc/types.h 2014-03-03 13:42:42.000000000 +0100 +@@ -74,19 +74,24 @@ + # define __daddr_t_defined #endif -#ifndef __u_char_defined @@ -18,15 +18,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h +typedef unsigned short u_short; +typedef unsigned int u_int; +typedef unsigned long u_long; -+#if __WORDSIZE == 64 ++#if __WORDSIZE == 64 ++#ifndef __APPLE__ +typedef long int quad_t; +typedef unsigned long int u_quad_t; ++#endif +#elif defined __GLIBC_HAVE_LONG_LONG +typedef long long int quad_t; +typedef unsigned long long int u_quad_t; -+#endif -+#if defined(_CROSS_RPCGEN_) -+typedef u_quad_t fsid_t; #endif -#ifndef __daddr_t_defined -typedef __daddr_t daddr_t; @@ -39,14 +38,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h # define __daddr_t_defined #endif -diff -Nur glibc-2.18.orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c ---- glibc-2.18.orig/sunrpc/rpc_main.c 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/sunrpc/rpc_main.c 2013-09-13 08:26:07.000000000 +0200 +diff -Nur glibc-2.19.orig/sunrpc/rpc_main.c glibc-2.19/sunrpc/rpc_main.c +--- glibc-2.19.orig/sunrpc/rpc_main.c 2014-02-07 10:04:38.000000000 +0100 ++++ glibc-2.19/sunrpc/rpc_main.c 2014-03-04 07:12:00.000000000 +0100 @@ -38,7 +38,11 @@ #include #include #include -+#ifdef _CROSS_RPCGEN_ ++#ifdef __APPLE__ +#define gettext(X) (X) +#else #include @@ -70,14 +69,14 @@ diff -Nur glibc-2.18.orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c } else -diff -Nur glibc-2.18.orig/sunrpc/rpc_scan.c glibc-2.18/sunrpc/rpc_scan.c ---- glibc-2.18.orig/sunrpc/rpc_scan.c 2013-08-11 00:52:55.000000000 +0200 -+++ glibc-2.18/sunrpc/rpc_scan.c 2013-09-13 08:25:18.000000000 +0200 +diff -Nur glibc-2.19.orig/sunrpc/rpc_scan.c glibc-2.19/sunrpc/rpc_scan.c +--- glibc-2.19.orig/sunrpc/rpc_scan.c 2014-02-07 10:04:38.000000000 +0100 ++++ glibc-2.19/sunrpc/rpc_scan.c 2014-03-04 07:11:29.000000000 +0100 @@ -37,7 +37,11 @@ #include #include #include -+#ifdef _CROSS_RPCGEN_ ++#ifdef __APPLE__ +#define gettext(X) (X) +#else #include diff --git a/toolchain/glibc/patches/sparc64.patch b/toolchain/glibc/patches/sparc64.patch deleted file mode 100644 index c8ff7ce9f..000000000 --- a/toolchain/glibc/patches/sparc64.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur glibc-2.12.1.orig/sysdeps/sparc/sparc64/Makefile glibc-2.12.1/sysdeps/sparc/sparc64/Makefile ---- glibc-2.12.1.orig/sysdeps/sparc/sparc64/Makefile 2010-07-27 13:34:39.000000000 +0200 -+++ glibc-2.12.1/sysdeps/sparc/sparc64/Makefile 2011-01-01 23:58:16.370676501 +0100 -@@ -1,3 +1,5 @@ -+sysdep-CFLAGS += -mcpu=v9 -Wa,-Av9a -+ - ifeq ($(subdir),csu) - sysdep_routines += hp-timing - elide-routines.os += hp-timing -@@ -10,3 +12,11 @@ - ifeq ($(subdir),string) - sysdep_routines += align-cpy - endif -+ -+ASFLAGS-.o += -Wa,-Av9a -+ASFLAGS-.os += -Wa,-Av9a -+ASFLAGS-.op += -Wa,-Av9a -+ASFLAGS-.og += -Wa,-Av9a -+ASFLAGS-.ob += -Wa,-Av9a -+ASFLAGS-.oS += -Wa,-Av9a -+ -- cgit v1.2.3 From 8742eed1875b53d62216f03f132cea48fa61dec5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 18:16:33 +0100 Subject: remove visible parts of guiconfig, I don't like it, don't wanna support it --- Makefile | 4 ---- mk/build.mk | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/Makefile b/Makefile index 9d3d982d7..bf2b3be01 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,6 @@ help: @echo ' config - Update current config utilising a line-oriented program' @echo ' menuconfig - Update current config utilising a menu based program' @echo ' (default when .config does not exist)' - @echo ' guiconfig - Update current config utilising a gui based program' @echo ' oldconfig - Update current config utilising a provided .configs base' @echo ' allmodconfig - New config selecting all packages as modules when possible' @echo ' allconfig - New config selecting all packages when possible' @@ -129,9 +128,6 @@ image_clean imageclean cleanimage: .prereq_done menuconfig: .prereq_done @${GMAKE_INV} menuconfig -guiconfig: .prereq_done - @${GMAKE_INV} guiconfig - defconfig: .prereq_done @${GMAKE_INV} defconfig diff --git a/mk/build.mk b/mk/build.mk index ce0f88ae0..8efd7becc 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -80,7 +80,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_KERNEL_DEBUG_WITH_KGDB=n noconfig_targets:= menuconfig \ - guiconfig \ _config \ _mconfig \ distclean \ @@ -506,15 +505,6 @@ menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} -guiconfig: $(CONFIG)/gconf defconfig .menu package/Config.in.auto - @${BASH} ${TOPDIR}/scripts/update-sys - @${BASH} ${TOPDIR}/scripts/update-pkg - @if [ ! -f .config ];then \ - $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ - fi - @$(CONFIG)/gconf $(CONFIG_CONFIG_IN) - ${POSTCONFIG} - _config: $(CONFIG)/conf .menu package/Config.in.auto -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) -- cgit v1.2.3 From 883ff45f5b095457a2b8c3b58f5a51852ef56b93 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 4 Mar 2014 18:20:10 +0100 Subject: cleanup lzma kernel compression support, update lzma binary, remove not used lzma-loader --- target/x86/sys-available/qemu-i686 | 2 - tools/lzma-loader/Makefile | 5 - tools/lzma-loader/src/LzmaDecode.c | 663 ----------------- tools/lzma-loader/src/LzmaDecode.h | 100 --- tools/lzma-loader/src/LzmaDecode.o | Bin 6248 -> 0 bytes tools/lzma-loader/src/Makefile | 78 -- tools/lzma-loader/src/README | 55 -- tools/lzma-loader/src/data.lds | 1 - tools/lzma-loader/src/data.o | Bin 3996 -> 0 bytes tools/lzma-loader/src/decompress | Bin 71097 -> 0 bytes tools/lzma-loader/src/decompress.c | 186 ----- tools/lzma-loader/src/decompress.image | Bin 3484 -> 0 bytes tools/lzma-loader/src/decompress.lds | 20 - tools/lzma-loader/src/decompress.lds.in | 20 - tools/lzma-loader/src/decompress.o | Bin 2680 -> 0 bytes tools/lzma-loader/src/head.S | 160 ---- tools/lzma-loader/src/head.o | Bin 1204 -> 0 bytes tools/lzma-loader/src/loader | Bin 3804 -> 0 bytes tools/lzma-loader/src/loader.elf | Bin 8486 -> 0 bytes tools/lzma-loader/src/loader.gz | Bin 2374 -> 0 bytes tools/lzma-loader/src/loader.lds | 17 - tools/lzma-loader/src/loader.lds.in | 17 - tools/lzma-loader/src/loader.o | Bin 8486 -> 0 bytes tools/lzma/Makefile | 15 +- tools/lzma/patches/001-large_files.patch | 13 - tools/lzma/patches/002-lzmp.patch | 1059 --------------------------- tools/lzma/patches/003-compile_fixes.patch | 26 - tools/lzma/patches/100-static_library.patch | 70 -- 28 files changed, 5 insertions(+), 2502 deletions(-) delete mode 100644 tools/lzma-loader/Makefile delete mode 100644 tools/lzma-loader/src/LzmaDecode.c delete mode 100644 tools/lzma-loader/src/LzmaDecode.h delete mode 100644 tools/lzma-loader/src/LzmaDecode.o delete mode 100644 tools/lzma-loader/src/Makefile delete mode 100644 tools/lzma-loader/src/README delete mode 100644 tools/lzma-loader/src/data.lds delete mode 100644 tools/lzma-loader/src/data.o delete mode 100755 tools/lzma-loader/src/decompress delete mode 100644 tools/lzma-loader/src/decompress.c delete mode 100755 tools/lzma-loader/src/decompress.image delete mode 100644 tools/lzma-loader/src/decompress.lds delete mode 100644 tools/lzma-loader/src/decompress.lds.in delete mode 100644 tools/lzma-loader/src/decompress.o delete mode 100644 tools/lzma-loader/src/head.S delete mode 100644 tools/lzma-loader/src/head.o delete mode 100755 tools/lzma-loader/src/loader delete mode 100755 tools/lzma-loader/src/loader.elf delete mode 100644 tools/lzma-loader/src/loader.gz delete mode 100644 tools/lzma-loader/src/loader.lds delete mode 100644 tools/lzma-loader/src/loader.lds.in delete mode 100755 tools/lzma-loader/src/loader.o delete mode 100644 tools/lzma/patches/001-large_files.patch delete mode 100644 tools/lzma/patches/002-lzmp.patch delete mode 100644 tools/lzma/patches/003-compile_fixes.patch delete mode 100644 tools/lzma/patches/100-static_library.patch diff --git a/target/x86/sys-available/qemu-i686 b/target/x86/sys-available/qemu-i686 index 45ecd4b04..42f818a14 100644 --- a/target/x86/sys-available/qemu-i686 +++ b/target/x86/sys-available/qemu-i686 @@ -4,8 +4,6 @@ config ADK_TARGET_SYSTEM_QEMU_I686 select ADK_qemu_i686 select ADK_CPU_I686 select ADK_HARDWARE_QEMU - select ADK_TARGET_WITH_VGA - select ADK_TARGET_WITH_INPUT select ADK_TARGET_KERNEL_BZIMAGE select ADK_USE_KERNEL_MINICONFIG help diff --git a/tools/lzma-loader/Makefile b/tools/lzma-loader/Makefile deleted file mode 100644 index ad4a531b6..000000000 --- a/tools/lzma-loader/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -include $(TOPDIR)/rules.mk - -all: - $(MAKE) -C src CC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld" CROSS_COMPILE="$(TARGET_CROSS)" \ - INCLUDE="-I$(LINUX_DIR)/arch/mips/include" diff --git a/tools/lzma-loader/src/LzmaDecode.c b/tools/lzma-loader/src/LzmaDecode.c deleted file mode 100644 index 951700bdd..000000000 --- a/tools/lzma-loader/src/LzmaDecode.c +++ /dev/null @@ -1,663 +0,0 @@ -/* - LzmaDecode.c - LZMA Decoder - - LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25) - http://www.7-zip.org/ - - LZMA SDK is licensed under two licenses: - 1) GNU Lesser General Public License (GNU LGPL) - 2) Common Public License (CPL) - It means that you can select one of these two licenses and - follow rules of that license. - - SPECIAL EXCEPTION: - Igor Pavlov, as the author of this code, expressly permits you to - statically or dynamically link your code (or bind by name) to the - interfaces of this file without subjecting your linked code to the - terms of the CPL or GNU LGPL. Any modifications or additions - to this file, however, are subject to the LGPL or CPL terms. -*/ - -#include "LzmaDecode.h" - -#ifndef Byte -#define Byte unsigned char -#endif - -#define kNumTopBits 24 -#define kTopValue ((UInt32)1 << kNumTopBits) - -#define kNumBitModelTotalBits 11 -#define kBitModelTotal (1 << kNumBitModelTotalBits) -#define kNumMoveBits 5 - -typedef struct _CRangeDecoder -{ - Byte *Buffer; - Byte *BufferLim; - UInt32 Range; - UInt32 Code; - #ifdef _LZMA_IN_CB - ILzmaInCallback *InCallback; - int Result; - #endif - int ExtraBytes; -} CRangeDecoder; - -Byte RangeDecoderReadByte(CRangeDecoder *rd) -{ - if (rd->Buffer == rd->BufferLim) - { - #ifdef _LZMA_IN_CB - UInt32 size; - rd->Result = rd->InCallback->Read(rd->InCallback, &rd->Buffer, &size); - rd->BufferLim = rd->Buffer + size; - if (size == 0) - #endif - { - rd->ExtraBytes = 1; - return 0xFF; - } - } - return (*rd->Buffer++); -} - -/* #define ReadByte (*rd->Buffer++) */ -#define ReadByte (RangeDecoderReadByte(rd)) - -void RangeDecoderInit(CRangeDecoder *rd, - #ifdef _LZMA_IN_CB - ILzmaInCallback *inCallback - #else - Byte *stream, UInt32 bufferSize - #endif - ) -{ - int i; - #ifdef _LZMA_IN_CB - rd->InCallback = inCallback; - rd->Buffer = rd->BufferLim = 0; - #else - rd->Buffer = stream; - rd->BufferLim = stream + bufferSize; - #endif - rd->ExtraBytes = 0; - rd->Code = 0; - rd->Range = (0xFFFFFFFF); - for(i = 0; i < 5; i++) - rd->Code = (rd->Code << 8) | ReadByte; -} - -#define RC_INIT_VAR UInt32 range = rd->Range; UInt32 code = rd->Code; -#define RC_FLUSH_VAR rd->Range = range; rd->Code = code; -#define RC_NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | ReadByte; } - -UInt32 RangeDecoderDecodeDirectBits(CRangeDecoder *rd, int numTotalBits) -{ - RC_INIT_VAR - UInt32 result = 0; - int i; - for (i = numTotalBits; i > 0; i--) - { - /* UInt32 t; */ - range >>= 1; - - result <<= 1; - if (code >= range) - { - code -= range; - result |= 1; - } - /* - t = (code - range) >> 31; - t &= 1; - code -= range & (t - 1); - result = (result + result) | (1 - t); - */ - RC_NORMALIZE - } - RC_FLUSH_VAR - return result; -} - -int RangeDecoderBitDecode(CProb *prob, CRangeDecoder *rd) -{ - UInt32 bound = (rd->Range >> kNumBitModelTotalBits) * *prob; - if (rd->Code < bound) - { - rd->Range = bound; - *prob += (kBitModelTotal - *prob) >> kNumMoveBits; - if (rd->Range < kTopValue) - { - rd->Code = (rd->Code << 8) | ReadByte; - rd->Range <<= 8; - } - return 0; - } - else - { - rd->Range -= bound; - rd->Code -= bound; - *prob -= (*prob) >> kNumMoveBits; - if (rd->Range < kTopValue) - { - rd->Code = (rd->Code << 8) | ReadByte; - rd->Range <<= 8; - } - return 1; - } -} - -#define RC_GET_BIT2(prob, mi, A0, A1) \ - UInt32 bound = (range >> kNumBitModelTotalBits) * *prob; \ - if (code < bound) \ - { A0; range = bound; *prob += (kBitModelTotal - *prob) >> kNumMoveBits; mi <<= 1; } \ - else \ - { A1; range -= bound; code -= bound; *prob -= (*prob) >> kNumMoveBits; mi = (mi + mi) + 1; } \ - RC_NORMALIZE - -#define RC_GET_BIT(prob, mi) RC_GET_BIT2(prob, mi, ; , ;) - -int RangeDecoderBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd) -{ - int mi = 1; - int i; - #ifdef _LZMA_LOC_OPT - RC_INIT_VAR - #endif - for(i = numLevels; i > 0; i--) - { - #ifdef _LZMA_LOC_OPT - CProb *prob = probs + mi; - RC_GET_BIT(prob, mi) - #else - mi = (mi + mi) + RangeDecoderBitDecode(probs + mi, rd); - #endif - } - #ifdef _LZMA_LOC_OPT - RC_FLUSH_VAR - #endif - return mi - (1 << numLevels); -} - -int RangeDecoderReverseBitTreeDecode(CProb *probs, int numLevels, CRangeDecoder *rd) -{ - int mi = 1; - int i; - int symbol = 0; - #ifdef _LZMA_LOC_OPT - RC_INIT_VAR - #endif - for(i = 0; i < numLevels; i++) - { - #ifdef _LZMA_LOC_OPT - CProb *prob = probs + mi; - RC_GET_BIT2(prob, mi, ; , symbol |= (1 << i)) - #else - int bit = RangeDecoderBitDecode(probs + mi, rd); - mi = mi + mi + bit; - symbol |= (bit << i); - #endif - } - #ifdef _LZMA_LOC_OPT - RC_FLUSH_VAR - #endif - return symbol; -} - -Byte LzmaLiteralDecode(CProb *probs, CRangeDecoder *rd) -{ - int symbol = 1; - #ifdef _LZMA_LOC_OPT - RC_INIT_VAR - #endif - do - { - #ifdef _LZMA_LOC_OPT - CProb *prob = probs + symbol; - RC_GET_BIT(prob, symbol) - #else - symbol = (symbol + symbol) | RangeDecoderBitDecode(probs + symbol, rd); - #endif - } - while (symbol < 0x100); - #ifdef _LZMA_LOC_OPT - RC_FLUSH_VAR - #endif - return symbol; -} - -Byte LzmaLiteralDecodeMatch(CProb *probs, CRangeDecoder *rd, Byte matchByte) -{ - int symbol = 1; - #ifdef _LZMA_LOC_OPT - RC_INIT_VAR - #endif - do - { - int bit; - int matchBit = (matchByte >> 7) & 1; - matchByte <<= 1; - #ifdef _LZMA_LOC_OPT - { - CProb *prob = probs + ((1 + matchBit) << 8) + symbol; - RC_GET_BIT2(prob, symbol, bit = 0, bit = 1) - } - #else - bit = RangeDecoderBitDecode(probs + ((1 + matchBit) << 8) + symbol, rd); - symbol = (symbol << 1) | bit; - #endif - if (matchBit != bit) - { - while (symbol < 0x100) - { - #ifdef _LZMA_LOC_OPT - CProb *prob = probs + symbol; - RC_GET_BIT(prob, symbol) - #else - symbol = (symbol + symbol) | RangeDecoderBitDecode(probs + symbol, rd); - #endif - } - break; - } - } - while (symbol < 0x100); - #ifdef _LZMA_LOC_OPT - RC_FLUSH_VAR - #endif - return symbol; -} - -#define kNumPosBitsMax 4 -#define kNumPosStatesMax (1 << kNumPosBitsMax) - -#define kLenNumLowBits 3 -#define kLenNumLowSymbols (1 << kLenNumLowBits) -#define kLenNumMidBits 3 -#define kLenNumMidSymbols (1 << kLenNumMidBits) -#define kLenNumHighBits 8 -#define kLenNumHighSymbols (1 << kLenNumHighBits) - -#define LenChoice 0 -#define LenChoice2 (LenChoice + 1) -#define LenLow (LenChoice2 + 1) -#define LenMid (LenLow + (kNumPosStatesMax << kLenNumLowBits)) -#define LenHigh (LenMid + (kNumPosStatesMax << kLenNumMidBits)) -#define kNumLenProbs (LenHigh + kLenNumHighSymbols) - -int LzmaLenDecode(CProb *p, CRangeDecoder *rd, int posState) -{ - if(RangeDecoderBitDecode(p + LenChoice, rd) == 0) - return RangeDecoderBitTreeDecode(p + LenLow + - (posState << kLenNumLowBits), kLenNumLowBits, rd); - if(RangeDecoderBitDecode(p + LenChoice2, rd) == 0) - return kLenNumLowSymbols + RangeDecoderBitTreeDecode(p + LenMid + - (posState << kLenNumMidBits), kLenNumMidBits, rd); - return kLenNumLowSymbols + kLenNumMidSymbols + - RangeDecoderBitTreeDecode(p + LenHigh, kLenNumHighBits, rd); -} - -#define kNumStates 12 - -#define kStartPosModelIndex 4 -#define kEndPosModelIndex 14 -#define kNumFullDistances (1 << (kEndPosModelIndex >> 1)) - -#define kNumPosSlotBits 6 -#define kNumLenToPosStates 4 - -#define kNumAlignBits 4 -#define kAlignTableSize (1 << kNumAlignBits) - -#define kMatchMinLen 2 - -#define IsMatch 0 -#define IsRep (IsMatch + (kNumStates << kNumPosBitsMax)) -#define IsRepG0 (IsRep + kNumStates) -#define IsRepG1 (IsRepG0 + kNumStates) -#define IsRepG2 (IsRepG1 + kNumStates) -#define IsRep0Long (IsRepG2 + kNumStates) -#define PosSlot (IsRep0Long + (kNumStates << kNumPosBitsMax)) -#define SpecPos (PosSlot + (kNumLenToPosStates << kNumPosSlotBits)) -#define Align (SpecPos + kNumFullDistances - kEndPosModelIndex) -#define LenCoder (Align + kAlignTableSize) -#define RepLenCoder (LenCoder + kNumLenProbs) -#define Literal (RepLenCoder + kNumLenProbs) - -#if Literal != LZMA_BASE_SIZE -StopCompilingDueBUG -#endif - -#ifdef _LZMA_OUT_READ - -typedef struct _LzmaVarState -{ - CRangeDecoder RangeDecoder; - Byte *Dictionary; - UInt32 DictionarySize; - UInt32 DictionaryPos; - UInt32 GlobalPos; - UInt32 Reps[4]; - int lc; - int lp; - int pb; - int State; - int PreviousIsMatch; - int RemainLen; -} LzmaVarState; - -int LzmaDecoderInit( - unsigned char *buffer, UInt32 bufferSize, - int lc, int lp, int pb, - unsigned char *dictionary, UInt32 dictionarySize, - #ifdef _LZMA_IN_CB - ILzmaInCallback *inCallback - #else - unsigned char *inStream, UInt32 inSize - #endif - ) -{ - LzmaVarState *vs = (LzmaVarState *)buffer; - CProb *p = (CProb *)(buffer + sizeof(LzmaVarState)); - UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + lp)); - UInt32 i; - if (bufferSize < numProbs * sizeof(CProb) + sizeof(LzmaVarState)) - return LZMA_RESULT_NOT_ENOUGH_MEM; - vs->Dictionary = dictionary; - vs->DictionarySize = dictionarySize; - vs->DictionaryPos = 0; - vs->GlobalPos = 0; - vs->Reps[0] = vs->Reps[1] = vs->Reps[2] = vs->Reps[3] = 1; - vs->lc = lc; - vs->lp = lp; - vs->pb = pb; - vs->State = 0; - vs->PreviousIsMatch = 0; - vs->RemainLen = 0; - dictionary[dictionarySize - 1] = 0; - for (i = 0; i < numProbs; i++) - p[i] = kBitModelTotal >> 1; - RangeDecoderInit(&vs->RangeDecoder, - #ifdef _LZMA_IN_CB - inCallback - #else - inStream, inSize - #endif - ); - return LZMA_RESULT_OK; -} - -int LzmaDecode(unsigned char *buffer, - unsigned char *outStream, UInt32 outSize, - UInt32 *outSizeProcessed) -{ - LzmaVarState *vs = (LzmaVarState *)buffer; - CProb *p = (CProb *)(buffer + sizeof(LzmaVarState)); - CRangeDecoder rd = vs->RangeDecoder; - int state = vs->State; - int previousIsMatch = vs->PreviousIsMatch; - Byte previousByte; - UInt32 rep0 = vs->Reps[0], rep1 = vs->Reps[1], rep2 = vs->Reps[2], rep3 = vs->Reps[3]; - UInt32 nowPos = 0; - UInt32 posStateMask = (1 << (vs->pb)) - 1; - UInt32 literalPosMask = (1 << (vs->lp)) - 1; - int lc = vs->lc; - int len = vs->RemainLen; - UInt32 globalPos = vs->GlobalPos; - - Byte *dictionary = vs->Dictionary; - UInt32 dictionarySize = vs->DictionarySize; - UInt32 dictionaryPos = vs->DictionaryPos; - - if (len == -1) - { - *outSizeProcessed = 0; - return LZMA_RESULT_OK; - } - - while(len > 0 && nowPos < outSize) - { - UInt32 pos = dictionaryPos - rep0; - if (pos >= dictionarySize) - pos += dictionarySize; - outStream[nowPos++] = dictionary[dictionaryPos] = dictionary[pos]; - if (++dictionaryPos == dictionarySize) - dictionaryPos = 0; - len--; - } - if (dictionaryPos == 0) - previousByte = dictionary[dictionarySize - 1]; - else - previousByte = dictionary[dictionaryPos - 1]; -#else - -int LzmaDecode( - Byte *buffer, UInt32 bufferSize, - int lc, int lp, int pb, - #ifdef _LZMA_IN_CB - ILzmaInCallback *inCallback, - #else - unsigned char *inStream, UInt32 inSize, - #endif - unsigned char *outStream, UInt32 outSize, - UInt32 *outSizeProcessed) -{ - UInt32 numProbs = Literal + ((UInt32)LZMA_LIT_SIZE << (lc + lp)); - CProb *p = (CProb *)buffer; - CRangeDecoder rd; - UInt32 i; - int state = 0; - int previousIsMatch = 0; - Byte previousByte = 0; - UInt32 rep0 = 1, rep1 = 1, rep2 = 1, rep3 = 1; - UInt32 nowPos = 0; - UInt32 posStateMask = (1 << pb) - 1; - UInt32 literalPosMask = (1 << lp) - 1; - int len = 0; - if (bufferSize < numProbs * sizeof(CProb)) - return LZMA_RESULT_NOT_ENOUGH_MEM; - for (i = 0; i < numProbs; i++) - p[i] = kBitModelTotal >> 1; - RangeDecoderInit(&rd, - #ifdef _LZMA_IN_CB - inCallback - #else - inStream, inSize - #endif - ); -#endif - - *outSizeProcessed = 0; - while(nowPos < outSize) - { - int posState = (int)( - (nowPos - #ifdef _LZMA_OUT_READ - + globalPos - #endif - ) - & posStateMask); - #ifdef _LZMA_IN_CB - if (rd.Result != LZMA_RESULT_OK) - return rd.Result; - #endif - if (rd.ExtraBytes != 0) - return LZMA_RESULT_DATA_ERROR; - if (RangeDecoderBitDecode(p + IsMatch + (state << kNumPosBitsMax) + posState, &rd) == 0) - { - CProb *probs = p + Literal + (LZMA_LIT_SIZE * - ((( - (nowPos - #ifdef _LZMA_OUT_READ - + globalPos - #endif - ) - & literalPosMask) << lc) + (previousByte >> (8 - lc)))); - - if (state < 4) state = 0; - else if (state < 10) state -= 3; - else state -= 6; - if (previousIsMatch) - { - Byte matchByte; - #ifdef _LZMA_OUT_READ - UInt32 pos = dictionaryPos - rep0; - if (pos >= dictionarySize) - pos += dictionarySize; - matchByte = dictionary[pos]; - #else - matchByte = outStream[nowPos - rep0]; - #endif - previousByte = LzmaLiteralDecodeMatch(probs, &rd, matchByte); - previousIsMatch = 0; - } - else - previousByte = LzmaLiteralDecode(probs, &rd); - outStream[nowPos++] = previousByte; - #ifdef _LZMA_OUT_READ - dictionary[dictionaryPos] = previousByte; - if (++dictionaryPos == dictionarySize) - dictionaryPos = 0; - #endif - } - else - { - previousIsMatch = 1; - if (RangeDecoderBitDecode(p + IsRep + state, &rd) == 1) - { - if (RangeDecoderBitDecode(p + IsRepG0 + state, &rd) == 0) - { - if (RangeDecoderBitDecode(p + IsRep0Long + (state << kNumPosBitsMax) + posState, &rd) == 0) - { - #ifdef _LZMA_OUT_READ - UInt32 pos; - #endif - if ( - (nowPos - #ifdef _LZMA_OUT_READ - + globalPos - #endif - ) - == 0) - return LZMA_RESULT_DATA_ERROR; - state = state < 7 ? 9 : 11; - #ifdef _LZMA_OUT_READ - pos = dictionaryPos - rep0; - if (pos >= dictionarySize) - pos += dictionarySize; - previousByte = dictionary[pos]; - dictionary[dictionaryPos] = previousByte; - if (++dictionaryPos == dictionarySize) - dictionaryPos = 0; - #else - previousByte = outStream[nowPos - rep0]; - #endif - outStream[nowPos++] = previousByte; - continue; - } - } - else - { - UInt32 distance; - if(RangeDecoderBitDecode(p + IsRepG1 + state, &rd) == 0) - distance = rep1; - else - { - if(RangeDecoderBitDecode(p + IsRepG2 + state, &rd) == 0) - distance = rep2; - else - { - distance = rep3; - rep3 = rep2; - } - rep2 = rep1; - } - rep1 = rep0; - rep0 = distance; - } - len = LzmaLenDecode(p + RepLenCoder, &rd, posState); - state = state < 7 ? 8 : 11; - } - else - { - int posSlot; - rep3 = rep2; - rep2 = rep1; - rep1 = rep0; - state = state < 7 ? 7 : 10; - len = LzmaLenDecode(p + LenCoder, &rd, posState); - posSlot = RangeDecoderBitTreeDecode(p + PosSlot + - ((len < kNumLenToPosStates ? len : kNumLenToPosStates - 1) << - kNumPosSlotBits), kNumPosSlotBits, &rd); - if (posSlot >= kStartPosModelIndex) - { - int numDirectBits = ((posSlot >> 1) - 1); - rep0 = ((2 | ((UInt32)posSlot & 1)) << numDirectBits); - if (posSlot < kEndPosModelIndex) - { - rep0 += RangeDecoderReverseBitTreeDecode( - p + SpecPos + rep0 - posSlot - 1, numDirectBits, &rd); - } - else - { - rep0 += RangeDecoderDecodeDirectBits(&rd, - numDirectBits - kNumAlignBits) << kNumAlignBits; - rep0 += RangeDecoderReverseBitTreeDecode(p + Align, kNumAlignBits, &rd); - } - } - else - rep0 = posSlot; - rep0++; - } - if (rep0 == (UInt32)(0)) - { - /* it's for stream version */ - len = -1; - break; - } - if (rep0 > nowPos - #ifdef _LZMA_OUT_READ - + globalPos - #endif - ) - { - return LZMA_RESULT_DATA_ERROR; - } - len += kMatchMinLen; - do - { - #ifdef _LZMA_OUT_READ - UInt32 pos = dictionaryPos - rep0; - if (pos >= dictionarySize) - pos += dictionarySize; - previousByte = dictionary[pos]; - dictionary[dictionaryPos] = previousByte; - if (++dictionaryPos == dictionarySize) - dictionaryPos = 0; - #else - previousByte = outStream[nowPos - rep0]; - #endif - outStream[nowPos++] = previousByte; - len--; - } - while(len > 0 && nowPos < outSize); - } - } - - #ifdef _LZMA_OUT_READ - vs->RangeDecoder = rd; - vs->DictionaryPos = dictionaryPos; - vs->GlobalPos = globalPos + nowPos; - vs->Reps[0] = rep0; - vs->Reps[1] = rep1; - vs->Reps[2] = rep2; - vs->Reps[3] = rep3; - vs->State = state; - vs->PreviousIsMatch = previousIsMatch; - vs->RemainLen = len; - #endif - - *outSizeProcessed = nowPos; - return LZMA_RESULT_OK; -} diff --git a/tools/lzma-loader/src/LzmaDecode.h b/tools/lzma-loader/src/LzmaDecode.h deleted file mode 100644 index f58944e3c..000000000 --- a/tools/lzma-loader/src/LzmaDecode.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - LzmaDecode.h - LZMA Decoder interface - - LZMA SDK 4.05 Copyright (c) 1999-2004 Igor Pavlov (2004-08-25) - http://www.7-zip.org/ - - LZMA SDK is licensed under two licenses: - 1) GNU Lesser General Public License (GNU LGPL) - 2) Common Public License (CPL) - It means that you can select one of these two licenses and - follow rules of that license. - - SPECIAL EXCEPTION: - Igor Pavlov, as the author of this code, expressly permits you to - statically or dynamically link your code (or bind by name) to the - interfaces of this file without subjecting your linked code to the - terms of the CPL or GNU LGPL. Any modifications or additions - to this file, however, are subject to the LGPL or CPL terms. -*/ - -#ifndef __LZMADECODE_H -#define __LZMADECODE_H - -/* #define _LZMA_IN_CB */ -/* Use callback for input data */ - -/* #define _LZMA_OUT_READ */ -/* Use read function for output data */ - -/* #define _LZMA_PROB32 */ -/* It can increase speed on some 32-bit CPUs, - but memory usage will be doubled in that case */ - -/* #define _LZMA_LOC_OPT */ -/* Enable local speed optimizations inside code */ - -#ifndef UInt32 -#ifdef _LZMA_UINT32_IS_ULONG -#define UInt32 unsigned long -#else -#define UInt32 unsigned int -#endif -#endif - -#ifdef _LZMA_PROB32 -#define CProb UInt32 -#else -#define CProb unsigned short -#endif - -#define LZMA_RESULT_OK 0 -#define LZMA_RESULT_DATA_ERROR 1 -#define LZMA_RESULT_NOT_ENOUGH_MEM 2 - -#ifdef _LZMA_IN_CB -typedef struct _ILzmaInCallback -{ - int (*Read)(void *object, unsigned char **buffer, UInt32 *bufferSize); -} ILzmaInCallback; -#endif - -#define LZMA_BASE_SIZE 1846 -#define LZMA_LIT_SIZE 768 - -/* -bufferSize = (LZMA_BASE_SIZE + (LZMA_LIT_SIZE << (lc + lp)))* sizeof(CProb) -bufferSize += 100 in case of _LZMA_OUT_READ -by default CProb is unsigned short, -but if specify _LZMA_PROB_32, CProb will be UInt32(unsigned int) -*/ - -#ifdef _LZMA_OUT_READ -int LzmaDecoderInit( - unsigned char *buffer, UInt32 bufferSize, - int lc, int lp, int pb, - unsigned char *dictionary, UInt32 dictionarySize, - #ifdef _LZMA_IN_CB - ILzmaInCallback *inCallback - #else - unsigned char *inStream, UInt32 inSize - #endif -); -#endif - -int LzmaDecode( - unsigned char *buffer, - #ifndef _LZMA_OUT_READ - UInt32 bufferSize, - int lc, int lp, int pb, - #ifdef _LZMA_IN_CB - ILzmaInCallback *inCallback, - #else - unsigned char *inStream, UInt32 inSize, - #endif - #endif - unsigned char *outStream, UInt32 outSize, - UInt32 *outSizeProcessed); - -#endif diff --git a/tools/lzma-loader/src/LzmaDecode.o b/tools/lzma-loader/src/LzmaDecode.o deleted file mode 100644 index 3d7be3f4d..000000000 Binary files a/tools/lzma-loader/src/LzmaDecode.o and /dev/null differ diff --git a/tools/lzma-loader/src/Makefile b/tools/lzma-loader/src/Makefile deleted file mode 100644 index f5d780c2b..000000000 --- a/tools/lzma-loader/src/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# -# Makefile for Broadcom BCM947XX boards -# -# Copyright 2001-2003, Broadcom Corporation -# All Rights Reserved. -# -# THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY -# KIND, EXPRESS OR IMPLIED, BY STATUTE, COMMUNICATION OR OTHERWISE. BROADCOM -# SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS -# FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE. -# -# Copyright 2004 Manuel Novoa III -# Modified to support bzip'd kernels. -# Of course, it would be better to integrate bunzip capability into CFE. -# -# Copyright 2005 Oleg I. Vdovikin -# Cleaned up, modified for lzma support, removed from kernel -# - -TEXT_START := 0x80001000 -BZ_TEXT_START := 0x80400000 - -OBJCOPY := $(CROSS_COMPILE)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S - -CFLAGS = -D__KERNEL__ -Wall -Wstrict-prototypes -Wno-trigraphs -Os \ - -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 -mno-abicalls -fno-pic \ - -ffunction-sections -pipe -mlong-calls -fno-common \ - -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -CFLAGS += -DLOADADDR=$(TEXT_START) -D_LZMA_IN_CB -CFLAGS += $(INCLUDE) - -ASFLAGS = $(CFLAGS) -D__ASSEMBLY__ -DBZ_TEXT_START=$(BZ_TEXT_START) - -SEDFLAGS := s/BZ_TEXT_START/$(BZ_TEXT_START)/;s/TEXT_START/$(TEXT_START)/ - -OBJECTS := head.o data.o - -all: loader.gz loader.elf - -# Don't build dependencies, this may die if $(CC) isn't gcc -dep: - -install: - -loader.gz: loader - gzip -nc9 $< > $@ - -loader.elf: loader.o - cp $< $@ - -loader: loader.o - $(OBJCOPY) $< $@ - -loader.o: loader.lds $(OBJECTS) - $(LD) -static --gc-sections -no-warn-mismatch -T loader.lds -o $@ $(OBJECTS) - -loader.lds: loader.lds.in Makefile - @sed "$(SEDFLAGS)" < $< > $@ - -data.o: data.lds decompress.image - $(LD) -no-warn-mismatch -T data.lds -r -o $@ -b binary decompress.image -b elf32-tradlittlemips - -data.lds: - @echo "SECTIONS { .data : { code_start = .; *(.data) code_stop = .; }}" > $@ - -decompress.image: decompress - $(OBJCOPY) $< $@ - -decompress: decompress.lds decompress.o LzmaDecode.o - $(LD) -static --gc-sections -no-warn-mismatch -T decompress.lds -o $@ decompress.o LzmaDecode.o - -decompress.lds: decompress.lds.in Makefile - @sed "$(SEDFLAGS)" < $< > $@ - -mrproper: clean - -clean: - rm -f loader.gz loader decompress *.lds *.o *.image diff --git a/tools/lzma-loader/src/README b/tools/lzma-loader/src/README deleted file mode 100644 index 16649e950..000000000 --- a/tools/lzma-loader/src/README +++ /dev/null @@ -1,55 +0,0 @@ -/* - * LZMA compressed kernel decompressor for bcm947xx boards - * - * Copyright (C) 2005 by Oleg I. Vdovikin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ - -The code is intended to decompress kernel, being compressed using lzma utility -build using 7zip LZMA SDK. This utility is located in the LZMA_Alone directory - -decompressor code expects that your .trx file consist of three partitions: - -1) decompressor itself (this is gziped code which pmon/cfe will extract and run -on boot-up instead of real kernel) -2) LZMA compressed kernel (both streamed and regular modes are supported now) -3) Root filesystem - -Please be sure to apply the following patch for use this new trx layout (it will -allow using both new and old trx files for root filesystem lookup code) - ---- linuz/arch/mips/brcm-boards/bcm947xx/setup.c 2005-01-23 19:24:27.503322896 +0300 -+++ linux/arch/mips/brcm-boards/bcm947xx/setup.c 2005-01-23 19:29:05.237100944 +0300 -@@ -221,7 +221,9 @@ - /* Try looking at TRX header for rootfs offset */ - if (le32_to_cpu(trx->magic) == TRX_MAGIC) { - bcm947xx_parts[1].offset = off; -- if (le32_to_cpu(trx->offsets[1]) > off) -+ if (le32_to_cpu(trx->offsets[2]) > off) -+ off = le32_to_cpu(trx->offsets[2]); -+ else if (le32_to_cpu(trx->offsets[1]) > off) - off = le32_to_cpu(trx->offsets[1]); - continue; - } - - -Revision history: - 0.02 Initial release - 0.03 Added Mineharu Takahara patch to pass actual - output size to decoder (stream mode compressed input is not - a requirement anymore) - 0.04 Reordered functions using lds script diff --git a/tools/lzma-loader/src/data.lds b/tools/lzma-loader/src/data.lds deleted file mode 100644 index ec48b2dfd..000000000 --- a/tools/lzma-loader/src/data.lds +++ /dev/null @@ -1 +0,0 @@ -SECTIONS { .data : { code_start = .; *(.data) code_stop = .; }} diff --git a/tools/lzma-loader/src/data.o b/tools/lzma-loader/src/data.o deleted file mode 100644 index 3c398909f..000000000 Binary files a/tools/lzma-loader/src/data.o and /dev/null differ diff --git a/tools/lzma-loader/src/decompress b/tools/lzma-loader/src/decompress deleted file mode 100755 index 9b2091e78..000000000 Binary files a/tools/lzma-loader/src/decompress and /dev/null differ diff --git a/tools/lzma-loader/src/decompress.c b/tools/lzma-loader/src/decompress.c deleted file mode 100644 index 05681b152..000000000 --- a/tools/lzma-loader/src/decompress.c +++ /dev/null @@ -1,186 +0,0 @@ -/* - * LZMA compressed kernel decompressor for bcm947xx boards - * - * Copyright (C) 2005 by Oleg I. Vdovikin - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * - * Please note, this was code based on the bunzip2 decompressor code - * by Manuel Novoa III (mjn3@codepoet.org), although the only thing left - * is an idea and part of original vendor code - * - * - * 12-Mar-2005 Mineharu Takahara - * pass actual output size to decoder (stream mode - * compressed input is not a requirement anymore) - * - * 24-Apr-2005 Oleg I. Vdovikin - * reordered functions using lds script, removed forward decl - * - */ - -#include "LzmaDecode.h" - -#define BCM4710_FLASH 0x1fc00000 /* Flash */ - -#define KSEG0 0x80000000 -#define KSEG1 0xa0000000 - -#define KSEG1ADDR(a) ((((unsigned)(a)) & 0x1fffffffU) | KSEG1) - -#define Index_Invalidate_I 0x00 -#define Index_Writeback_Inv_D 0x01 - -#define cache_unroll(base,op) \ - __asm__ __volatile__( \ - ".set noreorder;\n" \ - ".set mips3;\n" \ - "cache %1, (%0);\n" \ - ".set mips0;\n" \ - ".set reorder\n" \ - : \ - : "r" (base), \ - "i" (op)); - -static __inline__ void blast_icache(unsigned long size, unsigned long lsize) -{ - unsigned long start = KSEG0; - unsigned long end = (start + size); - - while(start < end) { - cache_unroll(start,Index_Invalidate_I); - start += lsize; - } -} - -static __inline__ void blast_dcache(unsigned long size, unsigned long lsize) -{ - unsigned long start = KSEG0; - unsigned long end = (start + size); - - while(start < end) { - cache_unroll(start,Index_Writeback_Inv_D); - start += lsize; - } -} - -#define TRX_MAGIC 0x30524448 /* "HDR0" */ - -struct trx_header { - unsigned int magic; /* "HDR0" */ - unsigned int len; /* Length of file including header */ - unsigned int crc32; /* 32-bit CRC from flag_version to end of file */ - unsigned int flag_version; /* 0:15 flags, 16:31 version */ - unsigned int offsets[3]; /* Offsets of partitions from start of header */ -}; - -#define EDIMAX_PS_HEADER_MAGIC 0x36315350 /* "PS16" */ -#define EDIMAX_PS_HEADER_LEN 0xc /* 12 bytes long for edimax header */ - -/* beyound the image end, size not known in advance */ -extern unsigned char workspace[]; - -unsigned int offset; -unsigned char *data; - -/* flash access should be aligned, so wrapper is used */ -/* read byte from the flash, all accesses are 32-bit aligned */ -static int read_byte(void *object, unsigned char **buffer, UInt32 *bufferSize) -{ - static unsigned int val; - - if (((unsigned int)offset % 4) == 0) { - val = *(unsigned int *)data; - data += 4; - } - - *bufferSize = 1; - *buffer = ((unsigned char *)&val) + (offset++ & 3); - - return LZMA_RESULT_OK; -} - -static __inline__ unsigned char get_byte(void) -{ - unsigned char *buffer; - UInt32 fake; - - return read_byte(0, &buffer, &fake), *buffer; -} - -/* should be the first function */ -void entry(unsigned long icache_size, unsigned long icache_lsize, - unsigned long dcache_size, unsigned long dcache_lsize, - unsigned long fw_arg0, unsigned long fw_arg1, - unsigned long fw_arg2, unsigned long fw_arg3) -{ - unsigned int i; /* temp value */ - unsigned int lc; /* literal context bits */ - unsigned int lp; /* literal pos state bits */ - unsigned int pb; /* pos state bits */ - unsigned int osize; /* uncompressed size */ - - ILzmaInCallback callback; - callback.Read = read_byte; - - /* look for trx header, 32-bit data access */ - for (data = ((unsigned char *) KSEG1ADDR(BCM4710_FLASH)); - ((struct trx_header *)data)->magic != TRX_MAGIC && - ((struct trx_header *)data)->magic != EDIMAX_PS_HEADER_MAGIC; - data += 65536); - - if (((struct trx_header *)data)->magic == EDIMAX_PS_HEADER_MAGIC) - data += EDIMAX_PS_HEADER_LEN; - /* compressed kernel is in the partition 0 or 1 */ - if (((struct trx_header *)data)->offsets[1] > 65536) - data += ((struct trx_header *)data)->offsets[0]; - else - data += ((struct trx_header *)data)->offsets[1]; - - offset = 0; - - /* lzma args */ - i = get_byte(); - lc = i % 9, i = i / 9; - lp = i % 5, pb = i / 5; - - /* skip rest of the LZMA coder property */ - for (i = 0; i < 4; i++) - get_byte(); - - /* read the lower half of uncompressed size in the header */ - osize = ((unsigned int)get_byte()) + - ((unsigned int)get_byte() << 8) + - ((unsigned int)get_byte() << 16) + - ((unsigned int)get_byte() << 24); - - /* skip rest of the header (upper half of uncompressed size) */ - for (i = 0; i < 4; i++) - get_byte(); - - /* decompress kernel */ - if (LzmaDecode(workspace, ~0, lc, lp, pb, &callback, - (unsigned char*)LOADADDR, osize, &i) == LZMA_RESULT_OK) - { - blast_dcache(dcache_size, dcache_lsize); - blast_icache(icache_size, icache_lsize); - - /* Jump to load address */ - ((void (*)(unsigned long, unsigned long, unsigned long, - unsigned long)) LOADADDR)(fw_arg0, fw_arg1, fw_arg2, - fw_arg3); - } -} diff --git a/tools/lzma-loader/src/decompress.image b/tools/lzma-loader/src/decompress.image deleted file mode 100755 index b0cb1af95..000000000 Binary files a/tools/lzma-loader/src/decompress.image and /dev/null differ diff --git a/tools/lzma-loader/src/decompress.lds b/tools/lzma-loader/src/decompress.lds deleted file mode 100644 index 7da944d0c..000000000 --- a/tools/lzma-loader/src/decompress.lds +++ /dev/null @@ -1,20 +0,0 @@ -OUTPUT_ARCH(mips) -ENTRY(entry) -SECTIONS { - . = 0x80400000; - .text : { - *(.text.entry) - *(.text) - *(.rodata) - } - - .data : { - *(.data) - } - - .bss : { - *(.bss) - } - - workspace = .; -} diff --git a/tools/lzma-loader/src/decompress.lds.in b/tools/lzma-loader/src/decompress.lds.in deleted file mode 100644 index 33f56f8a0..000000000 --- a/tools/lzma-loader/src/decompress.lds.in +++ /dev/null @@ -1,20 +0,0 @@ -OUTPUT_ARCH(mips) -ENTRY(entry) -SECTIONS { - . = BZ_TEXT_START; - .text : { - *(.text.entry) - *(.text) - *(.rodata) - } - - .data : { - *(.data) - } - - .bss : { - *(.bss) - } - - workspace = .; -} diff --git a/tools/lzma-loader/src/decompress.o b/tools/lzma-loader/src/decompress.o deleted file mode 100644 index 483bc0b32..000000000 Binary files a/tools/lzma-loader/src/decompress.o and /dev/null differ diff --git a/tools/lzma-loader/src/head.S b/tools/lzma-loader/src/head.S deleted file mode 100644 index 3a33e4016..000000000 --- a/tools/lzma-loader/src/head.S +++ /dev/null @@ -1,160 +0,0 @@ -/* Copyright 2005 Oleg I. Vdovikin (oleg@cs.msu.su) */ -/* cache manipulation adapted from Broadcom code */ -/* idea taken from original bunzip2 decompressor code */ -/* Copyright 2004 Manuel Novoa III (mjn3@codepoet.org) */ -/* Licensed under the linux kernel's version of the GPL.*/ - -#include -#include - -#define KSEG0 0x80000000 - -#define C0_CONFIG $16 -#define C0_TAGLO $28 -#define C0_TAGHI $29 - -#define CONF1_DA_SHIFT 7 /* D$ associativity */ -#define CONF1_DA_MASK 0x00000380 -#define CONF1_DA_BASE 1 -#define CONF1_DL_SHIFT 10 /* D$ line size */ -#define CONF1_DL_MASK 0x00001c00 -#define CONF1_DL_BASE 2 -#define CONF1_DS_SHIFT 13 /* D$ sets/way */ -#define CONF1_DS_MASK 0x0000e000 -#define CONF1_DS_BASE 64 -#define CONF1_IA_SHIFT 16 /* I$ associativity */ -#define CONF1_IA_MASK 0x00070000 -#define CONF1_IA_BASE 1 -#define CONF1_IL_SHIFT 19 /* I$ line size */ -#define CONF1_IL_MASK 0x00380000 -#define CONF1_IL_BASE 2 -#define CONF1_IS_SHIFT 22 /* Instruction cache sets/way */ -#define CONF1_IS_MASK 0x01c00000 -#define CONF1_IS_BASE 64 - -#define Index_Invalidate_I 0x00 -#define Index_Writeback_Inv_D 0x01 - - .text - LEAF(startup) - .set noreorder - addi sp, -48 - sw a0, 16(sp) - sw a1, 20(sp) - sw a2, 24(sp) - sw a3, 28(sp) - - /* Copy decompressor code to the right place */ - li t2, BZ_TEXT_START - add a0, t2, 0 - la a1, code_start - la a2, code_stop -$L1: - lw t0, 0(a1) - sw t0, 0(a0) - add a1, 4 - add a0, 4 - blt a1, a2, $L1 - nop - - /* At this point we need to invalidate dcache and */ - /* icache before jumping to new code */ - -1: /* Get cache sizes */ - .set mips32 - mfc0 s0,C0_CONFIG,1 - .set mips0 - - li s1,CONF1_DL_MASK - and s1,s0 - beq s1,zero,nodc - nop - - srl s1,CONF1_DL_SHIFT - li t0,CONF1_DL_BASE - sll s1,t0,s1 /* s1 has D$ cache line size */ - - li s2,CONF1_DA_MASK - and s2,s0 - srl s2,CONF1_DA_SHIFT - addiu s2,CONF1_DA_BASE /* s2 now has D$ associativity */ - - li t0,CONF1_DS_MASK - and t0,s0 - srl t0,CONF1_DS_SHIFT - li s3,CONF1_DS_BASE - sll s3,s3,t0 /* s3 has D$ sets per way */ - - multu s2,s3 /* sets/way * associativity */ - mflo t0 /* total cache lines */ - - multu s1,t0 /* D$ linesize * lines */ - mflo s2 /* s2 is now D$ size in bytes */ - - /* Initilize the D$: */ - mtc0 zero,C0_TAGLO - mtc0 zero,C0_TAGHI - - li t0,KSEG0 /* Just an address for the first $ line */ - addu t1,t0,s2 /* + size of cache == end */ - - .set mips3 -1: cache Index_Writeback_Inv_D,0(t0) - .set mips0 - bne t0,t1,1b - addu t0,s1 - -nodc: - /* Now we get to do it all again for the I$ */ - - move s3,zero /* just in case there is no icache */ - move s4,zero - - li t0,CONF1_IL_MASK - and t0,s0 - beq t0,zero,noic - nop - - srl t0,CONF1_IL_SHIFT - li s3,CONF1_IL_BASE - sll s3,t0 /* s3 has I$ cache line size */ - - li t0,CONF1_IA_MASK - and t0,s0 - srl t0,CONF1_IA_SHIFT - addiu s4,t0,CONF1_IA_BASE /* s4 now has I$ associativity */ - - li t0,CONF1_IS_MASK - and t0,s0 - srl t0,CONF1_IS_SHIFT - li s5,CONF1_IS_BASE - sll s5,t0 /* s5 has I$ sets per way */ - - multu s4,s5 /* sets/way * associativity */ - mflo t0 /* s4 is now total cache lines */ - - multu s3,t0 /* I$ linesize * lines */ - mflo s4 /* s4 is cache size in bytes */ - - /* Initilize the I$: */ - mtc0 zero,C0_TAGLO - mtc0 zero,C0_TAGHI - - li t0,KSEG0 /* Just an address for the first $ line */ - addu t1,t0,s4 /* + size of cache == end */ - - .set mips3 -1: cache Index_Invalidate_I,0(t0) - .set mips0 - bne t0,t1,1b - addu t0,s3 - -noic: - move a0,s3 /* icache line size */ - move a1,s4 /* icache size */ - move a2,s1 /* dcache line size */ - jal t2 - move a3,s2 /* dcache size */ - - .set reorder - END(startup) diff --git a/tools/lzma-loader/src/head.o b/tools/lzma-loader/src/head.o deleted file mode 100644 index 04763fa4b..000000000 Binary files a/tools/lzma-loader/src/head.o and /dev/null differ diff --git a/tools/lzma-loader/src/loader b/tools/lzma-loader/src/loader deleted file mode 100755 index 871117b87..000000000 Binary files a/tools/lzma-loader/src/loader and /dev/null differ diff --git a/tools/lzma-loader/src/loader.elf b/tools/lzma-loader/src/loader.elf deleted file mode 100755 index 0633a0e77..000000000 Binary files a/tools/lzma-loader/src/loader.elf and /dev/null differ diff --git a/tools/lzma-loader/src/loader.gz b/tools/lzma-loader/src/loader.gz deleted file mode 100644 index 426c9295e..000000000 Binary files a/tools/lzma-loader/src/loader.gz and /dev/null differ diff --git a/tools/lzma-loader/src/loader.lds b/tools/lzma-loader/src/loader.lds deleted file mode 100644 index 9d95adbfa..000000000 --- a/tools/lzma-loader/src/loader.lds +++ /dev/null @@ -1,17 +0,0 @@ -OUTPUT_ARCH(mips) -ENTRY(startup) -SECTIONS { - . = 0x80001000; - .text : { - *(.text) - *(.rodata) - } - - .data : { - *(.data) - } - - .bss : { - *(.bss) - } -} diff --git a/tools/lzma-loader/src/loader.lds.in b/tools/lzma-loader/src/loader.lds.in deleted file mode 100644 index 20f2ea98e..000000000 --- a/tools/lzma-loader/src/loader.lds.in +++ /dev/null @@ -1,17 +0,0 @@ -OUTPUT_ARCH(mips) -ENTRY(startup) -SECTIONS { - . = TEXT_START; - .text : { - *(.text) - *(.rodata) - } - - .data : { - *(.data) - } - - .bss : { - *(.bss) - } -} diff --git a/tools/lzma-loader/src/loader.o b/tools/lzma-loader/src/loader.o deleted file mode 100755 index 0633a0e77..000000000 Binary files a/tools/lzma-loader/src/loader.o and /dev/null differ diff --git a/tools/lzma/Makefile b/tools/lzma/Makefile index f012f3ddd..3544aaca2 100644 --- a/tools/lzma/Makefile +++ b/tools/lzma/Makefile @@ -4,27 +4,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:= lzma -PKG_VERSION:= 4.65 +PKG_VERSION:= 4.32.7 PKG_RELEASE:= 1 PKG_MD5SUM:= 434e51a018b4c8ef377bf81520a53af0 -PKG_SITES:= http://downloads.openwrt.org/sources/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_SITES:= http://tukaani.org/lzma/ include ../rules.mk install: ${STAGING_HOST_DIR}/usr/bin/lzma -UTIL_DIR=$(WRKBUILD)/C/LzmaUtil -ALONE_DIR=$(WRKBUILD)/CPP/7zip/Compress/LZMA_Alone - $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared - $(MAKE) -C $(UTIL_DIR) -f makefile.gcc - $(MAKE) -C $(ALONE_DIR) -f makefile.gcc + (cd ${WRKBUILD}; PATH="$(STAGING_HOST_DIR)/usr/bin:$$PATH" ./configure) + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' touch $@ ${STAGING_HOST_DIR}/usr/bin/lzma: $(WRKBUILD)/.compiled - $(INSTALL_BIN) $(WRKBUILD)/CPP/7zip/Compress/LZMA_Alone/lzma_alone \ + $(INSTALL_BIN) $(WRKBUILD)/src/lzma/lzma \ $(STAGING_HOST_DIR)/usr/bin/lzma include $(TOPDIR)/mk/tools.mk diff --git a/tools/lzma/patches/001-large_files.patch b/tools/lzma/patches/001-large_files.patch deleted file mode 100644 index b95fe9e90..000000000 --- a/tools/lzma/patches/001-large_files.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc -=================================================================== ---- lzma-4.65.orig/CPP/7zip/Compress/LZMA_Alone/makefile.gcc 2009-05-15 23:33:51.000000000 +0200 -+++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc 2009-06-01 22:00:54.000000000 +0200 -@@ -3,7 +3,7 @@ - CXX_C = gcc -O2 -Wall - LIB = -lm - RM = rm -f --CFLAGS = -c -+CFLAGS = -c -D_FILE_OFFSET_BITS=64 - - ifdef SystemDrive - IS_MINGW = 1 diff --git a/tools/lzma/patches/002-lzmp.patch b/tools/lzma/patches/002-lzmp.patch deleted file mode 100644 index 72d881cdb..000000000 --- a/tools/lzma/patches/002-lzmp.patch +++ /dev/null @@ -1,1059 +0,0 @@ -Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/lzmp.cpp -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/lzmp.cpp 2009-06-01 22:01:10.000000000 +0200 -@@ -0,0 +1,895 @@ -+/* -+ * LZMA command line tool similar to gzip to encode and decode LZMA files. -+ * -+ * Copyright (C) 2005 Ville Koskinen -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, -+ * USA. -+ */ -+ -+#include "../../../Common/MyInitGuid.h" -+ -+#include -+using std::cout; -+using std::cerr; -+using std::endl; -+ -+#include -+#include -+#include -+ -+#include -+using std::string; -+#include -+using std::vector; -+typedef vector stringVector; -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include // futimes() -+ -+// For Solaris -+#ifndef HAVE_FUTIMES -+//#define futimes(fd, tv) futimesat(fd, NULL, tv) -+#endif -+ -+#if defined(_WIN32) || defined(OS2) || defined(MSDOS) -+#include -+#include -+#define MY_SET_BINARY_MODE(file) setmode(fileno(file),O_BINARY) -+#else -+#define MY_SET_BINARY_MODE(file) -+#endif -+ -+#include "../../../7zip/Common/FileStreams.h" -+ -+#include "../../../Common/Types.h" -+ -+#include "../../../7zip/Compress/LzmaDecoder.h" -+#include "../../../7zip/Compress/LzmaEncoder.h" -+ -+#include "Exception.h" -+ -+#include "lzma_version.h" -+ -+namespace lzma { -+ -+const char *PROGRAM_VERSION = PACKAGE_VERSION; -+const char *PROGRAM_COPYRIGHT = "Copyright (C) 2006 Ville Koskinen"; -+ -+/* LZMA_Alone switches: -+ -a{N}: set compression mode - [0, 2], default: 2 (max) -+ -d{N}: set dictionary - [0,28], default: 23 (8MB) -+ -fb{N}: set number of fast bytes - [5, 255], default: 128 -+ -lc{N}: set number of literal context bits - [0, 8], default: 3 -+ -lp{N}: set number of literal pos bits - [0, 4], default: 0 -+ -pb{N}: set number of pos bits - [0, 4], default: 2 -+ -mf{MF_ID}: set Match Finder: [bt2, bt3, bt4, bt4b, pat2r, pat2, -+ pat2h, pat3h, pat4h, hc3, hc4], default: bt4 -+*/ -+ -+struct lzma_option { -+ short compression_mode; // -a -+ short dictionary; // -d -+ short fast_bytes; // -fb -+ wchar_t *match_finder; // -mf -+ short literal_context_bits; // -lc -+ short literal_pos_bits; // -lp -+ short pos_bits; // -pb -+}; -+ -+/* The following is a mapping from gzip/bzip2 style -1 .. -9 compression modes -+ * to the corresponding LZMA compression modes. Thanks, Larhzu, for coining -+ * these. */ -+const lzma_option option_mapping[] = { -+ { 0, 0, 0, NULL, 0, 0, 0}, // -0 (needed for indexing) -+ { 0, 16, 64, L"hc4", 3, 0, 2}, // -1 -+ { 0, 20, 64, L"hc4", 3, 0, 2}, // -2 -+ { 1, 19, 64, L"bt4", 3, 0, 2}, // -3 -+ { 2, 20, 64, L"bt4", 3, 0, 2}, // -4 -+ { 2, 21, 128, L"bt4", 3, 0, 2}, // -5 -+ { 2, 22, 128, L"bt4", 3, 0, 2}, // -6 -+ { 2, 23, 128, L"bt4", 3, 0, 2}, // -7 -+ { 2, 24, 255, L"bt4", 3, 0, 2}, // -8 -+ { 2, 25, 255, L"bt4", 3, 0, 2}, // -9 -+}; -+ -+struct extension_pair { -+ char *from; -+ char *to; -+}; -+ -+const extension_pair known_extensions[] = { -+ { ".lzma", "" }, -+ { ".tlz", ".tar" }, -+ { NULL, NULL } -+}; -+ -+/* Sorry, I just happen to like enumerations. */ -+enum PROGRAM_MODE { -+ PM_COMPRESS = 0, -+ PM_DECOMPRESS, -+ PM_TEST, -+ PM_HELP, -+ PM_LICENSE, -+ PM_VERSION -+}; -+ -+enum { -+ STATUS_OK = 0, -+ STATUS_ERROR = 1, -+ STATUS_WARNING = 2 -+}; -+ -+/* getopt options. */ -+/* struct option { name, has_arg, flag, val } */ -+const struct option long_options[] = { -+ { "stdout", 0, 0, 'c' }, -+ { "decompress", 0, 0, 'd' }, -+ { "compress", 0, 0, 'z' }, -+ { "keep", 0, 0, 'k' }, -+ { "force", 0, 0, 'f' }, -+ { "test", 0, 0, 't' }, -+ { "suffix", 1, 0, 'S' }, -+ { "quiet", 0, 0, 'q' }, -+ { "verbose", 0, 0, 'v' }, -+ { "help", 0, 0, 'h' }, -+ { "license", 0, 0, 'L' }, -+ { "version", 0, 0, 'V' }, -+ { "fast", 0, 0, '1' }, -+ { "best", 0, 0, '9' }, -+ { 0, 0, 0, 0 } -+}; -+ -+/* getopt option string (for the above options). */ -+const char option_string[] = "cdzkftS:qvhLV123456789A:D:F:"; -+ -+/* Defaults. */ -+PROGRAM_MODE program_mode = PM_COMPRESS; -+int verbosity = 0; -+bool stdinput = false; -+bool stdoutput = false; -+bool keep = false; -+bool force = false; -+int compression_mode = 7; -+//char *suffix = strdup(".lzma"); -+char *suffix = strdup(known_extensions[0].from); -+lzma_option advanced_options = { -1, -1, -1, NULL, -1, -1, -1 }; -+ -+void print_help(const char *const argv0) -+{ -+ // Help goes to stdout while other messages go to stderr. -+ cout << "\nlzma " << PROGRAM_VERSION -+ << " " << PROGRAM_COPYRIGHT << "\n" -+ "Based on LZMA SDK " << LZMA_SDK_VERSION_STRING << " " -+ << LZMA_SDK_COPYRIGHT_STRING -+ << "\n\nUsage: " << argv0 -+ << " [flags and input files in any order]\n" -+" -c --stdout output to standard output\n" -+" -d --decompress force decompression\n" -+" -z --compress force compression\n" -+" -k --keep keep (don't delete) input files\n" -+" -f --force force overwrite of output file and compress links\n" -+" -t --test test compressed file integrity\n" -+" -S .suf --suffix .suf use suffix .suf on compressed files\n" -+" -q --quiet suppress error messages\n" -+" -v --verbose be verbose\n" -+" -h --help print this message\n" -+" -L --license display the license information\n" -+" -V --version display version numbers of LZMA SDK and lzma\n" -+" -1 .. -2 fast compression\n" -+" -3 .. -9 good to excellent compression. -7 is the default.\n" -+" --fast alias for -1\n" -+" --best alias for -9 (usually *not* what you want)\n\n" -+" Memory usage depends a lot on the chosen compression mode -1 .. -9.\n" -+" See the man page lzma(1) for details.\n\n"; -+} -+ -+void print_license(void) -+{ -+ cout << "\n LZMA command line tool " << PROGRAM_VERSION << " - " -+ << PROGRAM_COPYRIGHT -+ << "\n LZMA SDK " << LZMA_SDK_VERSION_STRING << " - " -+ << LZMA_SDK_COPYRIGHT_STRING -+ << "\n This program is a part of the LZMA utils package.\n" -+ " http://tukaani.org/lzma/\n\n" -+" This program is free software; you can redistribute it and/or\n" -+" modify it under the terms of the GNU General Public License\n" -+" as published by the Free Software Foundation; either version 2\n" -+" of the License, or (at your option) any later version.\n" -+"\n" -+" This program is distributed in the hope that it will be useful,\n" -+" but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -+" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -+" GNU General Public License for more details.\n" -+"\n"; -+} -+ -+void print_version(void) -+{ -+ cout << "LZMA command line tool " << PROGRAM_VERSION << "\n" -+ << "LZMA SDK " << LZMA_SDK_VERSION_STRING << "\n"; -+} -+ -+short str2int (const char *str, const int &min, const int &max) -+{ -+ int value = -1; -+ char *endptr = NULL; -+ if (str == NULL || str[0] == '\0') -+ throw ArgumentException("Invalid integer option"); -+ value = strtol (str, &endptr, 10); -+ if (*endptr != '\0' || value < min || value > max) -+ throw ArgumentException("Invalid integer option"); -+ return value; -+} -+ -+void parse_options(int argc, char **argv, stringVector &filenames) -+{ -+ /* Snatched from getopt(3). */ -+ int c; -+ -+ /* Check how we were called */ -+ { -+ char *p = strrchr (argv[0], '/'); // Remove path prefix, if any -+ if (p++ == NULL) -+ p = argv[0]; -+ if (strstr (p, "un") != NULL) { -+ program_mode = PM_DECOMPRESS; -+ } else if (strstr (p, "cat") != NULL) { -+ program_mode = PM_DECOMPRESS; -+ stdoutput = true; -+ } -+ } -+ -+ while (-1 != (c = getopt_long(argc, argv, option_string, -+ long_options, NULL))) { -+ switch (c) { -+ // stdout -+ case 'c': -+ stdoutput = true; -+ break; -+ -+ // decompress -+ case 'd': -+ program_mode = PM_DECOMPRESS; -+ break; -+ -+ // compress -+ case 'z': -+ program_mode = PM_COMPRESS; -+ break; -+ -+ // keep -+ case 'k': -+ keep = true; -+ break; -+ -+ // force -+ case 'f': -+ force = true; -+ break; -+ -+ // test -+ case 't': -+ program_mode = PM_TEST; -+ break; -+ -+ // suffix -+ case 'S': -+ if (optarg) { -+ free(suffix); -+ suffix = strdup(optarg); -+ } -+ break; -+ -+ // quiet -+ case 'q': -+ verbosity = 0; -+ break; -+ -+ // verbose -+ case 'v': -+ verbosity++; -+ break; -+ -+ // help -+ case 'h': -+ program_mode = PM_HELP; -+ break; -+ -+ // license -+ case 'L': -+ program_mode = PM_LICENSE; -+ break; -+ -+ // version -+ case 'V': -+ program_mode = PM_VERSION; -+ break; -+ -+ case '1': case '2': case '3': case '4': case '5': -+ case '6': case '7': case '8': case '9': -+ compression_mode = c - '0'; -+ break; -+ -+ // Advanced options // -+ // Compression mode -+ case 'A': -+ advanced_options.compression_mode = -+ str2int (optarg, 0, 2); -+ break; -+ -+ // Dictionary size -+ case 'D': -+ advanced_options.dictionary = -+ str2int (optarg, 0, 28); -+ break; -+ -+ // Fast bytes -+ case 'F': -+ advanced_options.fast_bytes = -+ str2int (optarg, 0, 273); -+ break; -+ -+ default: -+ throw ArgumentException(""); -+ break; -+ } // switch(c) -+ } // while(1) -+ -+ for (int i = optind; i < argc; i++) { -+ if (strcmp("-", argv[i]) == 0) -+ continue; -+ filenames.push_back(argv[i]); -+ } -+} // parse_options -+ -+void set_encoder_properties(NCompress::NLzma::CEncoder *encoder, -+ lzma_option &opt) -+{ -+ /* Almost verbatim from LzmaAlone.cpp. */ -+ PROPID propIDs[] = -+ { -+ NCoderPropID::kDictionarySize, -+ NCoderPropID::kPosStateBits, -+ NCoderPropID::kLitContextBits, -+ NCoderPropID::kLitPosBits, -+ NCoderPropID::kAlgorithm, -+ NCoderPropID::kNumFastBytes, -+ NCoderPropID::kMatchFinder, -+ NCoderPropID::kEndMarker -+ }; -+ const int kNumProps = sizeof(propIDs) / sizeof(propIDs[0]); -+#define VALUE(x) (advanced_options.x >= 0 ? advanced_options.x : opt.x) -+ PROPVARIANT properties[kNumProps]; -+ for (int p = 0; p < 6; p++) -+ properties[p].vt = VT_UI4; -+ properties[0].ulVal = UInt32(1 << VALUE (dictionary)); -+ properties[1].ulVal = UInt32(VALUE (pos_bits)); -+ properties[2].ulVal = UInt32(VALUE (literal_context_bits)); -+ properties[3].ulVal = UInt32(VALUE (literal_pos_bits)); -+ properties[4].ulVal = UInt32(VALUE (compression_mode)); -+ properties[5].ulVal = UInt32(VALUE (fast_bytes)); -+#undef VALUE -+ -+ properties[6].vt = VT_BSTR; -+ properties[6].bstrVal = (BSTR)opt.match_finder; -+ -+ properties[7].vt = VT_BOOL; -+ properties[7].boolVal = stdinput ? VARIANT_TRUE : VARIANT_FALSE; -+ -+ if (encoder->SetCoderProperties(propIDs, properties, kNumProps) != S_OK) -+ throw Exception("SetCoderProperties() error"); -+} -+ -+void encode(NCompress::NLzma::CEncoder *encoderSpec, -+ CMyComPtr inStream, -+ CMyComPtr outStream, -+ lzma_option encoder_options, -+ UInt64 fileSize) -+{ -+ set_encoder_properties(encoderSpec, encoder_options); -+ -+ encoderSpec->WriteCoderProperties(outStream); -+ -+ for (int i = 0; i < 8; i++) -+ { -+ Byte b = Byte(fileSize >> (8 * i)); -+ if (outStream->Write(&b, sizeof(b), 0) != S_OK) -+ throw Exception("Write error while encoding"); -+ } -+ -+ HRESULT result = encoderSpec->Code(inStream, outStream, 0, 0, 0); -+ -+ if (result == E_OUTOFMEMORY) -+ throw Exception("Cannot allocate memory"); -+ else if (result != S_OK) { -+ char buffer[33]; -+ snprintf(buffer, 33, "%d", (unsigned int)result); -+ throw Exception(string("Encoder error: ") + buffer); -+ } -+} -+ -+void decode(NCompress::NLzma::CDecoder *decoderSpec, -+ CMyComPtr inStream, -+ CMyComPtr outStream) -+{ -+ const UInt32 kPropertiesSize = 5; -+ Byte properties[kPropertiesSize]; -+ UInt32 processedSize; -+ UInt64 fileSize = 0; -+ -+ if (inStream->Read(properties, kPropertiesSize, &processedSize) != S_OK) -+ throw Exception("Read error"); -+ if (processedSize != kPropertiesSize) -+ throw Exception("Read error"); -+ if (decoderSpec->SetDecoderProperties2(properties, kPropertiesSize) != S_OK) -+ throw Exception("SetDecoderProperties() error"); -+ -+ for (int i = 0; i < 8; i++) -+ { -+ Byte b; -+ -+ if (inStream->Read(&b, sizeof(b), &processedSize) != S_OK) -+ throw Exception("Read error"); -+ if (processedSize != 1) -+ throw Exception("Read error"); -+ -+ fileSize |= ((UInt64)b) << (8 * i); -+ } -+ -+ if (decoderSpec->Code(inStream, outStream, 0, &fileSize, 0) != S_OK) -+ throw Exception("Decoder error"); -+} -+ -+int open_instream(const string infile, -+ CMyComPtr &inStream, -+ UInt64 &fileSize) -+{ -+ CInFileStream *inStreamSpec = new CInFileStream; -+ inStream = inStreamSpec; -+ if (!inStreamSpec->Open(infile.c_str())) -+ throw Exception("Cannot open input file " + infile); -+ -+ inStreamSpec->File.GetLength(fileSize); -+ -+ return inStreamSpec->File.GetHandle(); -+} -+ -+int open_outstream(const string outfile, -+ CMyComPtr &outStream) -+{ -+ COutFileStream *outStreamSpec = new COutFileStream; -+ outStream = outStreamSpec; -+ -+ bool open_by_force = (program_mode == PM_TEST) | force; -+ -+ if (!outStreamSpec->Create(outfile.c_str(), open_by_force)) -+ throw Exception("Cannot open output file " + outfile); -+ -+ return outStreamSpec->File.GetHandle(); -+} -+ -+double get_ratio(int inhandle, int outhandle) -+{ -+ struct stat in_stats, out_stats; -+ fstat(inhandle, &in_stats); -+ fstat(outhandle, &out_stats); -+ -+ return (double)out_stats.st_size / (double)in_stats.st_size; -+} -+ -+mode_t get_file_mode(string filename) -+{ -+ struct stat in_stat; -+ lstat(filename.c_str(), &in_stat); -+ -+ return in_stat.st_mode; -+} -+ -+bool string_ends_with(string str, string ending) -+{ -+ return equal(ending.rbegin(), ending.rend(), str.rbegin()); -+} -+ -+bool extension_is_known(string filename) -+{ -+ bool known_format = false; -+ extension_pair extension; int i = 1; -+ -+ extension = known_extensions[0]; -+ while (extension.from != NULL) { -+ if (string_ends_with(filename, extension.from)) { -+ known_format = true; -+ break; -+ } -+ extension = known_extensions[i]; -+ i++; -+ } -+ -+ if (!known_format) { -+ if (!string_ends_with(filename, suffix)) { -+ return false; -+ } -+ } -+ -+ return true; -+} -+ -+string replace_extension(string filename) -+{ -+ int suffix_starts_at = filename.length() - strlen (suffix); -+ string from_suffix = filename.substr(suffix_starts_at, strlen (suffix)); -+ string ret = filename.substr(0, suffix_starts_at); -+ extension_pair extension; int i = 1; -+ -+ bool found_replacement = false; -+ extension = known_extensions[0]; -+ while (extension.from != NULL) { -+ if (from_suffix.compare(extension.from) == 0) { -+ ret += extension.to; -+ found_replacement = true; -+ break; -+ } -+ -+ extension = known_extensions[i]; -+ i++; -+ } -+ -+ return ret; -+} -+ -+string pretty_print_status(string filename, string output_filename, -+ string ratio) -+{ -+ string ret = ""; -+ -+ ret += filename; -+ ret += ":\t "; -+ -+ if (program_mode == PM_TEST) { -+ ret += "decoded succesfully"; -+ -+ return ret; -+ } -+ -+ if (!stdinput && !stdoutput) { -+ ret += ratio; -+ ret += " -- "; -+ } -+ -+ if (program_mode == PM_COMPRESS) { -+ if (keep) { -+ ret += "encoded succesfully"; -+ -+ return ret; -+ } -+ -+ ret += "replaced with "; -+ ret += output_filename; -+ -+ return ret; -+ } -+ -+ if (program_mode == PM_DECOMPRESS) { -+ if (keep) { -+ ret += "decoded succesfully"; -+ -+ return ret; -+ } -+ -+ ret += "replaced with "; -+ ret += output_filename; -+ -+ return ret; -+ } -+ -+ return ret; -+} -+ -+static string archive_name; // I know, it is crude, but I haven't found any other -+ // way then making a global variable to transfer filename to handler -+ -+void signal_handler (int signum) -+{ -+ unlink (archive_name.c_str()); // deleting -+ signal (signum, SIG_DFL); // we return the default function to used signal -+ kill (getpid(), signum); // and then send this signal to the process again -+} -+ -+} // namespace lzma -+ -+ -+int main(int argc, char **argv) -+{ -+ using namespace lzma; -+ using std::cerr; -+ -+ stringVector filenames; -+ -+ signal (SIGTERM,signal_handler); -+ signal (SIGHUP,signal_handler); -+ signal (SIGINT,signal_handler); -+ -+ try { -+ parse_options(argc, argv, filenames); -+ } -+ catch (...) { -+ return STATUS_ERROR; -+ } -+ -+ if (program_mode == PM_HELP) { -+ print_help(argv[0]); -+ return STATUS_OK; -+ } -+ else if (program_mode == PM_LICENSE) { -+ print_license(); -+ return STATUS_OK; -+ } -+ else if (program_mode == PM_VERSION) { -+ print_version(); -+ return STATUS_OK; -+ } -+ -+ if (filenames.empty()) { -+ stdinput = true; -+ stdoutput = true; -+ -+ /* FIXME: get rid of this */ -+ filenames.push_back("-"); -+ } -+ -+ /* Protection: always create new files with 0600 in order to prevent -+ * outsiders from reading incomplete data. */ -+ umask(0077); -+ -+ bool warning = false; -+ -+ for (int i = 0; i < filenames.size(); i++) { -+ CMyComPtr inStream; -+ CMyComPtr outStream; -+ UInt64 fileSize = 0; -+ int inhandle = 0, outhandle = 0; -+ string output_filename; -+ -+ if (stdinput) { -+ inStream = new CStdInFileStream; -+ MY_SET_BINARY_MODE(stdin); -+ fileSize = (UInt64)(Int64)-1; -+ -+ inhandle = STDIN_FILENO; -+ -+ outStream = new CStdOutFileStream; -+ MY_SET_BINARY_MODE(stdout); -+ -+ outhandle = STDOUT_FILENO; -+ } -+ else { -+ mode_t infile_mode = get_file_mode(filenames[i]); -+ if (!S_ISREG(infile_mode)) { -+ if (S_ISDIR(infile_mode)) { -+ warning = true; -+ cerr << argv[0] << ": " << filenames[i] << ": " -+ << "cowardly refusing to work on directory" -+ << endl; -+ -+ continue; -+ } -+ else if (S_ISLNK(infile_mode)) { -+ if (!stdoutput && !force) { -+ warning = true; -+ -+ cerr << argv[0] << ": " << filenames[i] << ": " -+ << "cowardly refusing to work on symbolic link " -+ << "(use --force to force encoding or decoding)" -+ << endl; -+ -+ continue; -+ } -+ } -+ else { -+ warning = true; -+ -+ cerr << argv[0] << ": " << filenames[i] << ": " -+ << "doesn't exist or is not a regular file" -+ << endl; -+ -+ continue; -+ } -+ } -+ -+ // Test if the file already ends with *suffix. -+ if (program_mode == PM_COMPRESS && !force -+ && string_ends_with(filenames[i], -+ suffix)) { -+ warning = true; -+ -+ cerr << filenames[i] << " already has " -+ << suffix << " suffix -- unchanged\n"; -+ -+ continue; -+ } -+ -+ // Test if the file extension is known. -+ if (program_mode == PM_DECOMPRESS -+ && !extension_is_known(filenames[i])) { -+ warning = true; -+ -+ cerr << filenames[i] << ": " -+ << " unknown suffix -- unchanged" -+ << endl; -+ -+ continue; -+ } -+ -+ try { -+ inhandle = open_instream(filenames[i], inStream, fileSize); -+ } -+ catch (Exception e) { -+ cerr << argv[0] << ": " << e.what() << endl; -+ return STATUS_ERROR; -+ } -+ -+ if (stdoutput) { -+ outStream = new CStdOutFileStream; -+ MY_SET_BINARY_MODE(stdout); -+ -+ outhandle = STDOUT_FILENO; -+ } -+ else { -+ /* Testing mode is nothing else but decoding -+ * and throwing away the result. */ -+ if (program_mode == PM_TEST) -+ output_filename = "/dev/null"; -+ else if (program_mode == PM_DECOMPRESS) -+ output_filename = replace_extension(filenames[i]); -+ else -+ output_filename = filenames[i] -+ + suffix; -+ archive_name = output_filename; -+ -+ try { -+ outhandle = open_outstream(output_filename, outStream); -+ } -+ catch (Exception e) { -+ cerr << argv[0] << ": " << e.what() << endl; -+ return STATUS_ERROR; -+ } -+ } -+ -+ } -+ -+ // Unless --force is specified, do not read/write compressed -+ // data from/to a terminal. -+ if (!force) { -+ if (program_mode == PM_COMPRESS && isatty(outhandle)) { -+ cerr << argv[0] << ": compressed data not " -+ "written to a terminal. Use " -+ "-f to force compression.\n" -+ << argv[0] << ": For help, type: " -+ << argv[0] << " -h\n"; -+ return STATUS_ERROR; -+ } else if (program_mode == PM_DECOMPRESS -+ && isatty(inhandle)) { -+ cerr << argv[0] << ": compressed data not " -+ "read from a terminal. Use " -+ "-f to force decompression.\n" -+ << argv[0] << ": For help, type: " -+ << argv[0] << " -h\n"; -+ return STATUS_ERROR; -+ } -+ } -+ -+ if (program_mode == PM_COMPRESS) { -+ NCompress::NLzma::CEncoder *encoderSpec = -+ new NCompress::NLzma::CEncoder; -+ -+ lzma_option options = option_mapping[compression_mode]; -+ -+ try { -+ encode(encoderSpec, inStream, outStream, options, fileSize); -+ } -+ catch (Exception e) { -+ cerr << argv[0] << ": " << e.what() << endl; -+ unlink(output_filename.c_str()); -+ delete(encoderSpec); -+ -+ return STATUS_ERROR; -+ } -+ -+ delete(encoderSpec); -+ } -+ else { // PM_DECOMPRESS | PM_TEST -+ NCompress::NLzma::CDecoder *decoderSpec = -+ new NCompress::NLzma::CDecoder; -+ -+ try { -+ decode(decoderSpec, inStream, outStream); -+ } -+ catch (Exception e) { -+ cerr << argv[0] << ": " << e.what() << endl; -+ unlink(output_filename.c_str()); -+ delete(decoderSpec); -+ -+ return STATUS_ERROR; -+ } -+ -+ delete(decoderSpec); -+ } -+ -+ /* Set permissions and owners. */ -+ if ( (program_mode == PM_COMPRESS || program_mode == PM_DECOMPRESS ) -+ && (!stdinput && !stdoutput) ) { -+ -+ int ret = 0; -+ struct stat file_stats; -+ ret = fstat(inhandle, &file_stats); -+ -+ ret = fchmod(outhandle, file_stats.st_mode); -+ ret = fchown(outhandle, file_stats.st_uid, file_stats.st_gid); -+ // We need to call fchmod() again, since otherwise the SUID bits -+ // are lost. -+ ret = fchmod(outhandle, file_stats.st_mode); -+ -+ struct timeval file_times[2]; -+ // Access time -+ file_times[0].tv_sec = file_stats.st_atime; -+ file_times[0].tv_usec = 0; -+ // Modification time -+ file_times[1].tv_sec = file_stats.st_mtime; -+ file_times[1].tv_usec = 0; -+ -+ ret = futimes(outhandle, file_times); -+ -+ if (!keep) -+ unlink(filenames[i].c_str()); -+ } -+ -+ if (verbosity > 0) { -+ if (stdoutput) { -+ cerr << filenames[i] << ":\t "; -+ cerr << "decoded succesfully" -+ << endl; -+ } -+ -+ else { -+ char buf[10] = { 0 }; -+ -+ if (program_mode == PM_DECOMPRESS) -+ snprintf(buf, 10, "%.2f%%", -+ (1 - get_ratio(outhandle, inhandle)) * 100); -+ if (program_mode == PM_COMPRESS) -+ snprintf(buf, 10, "%.2f%%", -+ (1 - get_ratio(inhandle, outhandle)) * 100); -+ -+ string ratio = buf; -+ cerr << pretty_print_status(filenames[i], output_filename, -+ ratio) -+ << endl; -+ } -+ } -+ } -+ -+ if (warning) -+ return STATUS_WARNING; -+ -+ return STATUS_OK; -+} -+ -Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/Exception.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/Exception.h 2009-06-01 22:01:10.000000000 +0200 -@@ -0,0 +1,45 @@ -+/* A couple of exceptions for lzmp. -+ * -+ * Copyright (C) 2005 Ville Koskinen -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ */ -+ -+#ifndef _EXCEPTION_H_ -+#define _EXCEPTION_H_ -+ -+#include -+using std::string; -+ -+class Exception -+{ -+private: -+ string message; -+public: -+ Exception(char *what): message(what) { } -+ Exception(string what): message(what) { } -+ -+ ~Exception() { } -+ -+ string what(void) { return message; } -+}; -+ -+class ArgumentException: public Exception -+{ -+public: -+ ArgumentException(char *what): Exception(what) { } -+ ArgumentException(string what): Exception(what) { } -+ -+ ~ArgumentException() { } -+}; -+ -+#endif -+ -Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc -=================================================================== ---- lzma-4.65.orig/CPP/7zip/Compress/LZMA_Alone/makefile.gcc 2009-06-01 22:00:54.000000000 +0200 -+++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/makefile.gcc 2009-06-01 22:06:13.000000000 +0200 -@@ -1,9 +1,10 @@ --PROG = lzma -+PROG = lzma_alone -+PROG2 = lzma - CXX = g++ -O2 -Wall - CXX_C = gcc -O2 -Wall - LIB = -lm - RM = rm -f --CFLAGS = -c -D_FILE_OFFSET_BITS=64 -+CFLAGS = -c -I ../../../ -D_FILE_OFFSET_BITS=64 -DPACKAGE_VERSION="\"4.32.0beta3\"" - - ifdef SystemDrive - IS_MINGW = 1 -@@ -45,12 +46,35 @@ - Lzma86Dec.o \ - Lzma86Enc.o \ - -+OBJS2 = \ -+ C_FileIO.o \ -+ CRC.o \ -+ Alloc.o \ -+ FileStreams.o \ -+ StreamUtils.o \ -+ InBuffer.o \ -+ OutBuffer.o \ -+ LzmaDecoder.o \ -+ StringConvert.o \ -+ StringToInt.o \ -+ LzmaEncoder.o \ -+ LzmaDec.o \ -+ LzmaEnc.o \ -+ LzFind.o \ -+ 7zCrc.o \ -+ lzmp.o - --all: $(PROG) -+all: $(PROG) $(PROG2) - - $(PROG): $(OBJS) - $(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB) $(LIB2) - -+$(PROG2): $(OBJS2) -+ $(CXX) -o $(PROG2) $(LDFLAGS) $(OBJS2) $(LIB) -+ -+lzmp.o: lzmp.cpp -+ $(CXX) $(CFLAGS) lzmp.cpp -+ - LzmaAlone.o: LzmaAlone.cpp - $(CXX) $(CFLAGS) LzmaAlone.cpp - -@@ -131,5 +153,5 @@ - $(CXX_C) $(CFLAGS) ../../../../C/LzmaUtil/Lzma86Enc.c - - clean: -- -$(RM) $(PROG) $(OBJS) -+ -$(RM) $(PROG) $(PROG2) $(OBJS) - -Index: lzma-4.65/CPP/7zip/Compress/LZMA_Alone/lzma_version.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ lzma-4.65/CPP/7zip/Compress/LZMA_Alone/lzma_version.h 2009-06-01 22:01:10.000000000 +0200 -@@ -0,0 +1,31 @@ -+#ifndef LZMA_VERSION_H -+#define LZMA_VERSION_H -+ -+/* -+ Version and copyright information used by LZMA utils. -+*/ -+ -+static const char *LZMA_SDK_VERSION_STRING = "4.43"; -+ -+static const char *LZMA_SDK_COPYRIGHT_STRING = -+ "Copyright (C) 1999-2006 Igor Pavlov"; -+ -+static const char *LZMA_SDK_COPYRIGHT_INFO = -+ " See http://7-zip.org/sdk.html or the documentation of LZMA SDK for\n" -+ " the license. For reference, the version 4.43 is free software\n" -+ " licensed under the GNU LGPL."; -+ -+ -+static const char *LZMA_UTILS_VERSION_STRING = PACKAGE_VERSION; -+ -+static const char *LZMA_UTILS_COPYRIGHT_STRING = -+ "Copyright (C) 2006 Lasse Collin"; -+ -+static const char *LZMA_UTILS_COPYRIGHT_INFO = -+ "This program comes with ABSOLUTELY NO WARRANTY.\n" -+ "You may redistribute copies of this program\n" -+ "under the terms of the GNU General Public License.\n" -+ "For more information about these matters, see the file " -+ "named COPYING.\n"; -+ -+#endif /* ifndef LZMA_VERSION_H */ -Index: lzma-4.65/CPP/Common/C_FileIO.h -=================================================================== ---- lzma-4.65.orig/CPP/Common/C_FileIO.h 2009-05-15 23:33:51.000000000 +0200 -+++ lzma-4.65/CPP/Common/C_FileIO.h 2009-06-01 22:06:56.000000000 +0200 -@@ -24,6 +24,7 @@ - bool Close(); - bool GetLength(UInt64 &length) const; - off_t Seek(off_t distanceToMove, int moveMethod) const; -+ int GetHandle() const { return _handle; } - }; - - class CInFile: public CFileBase diff --git a/tools/lzma/patches/003-compile_fixes.patch b/tools/lzma/patches/003-compile_fixes.patch deleted file mode 100644 index 49ae66b9c..000000000 --- a/tools/lzma/patches/003-compile_fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -urN lzma-4.65/CPP/7zip/Common/FileStreams.h lzma-4.65.new/CPP/7zip/Common/FileStreams.h ---- lzma-4.65/CPP/7zip/Common/FileStreams.h 2009-05-15 23:33:51.000000000 +0200 -+++ lzma-4.65.new/CPP/7zip/Common/FileStreams.h 2009-06-01 22:30:01.000000000 +0200 -@@ -72,6 +72,7 @@ - public IOutStream, - public CMyUnknownImp - { -+public: - #ifdef USE_WIN_FILE - NWindows::NFile::NIO::COutFile File; - #else -diff -urN lzma-4.65/CPP/Common/MyWindows.h lzma-4.65.new/CPP/Common/MyWindows.h ---- lzma-4.65/CPP/Common/MyWindows.h 2009-05-15 23:33:51.000000000 +0200 -+++ lzma-4.65.new/CPP/Common/MyWindows.h 2009-06-01 22:29:26.000000000 +0200 -@@ -101,8 +101,11 @@ - - #ifdef __cplusplus - -+#ifndef INITGUID -+#define INITGUID - DEFINE_GUID(IID_IUnknown, - 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); -+#endif - struct IUnknown - { - STDMETHOD(QueryInterface) (REFIID iid, void **outObject) PURE; diff --git a/tools/lzma/patches/100-static_library.patch b/tools/lzma/patches/100-static_library.patch deleted file mode 100644 index 15ab4e055..000000000 --- a/tools/lzma/patches/100-static_library.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/C/LzmaUtil/makefile.gcc -+++ b/C/LzmaUtil/makefile.gcc -@@ -1,44 +1,53 @@ - PROG = lzma --CXX = g++ --LIB = -+CC = gcc -+LIB = liblzma.a - RM = rm -f - CFLAGS = -c -O2 -Wall -+AR = ar -+RANLIB = ranlib - - OBJS = \ -- LzmaUtil.o \ - Alloc.o \ - LzFind.o \ - LzmaDec.o \ - LzmaEnc.o \ -+ LzmaLib.o \ - 7zFile.o \ - 7zStream.o \ - -- - all: $(PROG) - --$(PROG): $(OBJS) -- $(CXX) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIB) $(LIB2) -+$(PROG): LzmaUtil.o $(LIB) -+ $(CC) -o $(PROG) $(LDFLAGS) $< $(LIB) - - LzmaUtil.o: LzmaUtil.c -- $(CXX) $(CFLAGS) LzmaUtil.c -+ $(CC) $(CFLAGS) LzmaUtil.c -+ -+$(LIB): $(OBJS) -+ rm -f $@ -+ $(AR) rcu $@ $(OBJS) -+ $(RANLIB) $@ - - Alloc.o: ../Alloc.c -- $(CXX) $(CFLAGS) ../Alloc.c -+ $(CC) $(CFLAGS) ../Alloc.c - - LzFind.o: ../LzFind.c -- $(CXX) $(CFLAGS) ../LzFind.c -+ $(CC) $(CFLAGS) ../LzFind.c - - LzmaDec.o: ../LzmaDec.c -- $(CXX) $(CFLAGS) ../LzmaDec.c -+ $(CC) $(CFLAGS) ../LzmaDec.c - - LzmaEnc.o: ../LzmaEnc.c -- $(CXX) $(CFLAGS) ../LzmaEnc.c -+ $(CC) $(CFLAGS) ../LzmaEnc.c -+ -+LzmaLib.o: ../LzmaLib.c -+ $(CC) $(CFLAGS) ../LzmaLib.c - - 7zFile.o: ../7zFile.c -- $(CXX) $(CFLAGS) ../7zFile.c -+ $(CC) $(CFLAGS) ../7zFile.c - - 7zStream.o: ../7zStream.c -- $(CXX) $(CFLAGS) ../7zStream.c -+ $(CC) $(CFLAGS) ../7zStream.c - - clean: -- -$(RM) $(PROG) $(OBJS) -+ -$(RM) $(PROG) *.o *.a -- cgit v1.2.3