From ed9bf6d261f31b21aa4eb66c63a4bf3b71d1ec1a Mon Sep 17 00:00:00 2001
From: joborun <joborun@disroot.org>
Date: Mon, 5 Feb 2024 02:05:19 +0200
Subject: [PATCH] upg xorg-xkbcomp

---
 xorg-xkbcomp/PKGBUILD      | 24 +++++++++++++-----------
 xorg-xkbcomp/PKGBUILD-arch | 15 +++++++--------
 xorg-xkbcomp/deps          |  1 -
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/xorg-xkbcomp/PKGBUILD b/xorg-xkbcomp/PKGBUILD
index 0480983..239c187 100644
--- a/xorg-xkbcomp/PKGBUILD
+++ b/xorg-xkbcomp/PKGBUILD
@@ -6,16 +6,17 @@
 #-----------------------------------------| DESCRIPTION |---------------------------------------
 
 pkgname=xorg-xkbcomp
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=01
 pkgdesc="X Keyboard description compiler"
-arch=(x86_64)
 url="https://xorg.freedesktop.org/"
-depends=('libxkbfile')
+url="https://gitlab.freedesktop.org/xorg/app/xkbcomp"
+depends=('libxkbfile' 'libx11' 'glibc')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
 #options=('debug')  ###  uncomment this for the debug pkg
-source=(${url}/archive/individual/app/xkbcomp-${pkgver}.tar.xz{,.sig})
+#source=(${url}/archive/individual/app/xkbcomp-${pkgver}.tar.xz{,.sig})
+source=(https://xorg.freedesktop.org/archive/individual/app/xkbcomp-${pkgver}.tar.xz{,.sig})
 
 build() {
   cd xkbcomp-${pkgver}
@@ -25,7 +26,7 @@ build() {
 
 check() {
   cd xkbcomp-${pkgver}
-  make -k check
+  make check
 }
 
 package() {
@@ -35,9 +36,11 @@ package() {
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
 
-#---- license gpg-key sha256sums ----
+#---- arch license gpg-key & sha256sums ----
 
-license=('custom')
+arch=(x86_64)
+
+license=('LicenseRef-xkbcomp')
 
 #validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
 #validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
@@ -45,8 +48,7 @@ license=('custom')
 #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=(0a288114e5f44e31987042c79aecff1ffad53a8154b8ec971c24a69a80f81f77  # xkbcomp-1.4.7.tar.xz
+	1ceba72a7189c999694bdb9e5ee7d8b750e9b726000e97a139d495d0c0aa8932) # xkbcomp-1.4.7.tar.xz.sig
 
+##  fab6748d41e76ea00b54c0ca4c8aaf25db8091364ae31771a55b5831d02cc817  xorg-xkbcomp-1.4.7-01-x86_64.pkg.tar.lz
diff --git a/xorg-xkbcomp/PKGBUILD-arch b/xorg-xkbcomp/PKGBUILD-arch
index 75eaa50..94ea9b7 100644
--- a/xorg-xkbcomp/PKGBUILD-arch
+++ b/xorg-xkbcomp/PKGBUILD-arch
@@ -2,18 +2,17 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xorg-xkbcomp
-pkgver=1.4.6
+pkgver=1.4.7
 pkgrel=1
 pkgdesc="X Keyboard description compiler"
 arch=(x86_64)
-url="https://xorg.freedesktop.org/"
-license=('custom')
-depends=('libxkbfile')
+url="https://gitlab.freedesktop.org/xorg/app/xkbcomp"
+license=('LicenseRef-xkbcomp')
+depends=('libxkbfile' 'libx11' 'glibc')
 makedepends=('xorg-util-macros')
 groups=('xorg-apps' 'xorg')
-source=(${url}/archive/individual/app/xkbcomp-${pkgver}.tar.xz{,.sig})
-options=('debug')
-sha512sums=('90e69dd1c78c28f77a5acc7821b43afec1b9ac4895bc6f3462b4902baaadc26f3869da69e3bd023b4bc74adb5f1be0c43ca24b3dab37ac9a479c5622684baa81'
+source=(https://xorg.freedesktop.org/archive/individual/app/xkbcomp-${pkgver}.tar.xz{,.sig})
+sha512sums=('6f468dce9d2499ab1022f4288d46f66af149dac0a161fb5b9dc0c262bc70c2c3d254db2c6fb5df1e2793c822e2d55c6da5fd037ce523a555b7c3de23e35c49ef'
             'SKIP')
 #validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
 #validpgpkeys+=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels@collabora.com>"
@@ -29,7 +28,7 @@ build() {
 
 check() {
   cd xkbcomp-${pkgver}
-  make -k check
+  make check
 }
 
 package() {
diff --git a/xorg-xkbcomp/deps b/xorg-xkbcomp/deps
index 43a7cb7..5933482 100644
--- a/xorg-xkbcomp/deps
+++ b/xorg-xkbcomp/deps
@@ -2,4 +2,3 @@ libxkbfile
 xorg-util-macros
 
 
-