use deb file instead of local copy of xkb-data

ysoftwareab · Nov 10, 2021 · 3665406 · 3665406
1 parent 542642e
commit 3665406
Show file tree

Hide file tree

Showing 295 changed files with 14 additions and 83,069 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/*.deb
+/usr/
diff --git a/Makefile b/Makefile
@@ -1,9 +1,19 @@
-all:
+XKB_VSN=2.29-2
+XKB_DATA_DEB=xkb-data_${XKB_VSN}_all.deb
+XKB_DATA_URL=http://ports.ubuntu.com/pool/main/x/xkeyboard-config/${XKB_DATA_DEB}
+
+all: ${XKB_DATA_DEB}
+	ar -x ${XKB_DATA_DEB} ./data.tar.xz
+	tar xvf data.tar.xz
+	rm data.tar.xz
 	rm -f Makefile.log
-	for f in xkb-ubuntu-20.04/symbols/??; do \
+	for f in usr/share/X11/xkb/symbols/??; do \
 		./klfc $$f --from-xkb --keylayout ./ 2>>Makefile.log; \
 		f_basename=$$(basename $$f); \
 		sed -i "s/name=\"[^\"]\+\"/name=\"ysoftwareab xkb $${f_basename}\"/" $${f_basename}.keylayout; \
 		mv $${f_basename}.keylayout y-xkb-$${f_basename}.keylayout; \
 	done
 	rm install-{user,system}.sh
+
+${XKB_DATA_DEB}:
+	curl -O ${XKB_DATA_URL}
diff --git a/xkb-ubuntu-20.04/compat/README b/xkb-ubuntu-20.04/compat/README
diff --git a/xkb-ubuntu-20.04/compat/accessx b/xkb-ubuntu-20.04/compat/accessx
diff --git a/xkb-ubuntu-20.04/compat/basic b/xkb-ubuntu-20.04/compat/basic
diff --git a/xkb-ubuntu-20.04/compat/caps b/xkb-ubuntu-20.04/compat/caps
diff --git a/xkb-ubuntu-20.04/compat/complete b/xkb-ubuntu-20.04/compat/complete
diff --git a/xkb-ubuntu-20.04/compat/iso9995 b/xkb-ubuntu-20.04/compat/iso9995
diff --git a/xkb-ubuntu-20.04/compat/japan b/xkb-ubuntu-20.04/compat/japan
diff --git a/xkb-ubuntu-20.04/compat/ledcaps b/xkb-ubuntu-20.04/compat/ledcaps
diff --git a/xkb-ubuntu-20.04/compat/ledcompose b/xkb-ubuntu-20.04/compat/ledcompose
diff --git a/xkb-ubuntu-20.04/compat/lednum b/xkb-ubuntu-20.04/compat/lednum