xkeyboard-config 2.6
- change source URL, 2.6 is in a different directory - force autoreconf, update to use intltoolize as autopoint
This commit is contained in:
parent
ee0bb78b7d
commit
45e92a9f7c
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@ xkeyboard-config-1.9.tar.bz2
|
|||||||
/xkeyboard-config-2.4.1.tar.bz2
|
/xkeyboard-config-2.4.1.tar.bz2
|
||||||
/xkeyboard-config-2.5.tar.bz2
|
/xkeyboard-config-2.5.tar.bz2
|
||||||
/xkeyboard-config-2.5.1.tar.bz2
|
/xkeyboard-config-2.5.1.tar.bz2
|
||||||
|
/xkeyboard-config-2.6.tar.bz2
|
||||||
|
@ -1,53 +0,0 @@
|
|||||||
From 5001e0b41a9ee22633b0a56571b2dc61bc55df4d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Drake <dsd@laptop.org>
|
|
||||||
Date: Thu, 17 May 2012 20:21:00 +0000
|
|
||||||
Subject: Update FR OLPC layout
|
|
||||||
|
|
||||||
Some keys have only two characters printed: the unmodified character,
|
|
||||||
and a character in the Shift+AltGr position (upper right).
|
|
||||||
For such keys, users were confused why the "other" character could not
|
|
||||||
be accessed with AltGr alone.
|
|
||||||
|
|
||||||
Make such keys behave shift-invariant to remove this confusion.
|
|
||||||
|
|
||||||
Also add some obvious omissions from the previous submission fixing
|
|
||||||
various other keys that weren't working as printed.
|
|
||||||
|
|
||||||
The corresponding keyboard can be seen here:
|
|
||||||
http://wiki.laptop.org/go/OLPC_Azerty_Keyboard
|
|
||||||
|
|
||||||
Investigation and original patch from Walter Bender.
|
|
||||||
|
|
||||||
https://bugs.freedesktop.org/show_bug.cgi?id=50064
|
|
||||||
---
|
|
||||||
diff --git a/symbols/fr b/symbols/fr
|
|
||||||
index 85bcd55..45ef6a4 100644
|
|
||||||
--- a/symbols/fr
|
|
||||||
+++ b/symbols/fr
|
|
||||||
@@ -48,13 +48,17 @@ xkb_symbols "olpc" {
|
|
||||||
|
|
||||||
name[Group1]="French";
|
|
||||||
|
|
||||||
- key <AD02> { [ z, Z, VoidSymbol, guillemotleft ] };
|
|
||||||
-
|
|
||||||
- key <AC02> { [ s, S, VoidSymbol, ssharp ] };
|
|
||||||
-
|
|
||||||
- key <AB02> { [ x, X, VoidSymbol, guillemotright ] };
|
|
||||||
-
|
|
||||||
- key <I219> { [ less, greater ] };
|
|
||||||
+ key <I219> { [ less, greater ] };
|
|
||||||
+ key <AD11> { [ dead_circumflex, dead_diaeresis, notsign, dead_abovering ] };
|
|
||||||
+ key <AB08> { [ semicolon, period, underscore, multiply ] };
|
|
||||||
+ key <TLDE> { [ twosuperior, asciitilde, VoidSymbol, VoidSymbol ] };
|
|
||||||
+
|
|
||||||
+ // Some keys only have the Shift+AltGr character printed on them (alongside
|
|
||||||
+ // the unmodified one). Make such keys shift-invariant so that the printed
|
|
||||||
+ // value is achieved by pressing AltGr or Shift+AltGr.
|
|
||||||
+ key <AB02> { [ x, X, guillemotright, guillemotright ] };
|
|
||||||
+ key <AC02> { [ s, S, ssharp, ssharp ] };
|
|
||||||
+ key <AD02> { [ z, Z, guillemotleft, guillemotleft ] };
|
|
||||||
};
|
|
||||||
|
|
||||||
partial alphanumeric_keys
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2-2-gbebe
|
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
29cbf3980bbe94c3ffc9c233ea638059 xkeyboard-config-2.5.1.tar.bz2
|
e7e31da9adb56ba52b5c18226b8cbef3 xkeyboard-config-2.6.tar.bz2
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
Summary: X Keyboard Extension configuration data
|
Summary: X Keyboard Extension configuration data
|
||||||
Name: xkeyboard-config
|
Name: xkeyboard-config
|
||||||
Version: 2.5.1
|
Version: 2.6
|
||||||
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
|
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
|
||||||
@ -16,10 +16,8 @@ Source0: %{name}-%{gitdate}.tar.bz2
|
|||||||
Source1: make-git-snapshot.sh
|
Source1: make-git-snapshot.sh
|
||||||
Source2: commitid
|
Source2: commitid
|
||||||
%else
|
%else
|
||||||
Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2
|
Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
# https://bugs.freedesktop.org/show_bug.cgi?id=50064
|
|
||||||
Patch0: olpc-azerty-fixes.patch
|
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -71,11 +69,9 @@ git commit -a -q -m "%{name} %{version} baseline."
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
|
#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
|
||||||
%patch0 -p1 -b .azerty
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
intltoolize
|
AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
|
||||||
autoreconf -v --install || exit 1
|
|
||||||
%configure \
|
%configure \
|
||||||
--enable-compat-rules \
|
--enable-compat-rules \
|
||||||
--with-xkb-base=%{_datadir}/X11/xkb \
|
--with-xkb-base=%{_datadir}/X11/xkb \
|
||||||
@ -113,6 +109,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
|
|||||||
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
%{_datadir}/pkgconfig/xkeyboard-config.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 31 2012 Peter Hutterer <peter.hutterer@redhat.com> 2.6-1
|
||||||
|
- xkeyboard-config 2.6
|
||||||
|
- change source URL, 2.6 is in a different directory
|
||||||
|
- force autoreconf, update to use intltoolize as autopoint
|
||||||
|
|
||||||
* Wed May 23 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 2.5.1-2
|
* Wed May 23 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 2.5.1-2
|
||||||
- Add upstream patch to fix OLPC azerty keyboard
|
- Add upstream patch to fix OLPC azerty keyboard
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user