[arch-commits] Commit in xkeyboard-config/repos/extra-any (3 files)

[Laurent Carlier]

    Date: Tuesday, February 4, 2014 @ 13:15:37
  Author: lcarlier
Revision: 205079

archrelease: copy trunk to extra-any

Added:
  xkeyboard-config/repos/extra-any/PKGBUILD
    (from rev 205078, xkeyboard-config/trunk/PKGBUILD)
  xkeyboard-config/repos/extra-any/revert-comma-in-keypad.patch
    (from rev 205078, xkeyboard-config/trunk/revert-comma-in-keypad.patch)
Deleted:
  xkeyboard-config/repos/extra-any/PKGBUILD

------------------------------+
 PKGBUILD                     |   82 +++++++++++++++++++++++------------------
 revert-comma-in-keypad.patch |   39 +++++++++++++++++++
 2 files changed, 86 insertions(+), 35 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-04 12:15:30 UTC (rev 205078)
+++ PKGBUILD	2014-02-04 12:15:37 UTC (rev 205079)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=xkeyboard-config
-pkgver=2.11
-pkgrel=1
-pkgdesc="X keyboard configuration files"
-arch=(any)
-license=('custom')
-url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-makedepends=('intltool' 'xorg-xkbcomp')
-provides=('xkbdata')
-replaces=('xkbdata')
-conflicts=('xkbdata')
-source=(http://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e7125460892c2b5c3a8d843cb18c24b60c46051e925c2888a61fa672a2f76d76')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb \
-      --with-xkb-rules-symlink=xorg \
-      --enable-compat-rules=yes
-  make
- }
- 
- 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}/"
-}

Copied: xkeyboard-config/repos/extra-any/PKGBUILD (from rev 205078, xkeyboard-config/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-02-04 12:15:37 UTC (rev 205079)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=xkeyboard-config
+pkgver=2.11
+pkgrel=2
+pkgdesc="X keyboard configuration files"
+arch=(any)
+license=('custom')
+url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+makedepends=('intltool' 'xorg-xkbcomp')
+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')
+
+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 \
+      --enable-compat-rules=yes
+  make
+ }
+ 
+ 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}/"
+}

Copied: xkeyboard-config/repos/extra-any/revert-comma-in-keypad.patch (from rev 205078, xkeyboard-config/trunk/revert-comma-in-keypad.patch)
===================================================================
--- revert-comma-in-keypad.patch	                        (rev 0)
+++ revert-comma-in-keypad.patch	2014-02-04 12:15:37 UTC (rev 205079)
@@ -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)"
+ };
+