[arch-commits] Commit in kbd/repos/testing-x86_64 (6 files)

Antonio Rojas arojas at archlinux.org
Tue Aug 27 13:48:22 UTC 2019


    Date: Tuesday, August 27, 2019 @ 13:48:22
  Author: arojas
Revision: 361275

archrelease: copy trunk to testing-x86_64

Added:
  kbd/repos/testing-x86_64/PKGBUILD
    (from rev 361274, kbd/trunk/PKGBUILD)
  kbd/repos/testing-x86_64/fix-euro2.patch
    (from rev 361274, kbd/trunk/fix-euro2.patch)
Deleted:
  kbd/repos/testing-x86_64/PKGBUILD
  kbd/repos/testing-x86_64/fix-dvorak-es.patch
  kbd/repos/testing-x86_64/fix-euro2.patch
  kbd/repos/testing-x86_64/fix-keymap-loading-1.15.5.patch

---------------------------------+
 PKGBUILD                        |  108 ++++++++++++++++++++------------------
 fix-dvorak-es.patch             |   11 ---
 fix-euro2.patch                 |   18 +++---
 fix-keymap-loading-1.15.5.patch |   47 ----------------
 4 files changed, 68 insertions(+), 116 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-27 13:48:00 UTC (rev 361274)
+++ PKGBUILD	2019-08-27 13:48:22 UTC (rev 361275)
@@ -1,49 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=kbd
-pkgver=2.2.0
-pkgrel=1
-pkgdesc="Keytable files and keyboard utilities"
-arch=('x86_64')
-url="http://www.kbd-project.org"
-license=('GPL')
-depends=('glibc' 'pam')
-makedepends=('check')
-source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
-https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
-        'fix-euro2.patch')
-provides=('vlock')
-conflicts=('vlock')
-replaces=('vlock')
-validpgpkeys=(
-              '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
-             )
-
-prepare() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # rename keymap files with the same names
-  # this is needed because when only name of keymap is specified
-  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
-  # this should be removed when upstream adopts the change
-  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
-  mv data/keymaps/i386/olpc/es{,-olpc}.map
-  mv data/keymaps/i386/olpc/pt{,-olpc}.map
-  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
-  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
-  # fix euro2 #28213
-  patch -Np1 -i ../fix-euro2.patch
-}
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
-}
-md5sums=('5b07c5cf73f2a2bdff5a489368969f70'
-         'SKIP'
-         'd869200acbc0aab6a9cafa43cb140d4e')

Copied: kbd/repos/testing-x86_64/PKGBUILD (from rev 361274, kbd/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-08-27 13:48:22 UTC (rev 361275)
@@ -0,0 +1,59 @@
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=kbd
+pkgver=2.2.0
+pkgrel=2
+pkgdesc="Keytable files and keyboard utilities"
+arch=('x86_64')
+url="http://www.kbd-project.org"
+license=('GPL')
+depends=('glibc' 'pam')
+makedepends=('check' 'git')
+#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.gz
+#        https://www.kernel.org/pub/linux/utils/kbd/${pkgname}-${pkgver}.tar.sign
+source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver
+        'fix-euro2.patch'
+        kbd-dont-override-cflags.patch::"https://github.com/legionus/kbd/commit/15a74479.patch"
+        kbd-31.patch::"https://github.com/legionus/kbd/commit/acf93e44.patch"
+        kbd-32.patch::"https://github.com/legionus/kbd/commit/7e27102b.patch")
+provides=('vlock')
+conflicts=('vlock')
+replaces=('vlock')
+md5sums=('SKIP'
+         'd869200acbc0aab6a9cafa43cb140d4e'
+         'f33bf61aa3e57befa0408c7578c81c7d'
+         '9e515a98f7ee1a2c1562c0e93467fa6d'
+         '9fc8d774887a55a7e4bc79240a2986c5')
+validpgpkeys=(
+              '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
+             )
+
+prepare() {
+  cd ${srcdir}/${pkgname}
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
+  # fix euro2 #28213
+  patch -Np1 -i ../fix-euro2.patch
+  git cherry-pick -n 15a74479 # Don't override CFLAGS
+  git cherry-pick -n acf93e44 # https://github.com/legionus/kbd/issues/31
+  git cherry-pick -n 7e27102b # https://github.com/legionus/kbd/issues/32
+  autoreconf -if
+}
+
+build() {
+  cd ${pkgname}
+  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
+}
+
+package() {
+  cd ${pkgname}
+  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
+}

