From b48302d2eef782b8d2b885054f220d69092fc803 Mon Sep 17 00:00:00 2001
From: Joe Bo Run <joborun@disroot.org>
Date: Thu, 8 Dec 2022 23:31:24 +0200
Subject: [PATCH] upg xorg-xkbcomp

---
 xorg-xkbcomp/PKGBUILD      | 20 ++++++++++++--------
 xorg-xkbcomp/PKGBUILD-arch | 18 ++++++++++--------
 xorg-xkbcomp/clean         |  2 +-
 xorg-xkbcomp/deps          |  3 +++
 xorg-xkbcomp/key           |  1 +
 xorg-xkbcomp/time          |  6 ++++++
 6 files changed, 33 insertions(+), 17 deletions(-)
 create mode 100644 xorg-xkbcomp/time

diff --git a/xorg-xkbcomp/PKGBUILD b/xorg-xkbcomp/PKGBUILD
index 13f9ca3..0480983 100644
--- a/xorg-xkbcomp/PKGBUILD
+++ b/xorg-xkbcomp/PKGBUILD
@@ -6,7 +6,7 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=xorg-xkbcomp
-pkgver=1.4.5
+pkgver=1.4.6
 pkgrel=01
 pkgdesc="X Keyboard description compiler"
 arch=(x86_64)
@@ -14,7 +14,8 @@ url="https://xorg.freedesktop.org/"
 depends=('libxkbfile')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
-source=(${url}/archive/individual/app/xkbcomp-${pkgver}.tar.bz2{,.sig})
+#options=('debug')  ###  uncomment this for the debug pkg
+source=(${url}/archive/individual/app/xkbcomp-${pkgver}.tar.xz{,.sig})
 
 build() {
   cd xkbcomp-${pkgver}
@@ -38,11 +39,14 @@ package() {
 
 license=('custom')
 
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
-validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
-validpgpkeys+=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') # "Adam Jackson <ajax@benzedrine.nwnk.net>"
-validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner <mattst88@gmail.com>"
+#validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
+#validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
+#validpgpkeys+=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') # "Adam Jackson <ajax@benzedrine.nwnk.net>"
+#validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner <mattst88@gmail.com>"
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
+
+sha256sums=(fa50d611ef41e034487af7bd8d8c718df53dd18002f591cca16b0384afc58e98  # xkbcomp-1.4.6.tar.xz
+	2c73c8c643a02c75cb89dba44ed8291233633848b81742e72e831631a7437c55) # xkbcomp-1.4.6.tar.xz.sig
+
 
-sha256sums=(6851086c4244b6fd0cc562880d8ff193fb2bbf1e141c73632e10731b31d4b05e  # xkbcomp-1.4.5.tar.bz2
-	10293567131b075a3a8aed9d5630a8f0a07a37c2be51855b549a8884e6ac512b) # xkbcomp-1.4.5.tar.bz2.sig
 
diff --git a/xorg-xkbcomp/PKGBUILD-arch b/xorg-xkbcomp/PKGBUILD-arch
index 2a64e76..75eaa50 100644
--- a/xorg-xkbcomp/PKGBUILD-arch
+++ b/xorg-xkbcomp/PKGBUILD-arch
@@ -1,8 +1,8 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xkbcomp
-pkgver=1.4.5
+pkgver=1.4.6
 pkgrel=1
 pkgdesc="X Keyboard description compiler"
 arch=(x86_64)
@@ -11,13 +11,15 @@ license=('custom')
 depends=('libxkbfile')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
-source=(${url}/archive/individual/app/xkbcomp-${pkgver}.tar.bz2{,.sig})
-sha512sums=('2e84f8d6b083e2e818cb95e5d2a184da00e50d71b280e92d1a71465a9a4348f922f4ddccb42cfeee6f76705bbfc8580ef67aedd0d958aaa1ae6bbcc66ccd8154'
+source=(${url}/archive/individual/app/xkbcomp-${pkgver}.tar.xz{,.sig})
+options=('debug')
+sha512sums=('90e69dd1c78c28f77a5acc7821b43afec1b9ac4895bc6f3462b4902baaadc26f3869da69e3bd023b4bc74adb5f1be0c43ca24b3dab37ac9a479c5622684baa81'
             'SKIP')
-validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
-validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
-validpgpkeys+=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') # "Adam Jackson <ajax@benzedrine.nwnk.net>"
-validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner <mattst88@gmail.com>"
+#validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
+#validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
+#validpgpkeys+=('DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3') # "Adam Jackson <ajax@benzedrine.nwnk.net>"
+#validpgpkeys+=('3BB639E56F861FA2E86505690FDD682D974CA72A') # "Matt Turner <mattst88@gmail.com>"
+validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # "Alan Coopersmith <alan.coopersmith@oracle.com>"
 
 build() {
   cd xkbcomp-${pkgver}
diff --git a/xorg-xkbcomp/clean b/xorg-xkbcomp/clean
index 832bd62..46071e9 100644
--- a/xorg-xkbcomp/clean
+++ b/xorg-xkbcomp/clean
@@ -1 +1 @@
-rm -rf {src,pkg,xkbc*.tar.bz2*}
+rm -rf {src,pkg,xkbc*.tar.xz*}
diff --git a/xorg-xkbcomp/deps b/xorg-xkbcomp/deps
index 90c67e1..43a7cb7 100644
--- a/xorg-xkbcomp/deps
+++ b/xorg-xkbcomp/deps
@@ -1,2 +1,5 @@
 libxkbfile
 xorg-util-macros
+
+
+
diff --git a/xorg-xkbcomp/key b/xorg-xkbcomp/key
index 8154804..aaf846b 100644
--- a/xorg-xkbcomp/key
+++ b/xorg-xkbcomp/key
@@ -3,3 +3,4 @@ gpg -v --recv-key 5B8A2D50A0ECD0D3 # Adam Jackson <ajax@benzedrine.nwnk.net>
 gpg -v --recv-key 0FDD682D974CA72A # Matt Turner <mattst88@gmail.com>
 gpg -v --recv-key E23B7E70B467F0BF # Peter Hutterer (Who-T) <office@who-t.net>
 
+gpg -v --recv-key A2FB9E081F2D130E
diff --git a/xorg-xkbcomp/time b/xorg-xkbcomp/time
new file mode 100644
index 0000000..6863654
--- /dev/null
+++ b/xorg-xkbcomp/time
@@ -0,0 +1,6 @@
+
+
+real	0m8.713s
+user	0m8.060s
+sys	0m0.804s
+