aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-05-19 12:42:05 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2017-05-19 14:46:34 +0200
commit957c515e9347dda1a578ec63007a5ebe729762cb (patch)
treec1c37ab01078eab0c347358b181db3f1984ffe78
parent21dcbfdcb78aa871cd1cad7a51d9b030222c9c58 (diff)
downloadaports-957c515e9347dda1a578ec63007a5ebe729762cb.tar.gz
aports-957c515e9347dda1a578ec63007a5ebe729762cb.tar.bz2
aports-957c515e9347dda1a578ec63007a5ebe729762cb.tar.xz
main/kbd: provide bkeymaps for backwards compat
so we dont break scripts that tries to install bkeymaps
-rw-r--r--main/kbd/APKBUILD3
-rw-r--r--main/kbd/bkeymaps.patch14
2 files changed, 16 insertions, 1 deletions
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD
index b0d3540854..623d98281c 100644
--- a/main/kbd/APKBUILD
+++ b/main/kbd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kbd
pkgver=2.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="Tools for configuring the console (keyboard, virtual terminals, etc.)"
url="http://ftp.altlinux.org/pub/people/legion/kbd"
arch="all"
@@ -132,6 +132,7 @@ bkeymaps() {
pkgdesc="X.org-derived binary keymaps"
depends=
replaces="bkeymaps"
+ provides="bkeymaps"
mkdir -p "$subpkgdir$_bmapdir"
local map variant layout; for map in "$pkgdir$_xmapdir"/*.map.gz; do
diff --git a/main/kbd/bkeymaps.patch b/main/kbd/bkeymaps.patch
new file mode 100644
index 0000000000..cea626167f
--- /dev/null
+++ b/main/kbd/bkeymaps.patch
@@ -0,0 +1,14 @@
+diff --git a/src/loadkeys.c b/src/loadkeys.c
+index 8b8e7a1..b3f7fea 100644
+--- a/src/loadkeys.c
++++ b/src/loadkeys.c
+@@ -174,7 +174,8 @@ main(int argc, char *argv[])
+ }
+
+ /* get console */
+- fd = getfd(console);
++ if (!(options & OPT_B))
++ fd = getfd(console);
+
+ if (!(options & OPT_M) && !(options & OPT_B)) {
+ /* check whether the keyboard is in Unicode mode */