[meego-commits] 23833: Changes to Trunk:Testing/xkeyboard-config
Marko Saukko
no_reply at build.meego.com
Thu Sep 8 12:17:40 UTC 2011
Hi,
I have made the following changes to xkeyboard-config in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Marko Saukko
[This message was auto-generated]
---
Request #23833:
submit: devel:devices:n900:n950/xkeyboard-config(rc1ca16830c99edaf982d9f2ee70da5b7) -> Trunk:Testing/xkeyboard-config
Message:
* Wed Jul 06 2011 Marko Saukko <marko.saukko at cybercom.com> - 1.8
- Added 2 patches by Markus Lehtonen to add RM-680 keymap for N950.
State: new 2011-09-08T05:09:04 marko.saukko
Comment: None
changes files:
--------------
--- xkeyboard-config.changes
+++ xkeyboard-config.changes
@@ -0,0 +1,3 @@
+* Wed Jul 06 2011 Marko Saukko <marko.saukko at cybercom.com> - 1.8
+- Added 2 patches by Markus Lehtonen to add RM-680 keymap for N950.
+
new:
----
n950-makefile.in-manual-fix.patch
n950-support.patch
spec files:
-----------
--- xkeyboard-config.spec
+++ xkeyboard-config.spec
@@ -16,6 +16,8 @@
Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
Source100: xkeyboard-config.yaml
Patch0: fix-rx51-enter.patch
+Patch1: n950-support.patch
+Patch2: n950-makefile.in-manual-fix.patch
BuildRequires: pkgconfig(xorg-macros)
BuildRequires: pkgconfig
BuildRequires: xkbcomp
@@ -37,6 +39,10 @@
# fix-rx51-enter.patch
%patch0 -p1
+# n950-support.patch
+%patch1 -p1
+# n950-makefile.in-manual-fix.patch
+%patch2 -p1
# >> setup
# << setup
other changes:
--------------
++++++ n950-makefile.in-manual-fix.patch (new)
--- n950-makefile.in-manual-fix.patch
+++ n950-makefile.in-manual-fix.patch
+From de3d2ad2273e7d290f9d819f6e4ce5a3619c5487 Mon Sep 17 00:00:00 2001
+From: Markus Lehtonen <markus.lehtonen at nokia.com>
+Date: Fri, 26 Nov 2010 14:35:26 +0200
+Subject: [PATCH 2/2] Makefile.in manual fix
+
+---
+ symbols/nokia_vndr/Makefile.in | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/symbols/nokia_vndr/Makefile.in b/symbols/nokia_vndr/Makefile.in
+index 8f508f2..7efc29e 100644
+--- a/symbols/nokia_vndr/Makefile.in
++++ b/symbols/nokia_vndr/Makefile.in
+@@ -168,6 +168,8 @@ symbolsdir = $(xkb_base)/symbols/nokia_vndr
+ dist_symbols_DATA = \
+ rx-44 \
+ rx-51 \
++rm-680 \
++rm-680-b2 \
+ su-8w
+
+ all: all-am
+--
+1.7.1
+
++++++ n950-support.patch (new)
--- n950-support.patch
+++ n950-support.patch
+From c1e41c189e749c0388e60a5280044a029fb94dc5 Mon Sep 17 00:00:00 2001
+From: Markus Lehtonen <markus.lehtonen at nokia.com>
+Date: Fri, 26 Nov 2010 13:55:11 +0200
+Subject: [PATCH 1/2] Changes from Harmattan
+
+---
+ geometry/nokia | 113 ++++-
+ rules/base.lists.part | 2 +-
+ rules/base.ml1_s.part | 2 +
+ rules/base.ml_s.part | 2 +
+ symbols/nokia_vndr/Makefile.am | 2 +
+ symbols/nokia_vndr/rm-680 | 1101 ++++++++++++++++++++++++++++++++++++++++
+ symbols/nokia_vndr/rm-680-b2 | 1009 ++++++++++++++++++++++++++++++++++++
+ 7 files changed, 2228 insertions(+), 3 deletions(-)
+ create mode 100644 symbols/nokia_vndr/rm-680
+ create mode 100644 symbols/nokia_vndr/rm-680-b2
+
+diff --git a/geometry/nokia b/geometry/nokia
+index 5132840..64e5242 100644
+--- a/geometry/nokia
++++ b/geometry/nokia
+@@ -1,6 +1,115 @@
+-// Zoomed 3x because of text size
++// The geomeries are zoomed about 3x because of text size in xkbprint. An
++// example for visualizing a keyboard layout is given below.
++//
++// setxkbmap -model nokiarm680 -layout us -print > rm680.xkb
++// xkbcomp rm680.xkb
++// xkbprint -color rm680.xkm
+
+-default xkb_geometry "nokiarx51" {
++xkb_geometry "nokiarm680b2" {
++
++ description= "Nokia RM-680";
++ width= 346.5; // 11x8.5mm + 2x11mm border
++ height= 102.0; // 4x7mm + 2x3mm border
++
++ shape.cornerRadius= 1.5;
++ shape "NORM" { { [25.5,21.0] } };
++ shape "SPCE" { { [76.5,21.0] } };
++
++ section.left= 33.0;
++ row.left= 0.0;
++ key.shape= "NORM";
++ key.gap= 0;
++ section "Keys" {
++ top= 0;
++ row {
++ top= 9.0;
++ keys { <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
++ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
++ { <BKSP>, "NORM", color="grey20" }
++ };
++ };
++ row {
++ top= 30.0;
++ keys { <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
++ <AC06>, <AC07>, <AC08>, <AC09>, <AC11>,
++ { <RTRN>, "NORM", color="grey20" }
++ };
++ };
++ row {
++ top= 51.0;
++ keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
++ <AB06>, <AB07>, <AB08>, <AB09>, <UP>,
++ { <RCTL>, "NORM", color="grey20" }
++ };
++ };
++ row {
++ top= 72.0;
++ keys { { <LWIN>, "NORM", color="grey20" },
++ { <LFSH>, "NORM", color="grey20" },
++ { <COMP>, "NORM", color="grey20" },
++ <AB10>,
++ { <SPCE>, "SPCE", color="white" },
++ <AC12>,
++ <LEFT>, <DOWN>, <RGHT>
++ };
++ };
++ }; // End of "Keys" section
++
++}; // End of "rm680" geometry
++
++xkb_geometry "nokiarm680" {
++
++ description= "Nokia RM-680";
++ width= 346.5; // 11x8.5mm + 2x11mm border
++ height= 102.0; // 4x7mm + 2x3mm border
++
++ shape.cornerRadius= 1.5;
++ shape "NORM" { { [25.5,21.0] } };
++ shape "SPCE" { { [76.5,21.0] } };
++
++ section.left= 33.0;
++ row.left= 0.0;
++ key.shape= "NORM";
++ key.gap= 0;
++ section "Keys" {
++ top= 0;
++ row {
++ top= 9.0;
++ keys { <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
++ <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
++ { <BKSP>, "NORM", color="grey20" }
++ };
++ };
++ row {
++ top= 30.0;
++ keys { <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
++ <AC06>, <AC07>, <AC08>, <AC09>, <AC11>,
++ { <RTRN>, "NORM", color="grey20" }
++ };
++ };
++ row {
++ top= 51.0;
++ keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
++ <AB06>, <AB07>, <AB08>, <AB09>, <UP>,
++ { <RCTL>, "NORM", color="grey20" }
++ };
++ };
++ row {
++ top= 72.0;
++ keys { { <LWIN>, "NORM", color="grey20" },
++ { <LFSH>, "NORM", color="grey20" },
++ { <COMP>, "NORM", color="grey20" },
++ <AB10>,
++ { <SPCE>, "SPCE", color="white" },
++ <AC12>,
++ <LEFT>, <DOWN>, <RGHT>
++ };
++ };
++ }; // End of "Keys" section
++
++}; // End of "rm680" geometry
++
++xkb_geometry "nokiarx51" {
+
+ description= "Nokia RX-51";
+ width= 273; // 13x6mm + 2x1.5mm border + 2x5mm border
+diff --git a/rules/base.lists.part b/rules/base.lists.part
+index 27f081f..3c10bca 100644
+--- a/rules/base.lists.part
++++ b/rules/base.lists.part
+@@ -12,7 +12,7 @@
+ ! $msmodels = microsoft microsoft7000 microsoftpro microsoftprousb microsoftprose
+
+ // Nokia devices and keyboards
+-! $nokiamodels = nokiasu8w nokiarx44 nokiarx51
++! $nokiamodels = nokiasu8w nokiarx44 nokiarx51 nokiarm680 nokiarm680b2
+
+ // PC geometries - they have special geometry but symbols are mostly pc105
+ ! $pcgeometries = latitude
+diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
+index 6d5f570..ea2c389 100644
+--- a/rules/base.ml1_s.part
++++ b/rules/base.ml1_s.part
+@@ -8,5 +8,7 @@
+ $macs $macvendorlayouts = pc+macintosh_vndr/%l[1]%(v[1])
+ nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty)
+ nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l[1]%_v[1])
++ nokiarm680 * = nokia_vndr/rm-680(common)+nokia_vndr/rm-680(%l[1]%_v[1])
++ nokiarm680b2 * = nokia_vndr/rm-680-b2(common)+nokia_vndr/rm-680-b2(%l[1]%_v[1])
+ $thinkpads br = pc+%l[1](thinkpad)
+ * * = pc+%l[1]%(v[1])
+diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
+index 1c16b6b..f2529e0 100644
+--- a/rules/base.ml_s.part
++++ b/rules/base.ml_s.part
+@@ -24,6 +24,8 @@
+ nokiarx44 * = nokia_vndr/rx-44(%l)
+ nokiarx51 cz(qwerty) = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(cz_qwerty)
+ nokiarx51 * = nokia_vndr/rx-51(common)+nokia_vndr/rx-51(%l%_v)
++ nokiarm680 * = nokia_vndr/rm-680(common)+nokia_vndr/rm-680(%l%_v)
++ nokiarm680b2 * = nokia_vndr/rm-680-b2(common)+nokia_vndr/rm-680-b2(%l%_v)
+ nokiasu8w * = nokia_vndr/su-8w(%l)
+ olpc $olpclayouts = olpc+%l%(m)
+ olpc * = olpc+%l%(v)
+diff --git a/symbols/nokia_vndr/Makefile.am b/symbols/nokia_vndr/Makefile.am
+index 71200ec..3c9a195 100644
+--- a/symbols/nokia_vndr/Makefile.am
++++ b/symbols/nokia_vndr/Makefile.am
+@@ -3,4 +3,6 @@ symbolsdir = $(xkb_base)/symbols/nokia_vndr
+ dist_symbols_DATA = \
+ rx-44 \
+ rx-51 \
++rm-680 \
++rm-680-b2 \
+ su-8w
+diff --git a/symbols/nokia_vndr/rm-680 b/symbols/nokia_vndr/rm-680
+new file mode 100644
+index 0000000..2045a4c
+--- /dev/null
++++ b/symbols/nokia_vndr/rm-680
+@@ -0,0 +1,1101 @@
++// Instructions
++//
++// 1. Set basic layout by:
++// setxkbmap -rules evdev -model nokiarm680 -layout cz
(2115 more lines skipped)
++++++ xkeyboard-config.yaml
--- xkeyboard-config.yaml
+++ xkeyboard-config.yaml
@@ -9,7 +9,7 @@
- http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
Description: Alternative xkb data files.
-PkgConfigBR:
+PkgConfigBR:
- xorg-macros
PkgBR:
- pkgconfig
@@ -28,7 +28,10 @@
- --with-xkb-rules-symlink=xorg
Patches:
- fix-rx51-enter.patch
+ - n950-support.patch
+ - n950-makefile.in-manual-fix.patch
BuildArch: noarch
NoAutoLocale: True
FilesInput: files.list
-RunFdupes: /usr/share/X11
+RunFdupes:
+ - /usr/share/X11
More information about the MeeGo-commits
mailing list