forked from pool/xkeyboard-config
Accepting request 115465 from X11:XOrg
Pushing X11:XOrg OBS-URL: https://build.opensuse.org/request/show/115465 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xkeyboard-config?expand=0&rev=51
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
65333a5650
@ -1,45 +0,0 @@
|
||||
Index: keycodes/xfree86
|
||||
===================================================================
|
||||
--- keycodes/xfree86.orig
|
||||
+++ keycodes/xfree86
|
||||
@@ -302,6 +302,9 @@ xkb_keycodes "basic" {
|
||||
// MacBooks generate 0x65 for the lower brightness key
|
||||
<II65> = 101;
|
||||
|
||||
+ // Required for apple/logitech_g15 keyboard
|
||||
+ <II5D> = 93;
|
||||
+
|
||||
// Codes generated for scancodes 0x59-0x5f, 0x62-0x76
|
||||
<K59> = 157; // <I1D>
|
||||
<K5A> = 170; // <I2A>
|
||||
@@ -360,7 +363,7 @@ xkb_keycodes "basic" {
|
||||
// Other codes never generated. The XFree86 ddx never generates
|
||||
// these codes.
|
||||
// Thus we can use them as fake keys
|
||||
- <MDSW> = 93; // <U5D>
|
||||
+ <MDSW> = 8;
|
||||
<LVL3> = 124; // <U7C>
|
||||
<ALT> = 125; // <U7D>
|
||||
<META> = 156; // <I1C>
|
||||
Index: symbols/inet
|
||||
===================================================================
|
||||
--- symbols/inet.orig
|
||||
+++ symbols/inet
|
||||
@@ -1214,7 +1214,7 @@ xkb_symbols "logitech_g15" {
|
||||
key <K72> { [ XF86LaunchC ] };
|
||||
key <K74> { [ XF86WWW ] };
|
||||
key <K75> { [ XF86LaunchE ] };
|
||||
- key <MDSW> { [ XF86Launch1 ] };
|
||||
+ key <II5D> { [ XF86Launch1 ] };
|
||||
key <NFER> { [ XF86Launch2 ] };
|
||||
key <XFER> { [ XF86Launch8 ] };
|
||||
};
|
||||
@@ -1751,7 +1751,7 @@ xkb_symbols "apple" {
|
||||
key <K5E> { [ F14 ] };
|
||||
key <K5F> { [ F15 ] };
|
||||
key <K6C> { [ XF86Eject ] };
|
||||
- key <MDSW> { [ F16 ] };
|
||||
+ key <II5D> { [ F16 ] };
|
||||
key <KPEQ> { [ KP_Equal ] };
|
||||
};
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0
|
||||
size 739766
|
||||
3
xkeyboard-config-2.5.1.tar.bz2
Normal file
3
xkeyboard-config-2.5.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92
|
||||
size 833871
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 12 07:55:53 UTC 2012 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 2.5.1:
|
||||
+ Updated translations.
|
||||
- Changes from version 2.5:
|
||||
+ Critical security bug fixed: Grabs and screensavers
|
||||
+ Add option to map Zenkaku_Hankaku to Escape
|
||||
+ 15 bugs fixed
|
||||
+ Updated translations.
|
||||
- Changes from version 2.4.1:
|
||||
+ Critical bug fixed: many Ctl+Alt combinations broken
|
||||
- Changes from version 2.4:
|
||||
+ Add option to use RAlt as RCtrl
|
||||
+ 9 bugs fixed
|
||||
+ Updated translations.
|
||||
- Changes from version 2.3:
|
||||
+ Serious cleanup of descriptions
|
||||
+ Updated translations.
|
||||
- Drop MDSW-change-keycode.diff: fixed upstream.
|
||||
- Add pkgconfig(xorg-macros) BuildRequires: new dependency
|
||||
upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 23 21:51:17 UTC 2011 - eich@suse.de
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xkeyboard-config
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,25 +15,29 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: xkeyboard-config
|
||||
BuildRequires: fdupes intltool perl-XML-Parser pkg-config translation-update-upstream xorg-x11
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: intltool
|
||||
BuildRequires: perl-XML-Parser
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: translation-update-upstream
|
||||
BuildRequires: xorg-x11
|
||||
BuildRequires: pkgconfig(xorg-macros) >= 1.12
|
||||
Url: http://www.freedesktop.org/Software/XKeyboardConfig
|
||||
Requires: xorg-x11
|
||||
Provides: XFree86:/etc/X11/xkb/symbols/us
|
||||
Provides: xorg-x11:/etc/X11/xkb/symbols/us
|
||||
PreReq: /bin/ln /bin/rm
|
||||
Version: 2.5.1
|
||||
Release: 0
|
||||
Summary: The X Keyboard Extension
|
||||
License: GPL-2.0+ ; LGPL-2.1+ ; MIT
|
||||
Group: System/X11/Utilities
|
||||
Requires: xorg-x11
|
||||
Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
|
||||
PreReq: /bin/ln /bin/rm
|
||||
AutoReqProv: on
|
||||
Version: 2.2.1
|
||||
Release: 2
|
||||
Summary: The X Keyboard Extension
|
||||
Source: %name-%version.tar.bz2
|
||||
Source: http://xorg.freedesktop.org/releases/individual/data/%{name}-%{version}.tar.bz2
|
||||
Patch100: p_suse.diff
|
||||
# PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
|
||||
Patch109: disable-2xalt_2xctrl-toggle.diff
|
||||
Patch110: MDSW-change-keycode.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
@ -45,19 +49,11 @@ and to more closely track the logical and physical state of the
|
||||
keyboard. It also includes a number of keyboard controls designed to
|
||||
make keyboards more accessible to people with physical impairments.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Ivan Pascal <pascal@info.tsu.ru>
|
||||
Sergey V. Udaltsov <svu@users.sourceforge.net>
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
%patch100
|
||||
%patch109 -p1
|
||||
%patch110
|
||||
|
||||
%build
|
||||
%configure --with-xkb-rules-symlink=xfree86,xorg \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user