Bug 18645

Summary:	Add patches for various OLPC international keyboards to xkeyboard-config
Product:	xkeyboard-config	Reporter:	Peter <pbrobinson>
Component:	General	Assignee:	xkb
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	medium
Version:	unspecified
Hardware:	Other
OS:	All
Whiteboard:
i915 platform:		i915 features:
Attachments:	tar file of olpc keyboard patches

Description Peter 2008-11-20 15:20:45 UTC

There are a number of patches that OLPC patches into xkeyboard-config to support some of their international keyboards. It would be useful to have them upstream to make it easier for other distributions that wish to support the OLPC-XO to do so across all keyboards.

The patches they currently ship are as follows:

Patch1: olpc-xkeyboard-config-kz-group.patch
Patch2: usinet.patch
Patch3: xkeyboard-config-olpc-tr.patch
Patch4: xkeyboard-config-olpc-ca-fr-typofix.patch
Patch5: xkeyboard-config-olpc-et.patch
Patch6: xkeyboard-config-olpc-af.patch
Patch7: xkeyboard-config-olpc-it.patch

The patches are containing in CVS here http://cvs.fedoraproject.org/viewvc/rpms/xkeyboard-config/OLPC-3/ and I've referenced CVS so as that's where the current ones will be. The patches are against v 1.3.

Comment 1 Sergey V. Udaltsov 2008-11-20 15:29:40 UTC

I do not mind those patches - but I prefer to have them at least against 1.4. It there a plan for uplift?

Comment 2 Peter 2008-11-20 15:55:06 UTC

Yes, I suppose there is as Fedora 10 is running 1.4 and they're in the process of uplifting the OLPC-OS to be based on it. What is required to convert them?

Comment 3 Sergey V. Udaltsov 2008-11-20 16:01:42 UTC

Try to apply. Find if some things are conflicting. Resolve the conflicts. Create new patches using diff;)

Comment 4 Peter 2008-11-20 16:36:45 UTC

Patches all apply fine to 1.4 with the following patch options. There is one that has slight fuzz but no failures, I can regenerate that if necessary. I can also attach the current patches at a tar file if its easier. 

%patch1 -p1 -b .kzgroup
%patch2 -p1 -b .usinet
%patch3 -p0 -b .tr
%patch4 -p0 -b .ca
%patch5 -p1 -b .et
%patch6 -p1 -b .af
%patch7 -p1 -b .it

Comment 5 Sergey V. Udaltsov 2008-11-20 16:45:41 UTC

Actually, having tarball attached would be easier perhaps. Also, the list of files in cvs is larger than you provided here. Why? BTW, should af(olpc-fa) be fixed as af(olpc-da)?

In addition, usinet.patch looks suspicious. I do not want to spoil pc105 with extended media keys

Comment 6 Peter 2008-11-20 16:55:01 UTC

The patches I listed are the ones currently included in the build spec. Quite happy for the usinet patch not to be done, I noticed that Fedora carries that one too so it could be Fedora specific, as opposed to OLPC specific. Will attach a tar file shortly.

Comment 7 Peter 2008-11-20 16:55:50 UTC

Created attachment 20481 [details]
tar file of olpc keyboard patches

Comment 8 Sergey V. Udaltsov 2008-11-22 13:39:40 UTC

olpc-xkeyboard-config-kz-group.patch - the variant already contains group(olpc)
xkeyboard-config-olpc-af.patch - why renaming the varian? why only in symbols??
xkeyboard-config-olpc-ca-fr-typofix.patch - applied
xkeyboard-config-olpc-et.patch - applied
xkeyboard-config-olpc-it.patch - could not apply, already applied
xkeyboard-config-olpc-tr.patch - applied

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.