Merge pull request #3518 from matt335672/latvian_keyboard

Add Latvian keyboards

configure.ac

@@ -9,6 +9,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_LN_S
 LT_INIT
 
 PKG_PROG_PKG_CONFIG

genkeymap/dump-keymaps.sh

@@ -86,6 +86,9 @@ kbgen 0415 "pl-PL"        "$os" -model pc104 -layout pl
 kbgen 0416 "pt-BR"        "$os" -model pc105 -layout br
 kbgen 0419 "ru-RU"        "$os" -model pc104 -layout ru
 kbgen 041d "sv-SE"        "$os" -model pc104 -layout se
+kbgen 0426 "lv-LV"        "$os" -model pc104 -layout lv -variant ergonomic
+kbgen 10426 "lv-LV"       "$os" -model pc104 -layout lv
+# 20426 Latvian(Standard) is symlinked to 10426 Latvian(QWERTY) elsewhere
 kbgen 0807 "de-CH"        "$os" -model pc105 -layout ch
 kbgen 0809 "en-GB"        "$os" -model pc105 -layout gb
 kbgen 080a "es-MX"        "$os" -model pc105 -layout latam

instfiles/Makefile.am

@@ -46,6 +46,8 @@ dist_startscript_DATA = \
   km-00000416.toml \
   km-00000419.toml \
   km-0000041d.toml \
+  km-00000426.toml \
+  km-00010426.toml \
   km-00000807.toml \
   km-00000809.toml \
   km-0000080a.toml \
@@ -88,23 +90,23 @@ SUBDIRS += pam.d
 endif
 
 #
-# install-data-hook for each platform
+# install-data-hook
 # TODO: subst these directories as well as service files
 #
-if LINUX
-# must be tab below
+# must be tabs below
+# Note the section to soft-link keyboard files which share a definition
 install-data-hook:
+if LINUX
 	if [ -f $(DESTDIR)$(sysconfdir)/init.d/xrdp ]; then \
 		sed -i 's|__BASE__|$(prefix)|' $(DESTDIR)$(sysconfdir)/init.d/xrdp; \
 	fi
 endif
-
 if FREEBSD
-# must be tab below
-install-data-hook:
 	sed -e 's|%%PREFIX%%|$(prefix)|g' \
 	    -e 's|%%LOCALSTATEDIR%%|$(localstatedir)|g' \
 		-i '' \
 		$(DESTDIR)$(sysconfdir)/rc.d/xrdp \
 		$(DESTDIR)$(sysconfdir)/rc.d/xrdp-sesman
 endif
+	(cd $(DESTDIR)${startscriptdir} && \
+		$(LN_S) km-00010426.toml km-00020426.toml)

xrdp/xrdp_keyboard.ini

@@ -79,6 +79,9 @@ rdp_layout_pl=0x00000415
 rdp_layout_br=0x00000416
 rdp_layout_ru=0x00000419
 rdp_layout_se=0x0000041D
+rdp_layout_lv=0x00000426
+rdp_layout_lv_std=0x00010426
+rdp_layout_lv_std=0x00020426
 rdp_layout_ch=0x00000807
 rdp_layout_ch_fr=0x0000100C
 rdp_layout_gb=0x00000809
@@ -107,6 +110,8 @@ rdp_layout_pl=pl
 rdp_layout_br=br(abnt2)
 rdp_layout_ru=ru
 rdp_layout_se=se
+rdp_layout_lv=lv(ergonomic)
+rdp_layout_lv_std=lv
 rdp_layout_ch=ch
 rdp_layout_ch_fr=ch(fr)
 rdp_layout_gb=gb
@@ -148,6 +153,8 @@ rdp_layout_pl=pl
 rdp_layout_br=br(abnt2)
 rdp_layout_ru=ru
 rdp_layout_se=se
+rdp_layout_lv=lv(ergonomic)
+rdp_layout_lv_std=lv
 rdp_layout_ch=ch
 rdp_layout_ch_fr=ch(fr)
 rdp_layout_gb=gb