Deleted: fix-dvorak-es.patch
===================================================================
--- fix-dvorak-es.patch	2019-08-27 13:48:00 UTC (rev 361274)
+++ fix-dvorak-es.patch	2019-08-27 13:48:22 UTC (rev 361275)
@@ -1,11 +0,0 @@
---- kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map.old	2013-05-08 14:58:03.393349828 +0200
-+++ kbd-1.15.5/data/keymaps/i386/dvorak/dvorak-es.map	2013-05-08 14:58:20.206415053 +0200
-@@ -4,7 +4,7 @@
- 
- keymaps 0-2,4,5,6,8-10,12,14
- include "linux-with-alt-and-altgr"
--include "euro"
-+include "euro.map"
- strings as usual
- 
- keycode   1 = Escape

Deleted: fix-euro2.patch
===================================================================
--- fix-euro2.patch	2019-08-27 13:48:00 UTC (rev 361274)
+++ fix-euro2.patch	2019-08-27 13:48:22 UTC (rev 361275)
@@ -1,9 +0,0 @@
---- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old	2013-05-08 15:00:25.917752313 +0200
-+++ kbd-1.15.5/data/keymaps/i386/include/euro2.map	2013-05-08 15:00:54.943957367 +0200
-@@ -2,5 +2,5 @@
- # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
- #  on the positions where many keyboards have E and C.
- #  To get it displayed, use a latin0 (i.e., latin9) font.]
--altgr keycode  18 = currency
-+altgr keycode  18 = euro
- altgr keycode  46 = cent

Copied: kbd/repos/testing-x86_64/fix-euro2.patch (from rev 361274, kbd/trunk/fix-euro2.patch)
===================================================================
--- fix-euro2.patch	                        (rev 0)
+++ fix-euro2.patch	2019-08-27 13:48:22 UTC (rev 361275)
@@ -0,0 +1,9 @@
+--- kbd-1.15.5/data/keymaps/i386/include/euro2.map.old	2013-05-08 15:00:25.917752313 +0200
++++ kbd-1.15.5/data/keymaps/i386/include/euro2.map	2013-05-08 15:00:54.943957367 +0200
+@@ -2,5 +2,5 @@
+ # [Say: "loadkeys euro2" to get Euro and cent with AltGr (right alt)
+ #  on the positions where many keyboards have E and C.
+ #  To get it displayed, use a latin0 (i.e., latin9) font.]
+-altgr keycode  18 = currency
++altgr keycode  18 = euro
+ altgr keycode  46 = cent

Deleted: fix-keymap-loading-1.15.5.patch
===================================================================
--- fix-keymap-loading-1.15.5.patch	2019-08-27 13:48:00 UTC (rev 361274)
+++ fix-keymap-loading-1.15.5.patch	2019-08-27 13:48:22 UTC (rev 361275)
@@ -1,47 +0,0 @@
-commit 7e06e56157e8431d02e1377cdc44230944203d88
-Author: Alexey Gladkov <gladkov.alexey at gmail.com>
-Date:   Tue Dec 11 14:24:44 2012 +0400
-
-    Fix regression in 16117ce6ab
-    
-    Signed-off-by: Alexey Gladkov <gladkov.alexey at gmail.com>
-
-diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
-index c18dcea..f817c78 100644
---- a/src/loadkeys.analyze.l
-+++ b/src/loadkeys.analyze.l
-@@ -307,8 +307,10 @@ To                      to|To|TO
- 				char *s = xstrndup(yytext+1, strlen(yytext)-2);
- 				/* use static pathname to store *s ? */
- 				open_include(s);
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 			}
- <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol}	{
- 				yyerror(_("expected filename between quotes"));
-@@ -323,7 +325,7 @@ To                      to|To|TO
- 			}
- {Eol}			{
- 				line_nr++;
--				if (state_ptr > 0) {
-+				while (state_ptr > 0) {
- 					yy_pop_state();
- 					state_ptr--;
- 				}
-@@ -428,8 +430,10 @@ To                      to|To|TO
- 			}
- <STR>\"			{
- 				*p = '\0';
--				yy_pop_state();
--				state_ptr--;
-+				while (state_ptr > 0) {
-+					yy_pop_state();
-+					state_ptr--;
-+				}
- 				return(STRLITERAL);
- 			}
- .			{


More information about the arch-commits mailing list