[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Tobias Powalowski]

    Date: Tuesday, July 21, 2020 @ 12:06:06
  Author: tpowa
Revision: 392322

upgpkg: kbd 2.3.0-1: bump to latest version

Modified:
  kbd/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-21 10:43:38 UTC (rev 392321)
+++ PKGBUILD	2020-07-21 12:06:06 UTC (rev 392322)
@@ -1,8 +1,8 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kbd
-pkgver=2.2.0
-pkgrel=5
+pkgver=2.3.0
+pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
 arch=('x86_64')
 url="http://www.kbd-project.org"
@@ -12,14 +12,12 @@
 #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-fix-loadkmap-compat.patch')
+        'fix-euro2.patch')
 provides=('vlock')
 conflicts=('vlock')
 replaces=('vlock')
-md5sums=('SKIP'
-         'd869200acbc0aab6a9cafa43cb140d4e'
-         '98f634bf1771834cdb94bc44aa2636ee')
+sha256sums=('SKIP'
+            'a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8')
 validpgpkeys=(
               '7F2A3D07298149A0793C9A4EA45ABA544CFFD434' #Alexey Gladkov 
              )
@@ -37,10 +35,6 @@
   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
-  patch -p1 -i ../kbd-fix-loadkmap-compat.patch # Restore compatibility with busybox loadkmap
   autoreconf -if
 }