diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-23 10:38:46 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-23 10:45:11 +0000 |
| commit | cb3c2490e087dda82aab5cf1366c9004aaf98101 (patch) | |
| tree | eb22fc136b493fcce8ad9b509c95c04793f46674 | |
| parent | 84c9304e062ef20b29f2854e210a95be435edddd (diff) | |
| download | aports-cb3c2490e087dda82aab5cf1366c9004aaf98101.tar.bz2 aports-cb3c2490e087dda82aab5cf1366c9004aaf98101.tar.xz | |
main/xkeyboard-config: upgrade to 2.5
| -rw-r--r-- | main/xkeyboard-config/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch | 76 | ||||
| -rw-r--r-- | main/xkeyboard-config/APKBUILD | 8 |
2 files changed, 3 insertions, 81 deletions
diff --git a/main/xkeyboard-config/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch b/main/xkeyboard-config/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch deleted file mode 100644 index 8d788acadf..0000000000 --- a/main/xkeyboard-config/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Thu, 19 Jan 2012 16:36:16 +1100 -Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option - -Similar to how we put the Terminate mapping behind an option rather than -enabling it by default, put the ClearGrab/CloseGrab action handlers -behind an option too, so we don't ship 'break my screensaver'. Oops. - -Signed-off-by: Daniel Stone <daniel@fooishbar.org> ---- - compat/xfree86 | 15 +++++++++------ - rules/base.o_c.part | 1 + - rules/base.xml.in | 6 ++++++ - 3 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/compat/xfree86 b/compat/xfree86 -index cf4a8b2..52e661d 100644 ---- a/compat/xfree86 -+++ b/compat/xfree86 -@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic" { - action = SwitchScreen(Screen=12, !SameServer); - }; - -- interpret XF86_Ungrab { -- action = Private(type=0x86, data="Ungrab"); -- }; -- interpret XF86_ClearGrab { -- action = Private(type=0x86, data="ClsGrb"); -- }; - interpret XF86LogGrabInfo { - action = Private(type=0x86, data="PrGrbs"); - }; -@@ -61,3 +55,12 @@ default partial xkb_compatibility "basic" { - action = Private(type=0x86, data="-VMode"); - }; - }; -+ -+partial xkb_compatibility "grab_break" { -+ interpret XF86_Ungrab { -+ action = Private(type=0x86, data="Ungrab"); -+ }; -+ interpret XF86_ClearGrab { -+ action = Private(type=0x86, data="ClsGrb"); -+ }; -+}; -diff --git a/rules/base.o_c.part b/rules/base.o_c.part -index 352f8b3..b80ab6d 100644 ---- a/rules/base.o_c.part -+++ b/rules/base.o_c.part -@@ -3,4 +3,5 @@ - grp_led:scroll = +ledscroll(group_lock) - japan:kana_lock = +japan(kana_lock) - caps:shiftlock = +ledcaps(shift_lock) -+ grab:break_actions = +xfree86(grab_break) - -diff --git a/rules/base.xml.in b/rules/base.xml.in -index 22b720f..6c17faa 100644 ---- a/rules/base.xml.in -+++ b/rules/base.xml.in -@@ -6278,6 +6278,12 @@ - <_description>Toggle PointerKeys with Shift + NumLock.</_description> - </configItem> - </option> -+ <option> -+ <configItem> -+ <name>grab:break_actions</name> -+ <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description> -+ </configItem> -+ </option> - </group> - <group allowMultipleSelection="true"> - <!-- Special shortcuts for the Euro character --> --- -1.7.8.3 - diff --git a/main/xkeyboard-config/APKBUILD b/main/xkeyboard-config/APKBUILD index ae367faecf..bb1f76fcef 100644 --- a/main/xkeyboard-config/APKBUILD +++ b/main/xkeyboard-config/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xkeyboard-config -pkgver=2.4.1 -pkgrel=1 +pkgver=2.5 +pkgrel=0 pkgdesc="X keyboard configuration files" url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" arch="noarch" @@ -10,7 +10,6 @@ depends= subpackages= makedepends="xkbcomp intltool libx11-dev" source="http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config-$pkgver.tar.bz2 - 0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch " prepare() { @@ -39,5 +38,4 @@ package() { install -m755 -d "$pkgdir"/var/lib/xkb install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } -md5sums="9f6d7a37fd192264a3ca07ede5d183c3 xkeyboard-config-2.4.1.tar.bz2 -6033b73a3864e301e6e916fec89b2e3c 0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch" +md5sums="8cd1d7e074a810ef21b09ea963c43ad3 xkeyboard-config-2.5.tar.bz2" |