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

2020-10-08 Thread Andreas Radke via arch-commits 
Date: Thursday, October 8, 2020 @ 16:19:30
  Author: andyrtr
Revision: 397576

archrelease: copy trunk to extra-any

Added:
  xkeyboard-config/repos/extra-any/PKGBUILD
(from rev 397575, xkeyboard-config/trunk/PKGBUILD)
Deleted:
  xkeyboard-config/repos/extra-any/PKGBUILD
  xkeyboard-config/repos/extra-any/fix_symbols_syntax_error.diff

---+
 PKGBUILD  |   88 ++--
 fix_symbols_syntax_error.diff |   13 -
 2 files changed, 40 insertions(+), 61 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2020-10-08 16:19:25 UTC (rev 397575)
+++ PKGBUILD2020-10-08 16:19:30 UTC (rev 397576)
@@ -1,48 +0,0 @@
-# Maintainer: Andreas Radke 
-# Maintainer: Jan de Groot 
-
-pkgname=xkeyboard-config
-pkgver=2.30
-pkgrel=2
-pkgdesc="X keyboard configuration files"
-arch=(any)
-license=('custom')
-# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
-url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig;
-makedepends=('intltool' 'xorg-xkbcomp' 'libxslt' 'python')
-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)
-validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
-validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov 
(For GNOME-related tasks) "
-sha512sums=('2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4'
-'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 \
-  --with-xkb-base=/usr/share/X11/xkb \
-  --with-xkb-rules-symlink=xorg \
-  --enable-compat-rules=yes
-  make
- }
- 
- package() { 
-  cd ${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 397575, 
xkeyboard-config/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2020-10-08 16:19:30 UTC (rev 397576)
@@ -0,0 +1,40 @@
+# Maintainer: Andreas Radke 
+# Maintainer: Jan de Groot 
+
+pkgname=xkeyboard-config
+pkgver=2.31
+pkgrel=1
+pkgdesc="X keyboard configuration files"
+arch=(any)
+license=('custom')
+# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
+url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig;
+makedepends=('intltool' 'xorg-xkbcomp' 'libxslt' 'python')
+provides=('xkbdata')
+replaces=('xkbdata')
+conflicts=('xkbdata')
+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=('f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669'
+'SKIP')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+  --with-xkb-base=/usr/share/X11/xkb \
+  --with-xkb-rules-symlink=xorg \
+  --enable-compat-rules=yes
+  make
+ }
+ 
+ package() { 
+  cd ${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}/"
+}

Deleted: fix_symbols_syntax_error.diff
===
--- fix_symbols_syntax_error.diff   2020-10-08 16:19:25 UTC (rev 397575)
+++ fix_symbols_syntax_error.diff   2020-10-08 16:19:30 UTC (rev 397576)
@@ -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/repos/extra-any (3 files)

2020-06-18 Thread Andreas Radke via arch-commits 
Date: Thursday, June 18, 2020 @ 08:10:55
  Author: andyrtr
Revision: 389492

archrelease: copy trunk to extra-any

Added:
  xkeyboard-config/repos/extra-any/PKGBUILD
(from rev 389491, xkeyboard-config/trunk/PKGBUILD)
  xkeyboard-config/repos/extra-any/fix_symbols_syntax_error.diff
(from rev 389491, xkeyboard-config/trunk/fix_symbols_syntax_error.diff)
Deleted:
  xkeyboard-config/repos/extra-any/PKGBUILD

---+
 PKGBUILD  |   88 +---
 fix_symbols_syntax_error.diff |   13 +
 2 files changed, 61 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2020-06-18 08:10:41 UTC (rev 389491)
+++ PKGBUILD2020-06-18 08:10:55 UTC (rev 389492)
@@ -1,40 +0,0 @@
-# Maintainer: Andreas Radke 
-# Maintainer: Jan de Groot 
-
-pkgname=xkeyboard-config
-pkgver=2.30
-pkgrel=1
-pkgdesc="X keyboard configuration files"
-arch=(any)
-license=('custom')
-# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
-url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig;
-makedepends=('intltool' 'xorg-xkbcomp' 'libxslt' 'python')
-provides=('xkbdata')
-replaces=('xkbdata')
-conflicts=('xkbdata')
-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')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-  --with-xkb-base=/usr/share/X11/xkb \
-  --with-xkb-rules-symlink=xorg \
-  --enable-compat-rules=yes
-  make
- }
- 
- package() { 
-  cd ${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 389491, 
xkeyboard-config/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2020-06-18 08:10:55 UTC (rev 389492)
@@ -0,0 +1,48 @@
+# Maintainer: Andreas Radke 
+# Maintainer: Jan de Groot 
+
+pkgname=xkeyboard-config
+pkgver=2.30
+pkgrel=2
+pkgdesc="X keyboard configuration files"
+arch=(any)
+license=('custom')
+# https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
+url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig;
+makedepends=('intltool' 'xorg-xkbcomp' 'libxslt' 'python')
+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)
+validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
+validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov 
(For GNOME-related tasks) "
+sha512sums=('2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4'
+'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 \
+  --with-xkb-base=/usr/share/X11/xkb \
+  --with-xkb-rules-symlink=xorg \
+  --enable-compat-rules=yes
+  make
+ }
+ 
+ package() { 
+  cd ${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/fix_symbols_syntax_error.diff (from 
rev 389491, xkeyboard-config/trunk/fix_symbols_syntax_error.diff)
===
--- fix_symbols_syntax_error.diff   (rev 0)
+++ fix_symbols_syntax_error.diff   2020-06-18 08:10:55 UTC (rev 389492)
@@ -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 ] };
+

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

2019-05-30 Thread Andreas Radke via arch-commits 
Date: Friday, May 31, 2019 @ 05:37:34
  Author: andyrtr
Revision: 354551

archrelease: copy trunk to extra-any

Added:
  xkeyboard-config/repos/extra-any/PKGBUILD
(from rev 354550, xkeyboard-config/trunk/PKGBUILD)
Deleted:
  xkeyboard-config/repos/extra-any/PKGBUILD
  xkeyboard-config/repos/extra-any/pt-layout.patch

-+
 PKGBUILD|   86 --
 pt-layout.patch |   85 -
 2 files changed, 39 insertions(+), 132 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2019-05-31 05:37:26 UTC (rev 354550)
+++ PKGBUILD2019-05-31 05:37:34 UTC (rev 354551)
@@ -1,47 +0,0 @@
-# Maintainer: Andreas Radke 
-# Maintainer: Jan de Groot 
-
-pkgname=xkeyboard-config
-pkgver=2.26
-pkgrel=2
-pkgdesc="X keyboard configuration files"
-arch=(any)
-license=('custom')
-url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig;
-makedepends=('intltool' 'xorg-xkbcomp' 'libxslt')
-provides=('xkbdata')
-replaces=('xkbdata')
-conflicts=('xkbdata')
-source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-pt-layout.patch)
-validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145')
-validpgpkeys+=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov 
(For GNOME-related tasks) "
-sha512sums=('5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef'
-'SKIP'
-
'98c8b47e9a36ba3f130454fdd68c508f54b78eb65ddb071ca85bdcc3b324699e51155e3fc425ccae98350bb6430fea4771c0338024c1e06063a54b879bb707db')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # fix broken pt layout - FS#61634
-  patch -Np1 -i ../pt-layout.patch
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-  --with-xkb-base=/usr/share/X11/xkb \
-  --with-xkb-rules-symlink=xorg \
-  --enable-compat-rules=yes
-  make
- }
- 
- package() { 
-  cd ${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 354550, 
xkeyboard-config/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2019-05-31 05:37:34 UTC (rev 354551)
@@ -0,0 +1,39 @@
+# Maintainer: Andreas Radke 
+# Maintainer: Jan de Groot 
+
+pkgname=xkeyboard-config
+pkgver=2.27
+pkgrel=1
+pkgdesc="X keyboard configuration files"
+arch=(any)
+license=('custom')
+url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig;
+makedepends=('intltool' 'xorg-xkbcomp' 'libxslt')
+provides=('xkbdata')
+replaces=('xkbdata')
+conflicts=('xkbdata')
+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=('ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e'
+'SKIP')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+  --with-xkb-base=/usr/share/X11/xkb \
+  --with-xkb-rules-symlink=xorg \
+  --enable-compat-rules=yes
+  make
+ }
+ 
+ package() { 
+  cd ${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}/"
+}

Deleted: pt-layout.patch
===
--- pt-layout.patch 2019-05-31 05:37:26 UTC (rev 354550)
+++ pt-layout.patch 2019-05-31 05:37:34 UTC (rev 354551)
@@ -1,85 +0,0 @@
-From af6c0f29dbee1cc7b280eed891592797c2e31220 Mon Sep 17 00:00:00 2001
-From: Sergey Udaltsov 
-Date: Thu, 7 Feb 2019 20:40:35 +
-Subject: [PATCH] Fixed broken pt layout
-
-Backticks broke it, removed

- symbols/pt | 62 +++---
- 1 file changed, 31 insertions(+), 31 deletions(-)
-
-diff --git a/symbols/pt b/symbols/pt
-index 73a1b7b..3ec0981 100644
 a/symbols/pt
-+++ b/symbols/pt
-@@ -221,35 +221,35 @@ xkb_symbols "colemak" {
- 
- name[Group1]="Portuguese (Colemak)";
- 
--key ``  { [ q,  Q,   at,   Greek_OMEGA ] };
--key ``  { [ w,  W,  lstroke,   Lstroke ] };
--key ``  { [ f,  F,  dstroke,   ordfeminine ] };
--key ``  { [

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

2014-05-28 Thread Andreas Radke 
Date: Wednesday, May 28, 2014 @ 21:24:41
  Author: andyrtr
Revision: 213730

archrelease: copy trunk to extra-any

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

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

Deleted: PKGBUILD
===
--- PKGBUILD2014-05-28 19:24:33 UTC (rev 213729)
+++ PKGBUILD2014-05-28 19:24:41 UTC (rev 213730)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Maintainer: Jan de Groot j...@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/PKGBUILD (from rev 213729, 
xkeyboard-config/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-05-28 19:24:41 UTC (rev 213730)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Maintainer: Jan de Groot j...@archlinux.org
+
+pkgname=xkeyboard-config
+pkgver=2.12
+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=('65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44')
+
+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}/
+}

Deleted: revert-comma-in-keypad.patch
===
--- revert-comma-in-keypad.patch2014-05-28 19:24:33 UTC (rev 213729)
+++ revert-comma-in-keypad.patch2014-05-28 19:24:41 UTC (rev 213730)
@@ -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/repos/extra-any (3 files)

2014-02-04 Thread 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
===
--- PKGBUILD2014-02-04 12:15:30 UTC (rev 205078)
+++ PKGBUILD2014-02-04 12:15:37 UTC (rev 205079)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke andy...@archlinux.org
-# Maintainer: Jan de Groot j...@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)
+++ PKGBUILD2014-02-04 12:15:37 UTC (rev 205079)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Andreas Radke andy...@archlinux.org
+# Maintainer: Jan de Groot j...@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.patch2014-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)
+ };
+

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

2012-01-20 Thread andyrtr 
Date: Friday, January 20, 2012 @ 13:44:12
  Author: andyrtr
Revision: 147012

archrelease: copy trunk to extra-any

Added:
  xkeyboard-config/repos/extra-any/PKGBUILD
(from rev 147011, xkeyboard-config/trunk/PKGBUILD)
Deleted:
  xkeyboard-config/repos/extra-any/PKGBUILD
  xkeyboard-config/repos/extra-any/git-fixes.patch

-+
 PKGBUILD|   77 -
 git-fixes.patch | 2386 --
 2 files changed, 35 insertions(+), 2428 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 147011:147012 to see the changes.