Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cc6d37352026974066857dcdd5e4cccde5de73c0
commit cc6d37352026974066857dcdd5e4cccde5de73c0 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sun Sep 6 13:58:25 2009 +0200 xkeyboard-config-1.6-2-ppc - add revert-putting-altwin-super_win-into-default-mapping.patch to make altgr work again in gtk apps diff --git a/source/x11/xkeyboard-config/FrugalBuild b/source/x11/xkeyboard-config/FrugalBuild index 3ed3198..1c65e6d 100644 --- a/source/x11/xkeyboard-config/FrugalBuild +++ b/source/x11/xkeyboard-config/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xkeyboard-config pkgver=1.6 -pkgrel=1 +pkgrel=2 pkgdesc="X.org XML-based XKB configuration registry" url="http://www.freedesktop.org/wiki/Software_2fXKeyboardConfig"; groups=('x11' 'xorg-core' 'xorg-proto') @@ -11,12 +11,15 @@ depends=('xkbcomp>=1.0.5') archs=('i686' 'x86_64' 'ppc') makedepends=('pkgconfig' 'perl-xml-parser' 'util-macros>=1.2.1' 'intltool') up2date=("lynx -dump 'http://xlibs.freedesktop.org/xkbdesc/?C=M;O=A' | grep $pkgname | Flasttar") -source=(http://xlibs.freedesktop.org/xkbdesc/$pkgname-$pkgver.tar.bz2) +source=(http://xlibs.freedesktop.org/xkbdesc/$pkgname-$pkgver.tar.bz2 \ + revert-putting-altwin-super_win-into-default-mapping.patch) #source=(http://ftp.frugalware.org/pub/other/sources/$pkgname/$pkgname-20061207.tar.bz2) -sha1sums=('312f2e142f7d2bea6cabe6fcd8da4fb6c0711396') +sha1sums=('312f2e142f7d2bea6cabe6fcd8da4fb6c0711396' \ + '168b05b89e08f81298f26796a914ef1dccf69c4f') build() { Fcd + Fpatchall Fmake --enable-xkbcomp-symlink --enable-compat-rules \ --with-xkb-rules-symlink=xorg,xfree86 Fmakeinstall diff --git a/source/x11/xkeyboard-config/revert-putting-altwin-super_win-into-default-mapping.patch b/source/x11/xkeyboard-config/revert-putting-altwin-super_win-into-default-mapping.patch new file mode 100644 index 0000000..1ae7005 --- /dev/null +++ b/source/x11/xkeyboard-config/revert-putting-altwin-super_win-into-default-mapping.patch @@ -0,0 +1,81 @@ +From 3dd3e51981a4ac1f5af3e0a2d4959e0e4e0e76b1 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna <vmik...@frugalware.org> +Date: Sun, 6 Sep 2009 13:48:41 +0200 +Subject: [PATCH] Revert "Putting altwin:super_win into default mapping, dropping the option, b.fd.o#19500" + +This reverts commit 5de02aa07a8d4bbe1957af3a38212c3507f2436f. +--- + rules/base.o_s.part | 1 + + rules/base.xml.in | 6 ++++++ + symbols/altwin | 7 +++++++ + symbols/pc | 2 -- + 4 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/rules/base.o_s.part b/rules/base.o_s.part +index f9290da..948c028 100644 +--- a/rules/base.o_s.part ++++ b/rules/base.o_s.part +@@ -4,6 +4,7 @@ + altwin:ctrl_alt_win = +altwin(ctrl_alt_win) + altwin:meta_win = +altwin(meta_win) + altwin:left_meta_win = +altwin(left_meta_win) ++ altwin:super_win = +altwin(super_win) + altwin:hyper_win = +altwin(hyper_win) + altwin:alt_super_win = +altwin(alt_super_win) + altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin) +diff --git a/rules/base.xml.in b/rules/base.xml.in +index 82c301c..9ebb319 100644 +--- a/rules/base.xml.in ++++ b/rules/base.xml.in +@@ -4896,6 +4896,12 @@ + </option> + <option> + <configItem> ++ <name>altwin:super_win</name> ++ <_description>Super is mapped to Win keys</_description> ++ </configItem> ++ </option> ++ <option> ++ <configItem> + <name>altwin:hyper_win</name> + <_description>Hyper is mapped to Win-keys</_description> + </configItem> +diff --git a/symbols/altwin b/symbols/altwin +index d0154f2..868d941 100644 +--- a/symbols/altwin ++++ b/symbols/altwin +@@ -52,6 +52,13 @@ xkb_symbols "left_meta_win" { + }; + + partial modifier_keys ++xkb_symbols "super_win" { ++ key <LWIN> { [ Super_L ] }; ++ key <RWIN> { [ Super_R ] }; ++ modifier_map Mod4 { Super_L, Super_R }; ++}; ++ ++partial modifier_keys + xkb_symbols "hyper_win" { + key <LWIN> { [ Hyper_L ] }; + key <RWIN> { [ Hyper_R ] }; +diff --git a/symbols/pc b/symbols/pc +index 9f3da66..ff3915e 100644 +--- a/symbols/pc ++++ b/symbols/pc +@@ -32,13 +32,11 @@ xkb_symbols "pc105" { + key <LCTL> { [ Control_L ] }; + + key <LWIN> { [ Super_L ] }; +- modifier_map Mod4 { <LWIN> }; + + key <RTSH> { [ Shift_R ] }; + key <RCTL> { [ Control_R ] }; + + key <RWIN> { [ Super_R ] }; +- modifier_map Mod4 { <RWIN> }; + + key <MENU> { [ Menu ] }; + +-- +1.6.4 + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
