[arch-commits] Commit in xkeyboard-config/trunk (2 files)
Date: Thursday, October 8, 2020 @ 16:19:25 Author: andyrtr Revision: 397575 upgpkg: xkeyboard-config 2.31-1: upstream update 2.31 Modified: xkeyboard-config/trunk/PKGBUILD Deleted: xkeyboard-config/trunk/fix_symbols_syntax_error.diff ---+ PKGBUILD | 18 +- fix_symbols_syntax_error.diff | 13 - 2 files changed, 5 insertions(+), 26 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-10-08 16:14:36 UTC (rev 397574) +++ PKGBUILD2020-10-08 16:19:25 UTC (rev 397575) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot pkgname=xkeyboard-config -pkgver=2.30 -pkgrel=2 +pkgver=2.31 +pkgrel=1 pkgdesc="X keyboard configuration files" arch=(any) license=('custom') @@ -13,20 +13,12 @@ provides=('xkbdata') replaces=('xkbdata') conflicts=('xkbdata') -source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} -fix_symbols_syntax_error.diff) +source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) " -sha512sums=('2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4' -'SKIP' - 'b8463f877f671be5ebf5b1baf1f5c287a14f57de56cc67ea71c6094b40b501c12fbbab3d6cb79926aac80546919a74d0fb77a13ea1a58791a968ee1a1bbe25f6') +sha512sums=('f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669' +'SKIP') -prepare() { - cd ${pkgname}-${pkgver} - # FS#66898 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/212 - patch -Np1 -i ../fix_symbols_syntax_error.diff -} - build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ Deleted: fix_symbols_syntax_error.diff === --- fix_symbols_syntax_error.diff 2020-10-08 16:14:36 UTC (rev 397574) +++ fix_symbols_syntax_error.diff 2020-10-08 16:19:25 UTC (rev 397575) @@ -1,13 +0,0 @@ -diff --git a/symbols/in b/symbols/in -index 3ca78a20664d803d92e87315b6372909f31594e8..b3a5ca9ef613876b668a521a8f464596ab835d9e 100644 a/symbols/in -+++ b/symbols/in -@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" { - key { [ period, U0964, U0965, U093d ] }; - key { [ U092f, question, slash, question ] }; - }; --=== -+ - // EXTRAS: - - // Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit.
[arch-commits] Commit in xkeyboard-config/trunk (2 files)
Date: Thursday, June 18, 2020 @ 08:10:41 Author: andyrtr Revision: 389491 upgpkg: xkeyboard-config 2.30-2: apply upstream fix solving a git conflict leading to broken layout - FS#67024 Added: xkeyboard-config/trunk/fix_symbols_syntax_error.diff Modified: xkeyboard-config/trunk/PKGBUILD ---+ PKGBUILD | 14 +++--- fix_symbols_syntax_error.diff | 13 + 2 files changed, 24 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-06-18 01:09:31 UTC (rev 389490) +++ PKGBUILD2020-06-18 08:10:41 UTC (rev 389491) @@ -3,7 +3,7 @@ pkgname=xkeyboard-config pkgver=2.30 -pkgrel=1 +pkgrel=2 pkgdesc="X keyboard configuration files" arch=(any) license=('custom') @@ -13,12 +13,20 @@ provides=('xkbdata') replaces=('xkbdata') conflicts=('xkbdata') -source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} +fix_symbols_syntax_error.diff) validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) " sha512sums=('2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4' -'SKIP') +'SKIP' + 'b8463f877f671be5ebf5b1baf1f5c287a14f57de56cc67ea71c6094b40b501c12fbbab3d6cb79926aac80546919a74d0fb77a13ea1a58791a968ee1a1bbe25f6') +prepare() { + cd ${pkgname}-${pkgver} + # FS#66898 / https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/212 + patch -Np1 -i ../fix_symbols_syntax_error.diff +} + build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ Added: fix_symbols_syntax_error.diff === --- fix_symbols_syntax_error.diff (rev 0) +++ fix_symbols_syntax_error.diff 2020-06-18 08:10:41 UTC (rev 389491) @@ -0,0 +1,13 @@ +diff --git a/symbols/in b/symbols/in +index 3ca78a20664d803d92e87315b6372909f31594e8..b3a5ca9ef613876b668a521a8f464596ab835d9e 100644 +--- a/symbols/in b/symbols/in +@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" { + key { [ period, U0964, U0965, U093d ] }; + key { [ U092f, question, slash, question ] }; + }; +-=== ++ + // EXTRAS: + + // Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit.
[arch-commits] Commit in xkeyboard-config/trunk (2 files)
Date: Sunday, April 22, 2018 @ 11:07:45 Author: andyrtr Revision: 322781 upgpkg: xkeyboard-config 2.23.1-3 fix mapping for KEY_RFKILL and KEY_WWAN; FS#58261 Added: xkeyboard-config/trunk/0002_map_rfkill_wwan_to_xf86.diff Modified: xkeyboard-config/trunk/PKGBUILD ---+ 0002_map_rfkill_wwan_to_xf86.diff | 46 PKGBUILD | 10 +-- 2 files changed, 53 insertions(+), 3 deletions(-) Added: 0002_map_rfkill_wwan_to_xf86.diff === --- 0002_map_rfkill_wwan_to_xf86.diff (rev 0) +++ 0002_map_rfkill_wwan_to_xf86.diff 2018-04-22 11:07:45 UTC (rev 322781) @@ -0,0 +1,46 @@ +From 39927132729bcd8569716f4ccd3a2e3eadfaf186 Mon Sep 17 00:00:00 2001 +From: Benjamin Berg+Date: Mon, 8 May 2017 15:54:46 +0200 +Subject: Map evdev keycodes KEY_RFKILL and KEY_WWAN to XF86RFKill and XF86WWAN + +In particular KEY_RFKILL is required for properly handling airplane mode +in userspace. + +https://bugs.freedesktop.org/show_bug.cgi?id=100970 +--- + keycodes/evdev | 2 ++ + symbols/inet | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/keycodes/evdev b/keycodes/evdev +index 624ac68..51a6e26 100644 +--- a/keycodes/evdev b/keycodes/evdev +@@ -281,6 +281,8 @@ default xkb_keycodes "evdev" { += 251; // #define KEY_BRIGHTNESS_CYCLE243 += 252; // #define KEY_BRIGHTNESS_ZERO 244 += 253; // #define KEY_DISPLAY_OFF 245 ++ = 254; // #define KEY_WWAN246 ++ = 255; // #define KEY_RFKILL 247 + + // Fake keycodes for virtual keys += 92; +diff --git a/symbols/inet b/symbols/inet +index 5403e77..2934b65 100644 +--- a/symbols/inet b/symbols/inet +@@ -215,8 +215,8 @@ xkb_symbols "evdev" { + // key{ [ ] }; // KEY_BRIGHTNESS_CYCLE -- bright up, max++ == min + // key{ [ ] }; // KEY_BRIGHTNESS_ZERO -- brightness off + // key{ [ ] }; // KEY_DISPLAY_OFF -- turn off display +-// key{ [ ] }; // KEY_WIMAX +-key{ [ XF86Hibernate ] }; // KEY_HIBERNATE ++key{ [ XF86WWAN ] }; // KEY_WWAN ++key{ [ XF86RFKill] }; // KEY_RFKILL + + key{ [ XF86Tools ] }; + key{ [ XF86Launch5 ] }; +-- +cgit v1.1 + + Modified: PKGBUILD === --- PKGBUILD2018-04-22 08:17:40 UTC (rev 322780) +++ PKGBUILD2018-04-22 11:07:45 UTC (rev 322781) @@ -4,7 +4,7 @@ pkgname=xkeyboard-config pkgver=2.23.1 -pkgrel=2 +pkgrel=3 pkgdesc="X keyboard configuration files" arch=(any) license=('custom') @@ -14,16 +14,20 @@ replaces=('xkbdata') conflicts=('xkbdata') source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} -0001-Fix-typo-in-Polish-symbols-file.patch) +0001-Fix-typo-in-Polish-symbols-file.patch +0002_map_rfkill_wwan_to_xf86.diff) validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) " sha512sums=('d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba' 'SKIP' - '2c9a846a0eae6f208cd6be5aa92d69b0b7d1ffc2fe0f98af22f3b62cd73105ff63862d9a2b5719d6b0c5c035b7839faf4e88da5e0c6a336663afede41802381c') + '2c9a846a0eae6f208cd6be5aa92d69b0b7d1ffc2fe0f98af22f3b62cd73105ff63862d9a2b5719d6b0c5c035b7839faf4e88da5e0c6a336663afede41802381c' + '1a0538f9ab4ba9c15d6f697a1ecc023acffa1eec30cd90182006087802d2bceb1d44bcbd7113654ed72da300ab636726ce2a7858c03a1bdedf6f4f8bd670d94f') prepare() { cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}/0001-Fix-typo-in-Polish-symbols-file.patch" + # FS#58261, https://bugs.freedesktop.org/show_bug.cgi?id=100970 + patch -p1 -i "${srcdir}/0002_map_rfkill_wwan_to_xf86.diff" } build() {
[arch-commits] Commit in xkeyboard-config/trunk (2 files)
Date: Sunday, February 4, 2018 @ 15:06:21 Author: bpiotrowski Revision: 315859 2.23.1-2: backport commit that fixes entering Polish symbols Added: xkeyboard-config/trunk/0001-Fix-typo-in-Polish-symbols-file.patch Modified: xkeyboard-config/trunk/PKGBUILD + 0001-Fix-typo-in-Polish-symbols-file.patch | 25 + PKGBUILD | 13 ++--- 2 files changed, 35 insertions(+), 3 deletions(-) Added: 0001-Fix-typo-in-Polish-symbols-file.patch === --- 0001-Fix-typo-in-Polish-symbols-file.patch (rev 0) +++ 0001-Fix-typo-in-Polish-symbols-file.patch 2018-02-04 15:06:21 UTC (rev 315859) @@ -0,0 +1,25 @@ +From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001 +From: Gunnar Hjalmarsson+Date: Thu, 1 Feb 2018 15:37:46 +0100 +Subject: [PATCH] Fix typo in Polish symbols file + +https://bugs.freedesktop.org/show_bug.cgi?id=104904 +--- + symbols/pl | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/symbols/pl b/symbols/pl +index 52e7959..800cb85 100644 +--- a/symbols/pl b/symbols/pl +@@ -497,7 +497,6 @@ partial alphanumeric_keys +include "sun_vndr/pl(sun_type6)" + }; + +--- + //Glagolica + partial alphanumeric_keys + xkb_symbols "glagolica" +-- +2.16.1 + Modified: PKGBUILD === --- PKGBUILD2018-02-04 13:16:11 UTC (rev 315858) +++ PKGBUILD2018-02-04 15:06:21 UTC (rev 315859) @@ -4,7 +4,7 @@ pkgname=xkeyboard-config pkgver=2.23.1 -pkgrel=1 +pkgrel=2 pkgdesc="X keyboard configuration files" arch=(any) license=('custom') @@ -13,12 +13,19 @@ provides=('xkbdata') replaces=('xkbdata') conflicts=('xkbdata') -source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} +0001-Fix-typo-in-Polish-symbols-file.patch) validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) " sha512sums=('d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba' -'SKIP') +'SKIP' + '2c9a846a0eae6f208cd6be5aa92d69b0b7d1ffc2fe0f98af22f3b62cd73105ff63862d9a2b5719d6b0c5c035b7839faf4e88da5e0c6a336663afede41802381c') +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/0001-Fix-typo-in-Polish-symbols-file.patch" +} + build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr \
[arch-commits] Commit in xkeyboard-config/trunk (2 files)
Date: Wednesday, May 28, 2014 @ 21:24:33 Author: andyrtr Revision: 213729 upgpkg: xkeyboard-config 2.12-1 upstream update 2.12 Modified: xkeyboard-config/trunk/PKGBUILD Deleted: xkeyboard-config/trunk/revert-comma-in-keypad.patch --+ PKGBUILD | 17 - revert-comma-in-keypad.patch | 39 --- 2 files changed, 4 insertions(+), 52 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-05-28 19:18:31 UTC (rev 213728) +++ PKGBUILD2014-05-28 19:24:33 UTC (rev 213729) @@ -3,8 +3,8 @@ # Maintainer: Jan de Groot j...@archlinux.org pkgname=xkeyboard-config -pkgver=2.11 -pkgrel=2 +pkgver=2.12 +pkgrel=1 pkgdesc=X keyboard configuration files arch=(any) license=('custom') @@ -13,18 +13,9 @@ provides=('xkbdata') replaces=('xkbdata') conflicts=('xkbdata') -source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2 -revert-comma-in-keypad.patch) -sha256sums=('e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76' -'05b22863ddb1de64575b56714ebd693f2ea639b7a4ae15e25c9a1f0d14dba817') +source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44') -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - - # fix FS#38743 , not merged upstream - patch -Np1 -i../revert-comma-in-keypad.patch -} - build() { cd ${srcdir}/${pkgname}-${pkgver} Deleted: revert-comma-in-keypad.patch === --- revert-comma-in-keypad.patch2014-05-28 19:18:31 UTC (rev 213728) +++ revert-comma-in-keypad.patch2014-05-28 19:24:33 UTC (rev 213729) @@ -1,39 +0,0 @@ -diff --git a/symbols/fr b/symbols/fr -index 9c89db8..3898b1c 100644 a/symbols/fr -+++ b/symbols/fr -@@ -36,8 +36,6 @@ xkb_symbols basic { - key AB09{ [ colon, slash, periodcentered, division ] }; - key AB10{ [exclam,section, dead_belowdot, dead_abovedot ] }; - --include kpdl(comma) -- - include level3(ralt_switch) - }; - -diff --git a/symbols/it b/symbols/it -index 8a66a30..2673cf9 100644 a/symbols/it -+++ b/symbols/it -@@ -33,8 +33,6 @@ xkb_symbols basic { - - key LSGT{ [ less,greater,guillemotleft,guillemotright] }; - --include kpdl(comma) -- - include level3(ralt_switch) - }; - -diff --git a/symbols/nl b/symbols/nl -index 1dde405..76cb018 100644 a/symbols/nl -+++ b/symbols/nl -@@ -49,8 +49,6 @@ xkb_symbols basic { - - key LSGT{ [bracketright, bracketleft, bar,brokenbar ] }; - --include kpdl(comma) -- - include level3(ralt_switch) - }; -
[arch-commits] Commit in xkeyboard-config/trunk (2 files)
Date: Tuesday, February 4, 2014 @ 13:15:30 Author: lcarlier Revision: 205078 upgpkg: xkeyboard-config 2.11-2 Fix comma instead of dot in the keypad (FS#38743) Added: xkeyboard-config/trunk/revert-comma-in-keypad.patch Modified: xkeyboard-config/trunk/PKGBUILD --+ PKGBUILD | 18 +++--- revert-comma-in-keypad.patch | 39 +++ 2 files changed, 54 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-02-04 11:41:13 UTC (rev 205077) +++ PKGBUILD2014-02-04 12:15:30 UTC (rev 205078) @@ -4,7 +4,7 @@ pkgname=xkeyboard-config pkgver=2.11 -pkgrel=1 +pkgrel=2 pkgdesc=X keyboard configuration files arch=(any) license=('custom') @@ -13,11 +13,21 @@ provides=('xkbdata') replaces=('xkbdata') conflicts=('xkbdata') -source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76') +source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +revert-comma-in-keypad.patch) +sha256sums=('e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76' +'05b22863ddb1de64575b56714ebd693f2ea639b7a4ae15e25c9a1f0d14dba817') +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # fix FS#38743 , not merged upstream + patch -Np1 -i../revert-comma-in-keypad.patch +} + build() { cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ --with-xkb-base=/usr/share/X11/xkb \ --with-xkb-rules-symlink=xorg \ @@ -27,8 +37,10 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install rm -f ${pkgdir}/usr/share/X11/xkb/compiled + install -m755 -d ${pkgdir}/var/lib/xkb install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ Added: revert-comma-in-keypad.patch === --- revert-comma-in-keypad.patch(rev 0) +++ revert-comma-in-keypad.patch2014-02-04 12:15:30 UTC (rev 205078) @@ -0,0 +1,39 @@ +diff --git a/symbols/fr b/symbols/fr +index 9c89db8..3898b1c 100644 +--- a/symbols/fr b/symbols/fr +@@ -36,8 +36,6 @@ xkb_symbols basic { + key AB09{ [ colon, slash, periodcentered, division ] }; + key AB10{ [exclam,section, dead_belowdot, dead_abovedot ] }; + +-include kpdl(comma) +- + include level3(ralt_switch) + }; + +diff --git a/symbols/it b/symbols/it +index 8a66a30..2673cf9 100644 +--- a/symbols/it b/symbols/it +@@ -33,8 +33,6 @@ xkb_symbols basic { + + key LSGT{ [ less,greater,guillemotleft,guillemotright] }; + +-include kpdl(comma) +- + include level3(ralt_switch) + }; + +diff --git a/symbols/nl b/symbols/nl +index 1dde405..76cb018 100644 +--- a/symbols/nl b/symbols/nl +@@ -49,8 +49,6 @@ xkb_symbols basic { + + key LSGT{ [bracketright, bracketleft, bar,brokenbar ] }; + +-include kpdl(comma) +- + include level3(ralt_switch) + }; +