[arch-commits] Commit in xkeyboard-config/trunk (2 files)

[Laurent Carlier]

    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
===================================================================
--- PKGBUILD	2014-02-04 11:41:13 UTC (rev 205077)
+++ PKGBUILD	2014-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.patch	2014-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)"
+ };
+