diff options
| author | psykose <alice@ayaya.dev> | 2022-10-05 04:22:32 +0000 |
|---|---|---|
| committer | psykose <alice@ayaya.dev> | 2022-10-05 06:22:51 +0200 |
| commit | 980003d2edbb866a4c35cb930f904b5eefe1df55 (patch) | |
| tree | 83aa6ece062ae40047c717820f298943bdb02976 | |
| parent | fb206f544776fffca0cabc65954a1605d9a7b033 (diff) | |
main/xkeyboard-config: upgrade to 2.37
| -rw-r--r-- | main/xkeyboard-config/APKBUILD | 11 | ||||
| -rw-r--r-- | main/xkeyboard-config/fix-syntax-error.patch | 58 |
2 files changed, 4 insertions, 65 deletions
diff --git a/main/xkeyboard-config/APKBUILD b/main/xkeyboard-config/APKBUILD index f2de2f20762..3acc83d17c2 100644 --- a/main/xkeyboard-config/APKBUILD +++ b/main/xkeyboard-config/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xkeyboard-config -pkgver=2.36 -pkgrel=2 +pkgver=2.37 +pkgrel=0 pkgdesc="X keyboard configuration files" url="https://github.com/freedesktop/xkeyboard-config" arch="noarch" @@ -9,9 +9,7 @@ license="MIT" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends_dev="$pkgname" makedepends="gettext meson perl libxslt" -source="$pkgname-$pkgver.tar.gz::https://github.com/freedesktop/xkeyboard-config/archive/refs/tags/xkeyboard-config-$pkgver.tar.gz - fix-syntax-error.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/freedesktop/xkeyboard-config/archive/refs/tags/xkeyboard-config-$pkgver.tar.gz" builddir="$srcdir"/xkeyboard-config-xkeyboard-config-$pkgver build() { @@ -28,6 +26,5 @@ package() { } sha512sums=" -c238b2584caa55638a5464bc2cb107eb7e7be856060796cc09fd7b5d5312126d17d043e5769f5a746d5cc64135738bac73f17206973b63284f346a5fabde750f xkeyboard-config-2.36.tar.gz -ed8c5834cdaa87fd12a9c9faa292d905daee792ed9505f61ea488420a77e5fa07ebcd1fa641b637ab62e3035f6b12928c5583109c1cdcdd36f059d1053fc9579 fix-syntax-error.patch +2eaf0e6e60d4225897e13b1055278f46c37461c9e0e0064a41764dcf674ea3c9ac10186aa960ea41fe1c756b4654b0f3876f62fd961c786068df9ef89c60b907 xkeyboard-config-2.37.tar.gz " diff --git a/main/xkeyboard-config/fix-syntax-error.patch b/main/xkeyboard-config/fix-syntax-error.patch deleted file mode 100644 index 8aa7ccb75a0..00000000000 --- a/main/xkeyboard-config/fix-syntax-error.patch +++ /dev/null @@ -1,58 +0,0 @@ -Patch-Source: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/8ac41c50ab0aa7cd3a7e94313074115de2a172d2 -From 8ac41c50ab0aa7cd3a7e94313074115de2a172d2 Mon Sep 17 00:00:00 2001 -From: Benno Schulenberg <bensberg@telfort.nl> -Date: Fri, 10 Jun 2022 12:05:52 +0200 -Subject: [PATCH] rules: use backslashes instead of slashes for line - continuation :\ - -This fixes #324. - -Reported-by: Adriaan de Groot - -Bug existed since commit c3c5d02a7e from six weeks ago. - -Signed-off-by: Benno Schulenberg <bensberg@telfort.nl> ---- - rules/0002-base.lists.part | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part -index 0af6db56..cb661240 100644 ---- a/rules/0002-base.lists.part -+++ b/rules/0002-base.lists.part -@@ -37,18 +37,18 @@ - unitekkb1925 yahoo - - ! $inetmediakbds = \ -- a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop / -- armada asus_laptop benqx btc5090 btc6301urf btc9019u / -- cherrybluea cherryblueb cherrycyboard chicony042 / -- compalfl90 compaqik13 compaqik18 creativedw7000 / -- cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 / -- emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy / -- geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf / -- hpxe4xxx hpxt1000 hpzt11xx inspiron latitude / -- logidinovo logidinovoedge logitech_base logitech_g15 / -- microsoft4000 microsoft7000 microsoftmult microsoftpro / -- microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m / -- presario propeller samsung4500 samsung4510 scorpius / -- silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 / -- thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 / -+ a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \ -+ armada asus_laptop benqx btc5090 btc6301urf btc9019u \ -+ cherrybluea cherryblueb cherrycyboard chicony042 \ -+ compalfl90 compaqik13 compaqik18 creativedw7000 \ -+ cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \ -+ emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \ -+ geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \ -+ hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \ -+ logidinovo logidinovoedge logitech_base logitech_g15 \ -+ microsoft4000 microsoft7000 microsoftmult microsoftpro \ -+ microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \ -+ presario propeller samsung4500 samsung4510 scorpius \ -+ silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \ -+ thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \ - toshiba_s3000 trust trustda trust_slimline unitekkb1925 --- -GitLab - |