upg xkeyboard-config

xkeyboard-config/PKGBUILD

@@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=xkeyboard-config
-pkgver=2.40
+pkgver=2.41
 pkgrel=01
 pkgdesc="X keyboard configuration files"
 url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
@@ -42,21 +42,21 @@ package() {
   DESTDIR="$pkgdir" ninja -C build install
 
   install -m755 -d "${pkgdir}/var/lib/xkb"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-  #install -m644 ${pkgname}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname-$pkgver/COPYING
+
 }
 
 #---- arch license gpg-key & sha256sums ----
 
 arch=(x86_64)
 
-license=('custom')
+license=('LicenseRef-xkeyboard-config')
 
 ##validpgpkeys=('15CFA5C595041D2CCBEA155F1732AA424A0E86B4') # "Sergey Udaltsov (For GNOME-related tasks) <svu@gnome.org>"
 validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com> 
 
-sha256sums=(7a3dba1bec7dc7191432da021242d17c9cf6c89690e6c57b0de048ff8c9d2ae3  # xkeyboard-config-2.40.tar.xz
-	46bd61d863025ca9c1774753ecc61979f785c0e131cef36f8ab5a5df5fe574b9) # xkeyboard-config-2.40.tar.xz.sig
+sha256sums=(f02cd6b957295e0d50236a3db15825256c92f67ef1f73bf1c77a4b179edf728f  # xkeyboard-config-2.41.tar.xz
+	945321acc02c140e6aab68b02e4048850004d64a70a7c4992543be2e51ea8763) # xkeyboard-config-2.41.tar.xz.sig
+
+##  97ece090b1ed7d747afb7b523e94d939c9f22f4b381a862c522c20fa8ecc93a6  xkeyboard-config-2.41-01-x86_64.pkg.tar.lz
 
-##  cc58a6f0c835255360854e19a0cac0e13067a99a948ff2679256931ee81b008f  xkeyboard-config-2.40-01-x86_64.pkg.tar.lz

xkeyboard-config/PKGBUILD-arch

@@ -1,11 +1,11 @@
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=xkeyboard-config
-pkgver=2.40
+pkgver=2.41
 pkgrel=1
 pkgdesc="X keyboard configuration files"
 arch=(any)
-license=('custom')
+license=('LicenseRef-xkeyboard-config')
 url="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
 makedepends=('xorg-xkbcomp' 'libxslt' 'python' 'meson') # 'git')
 provides=('xkbdata')
@@ -13,15 +13,15 @@ replaces=('xkbdata')
 conflicts=('xkbdata')
 # https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
 source=(https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-sha256sums=('7a3dba1bec7dc7191432da021242d17c9cf6c89690e6c57b0de048ff8c9d2ae3'
+sha256sums=('f02cd6b957295e0d50236a3db15825256c92f67ef1f73bf1c77a4b179edf728f'
             'SKIP')
 validpgpkeys=('FFB4CCD275AAA422F5F9808E0661D98FC933A145') # Sergey Udaltsov <sergey.udaltsov@gmail.com>
 
 build() {
   arch-meson ${pkgname}-${pkgver} build \
-	-D xkb-base="/usr/share/X11/xkb" \
-	-D compat-rules=true \
-	-D xorg-rules-symlinks=true
+    -D xkb-base="/usr/share/X11/xkb" \
+    -D compat-rules=true \
+    -D xorg-rules-symlinks=true
 
   # Print config
   meson configure build
@@ -34,10 +34,7 @@ check() {
 }
  
 package() {
-
   DESTDIR="$pkgdir" ninja -C build install
-
   install -m755 -d "${pkgdir}/var/lib/xkb"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 ${pkgname}-${pkgver}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgname-$pkgver/COPYING
 }

xkeyboard-config/deps

@@ -4,4 +4,3 @@ libxslt
 xorg-xkbcomp
 
 
-

xkeyboard-config/time

@@ -1,5 +1,6 @@
 
-real	0m6.773s
-user	0m7.827s
-sys	0m1.180s
 
+real	0m10.958s
+user	0m5.764s
+sys	0m1.299s
+