Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xkeyboard-config: update to 2.35.1.
@ 2022-02-10 21:55 tibequadorian
  2022-02-11 22:11 ` leahneukirchen
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: tibequadorian @ 2022-02-10 21:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]

There is a new pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages xkeyboard-config
https://github.com/void-linux/void-packages/pull/35518

xkeyboard-config: update to 2.35.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35518.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xkeyboard-config-35518.patch --]
[-- Type: text/x-diff, Size: 1619 bytes --]

From 74a070461dfa431ac602166389f1044fc2413a71 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 10 Feb 2022 22:53:33 +0100
Subject: [PATCH] xkeyboard-config: update to 2.35.1.

---
 srcpkgs/xkeyboard-config/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index b6b9e41d05cb..e4de462d7776 100644
--- a/srcpkgs/xkeyboard-config/template
+++ b/srcpkgs/xkeyboard-config/template
@@ -1,10 +1,10 @@
 # Template file for 'xkeyboard-config'
 pkgname=xkeyboard-config
-version=2.34
+version=2.35.1
 revision=1
-build_style=gnu-configure
-configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules"
-hostmakedepends="pkg-config libxslt intltool python3"
+build_style=meson
+configure_args="-Dxorg-rules-symlinks=true -Dcompat-rules=true"
+hostmakedepends="pkg-config libxslt python3 perl"
 makedepends="libX11-devel xkbcomp"
 depends="xkbcomp"
 short_desc="X Keyboard Configuration Database"
@@ -12,8 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://www.freedesktop.org/wiki/Software/XKeyboardConfig"
 changelog="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/raw/master/NEWS"
-distfiles="${XORG_SITE}/data/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce
+distfiles="${XORG_SITE}/data/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=18ce50ff0c74ae6093062bce1aeab3d363913ea35162fe271f8a0ce399de85cc
 
 post_install() {
 	vlicense COPYING

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: xkeyboard-config: update to 2.35.1.
  2022-02-10 21:55 [PR PATCH] xkeyboard-config: update to 2.35.1 tibequadorian
@ 2022-02-11 22:11 ` leahneukirchen
  2022-02-11 22:29 ` tibequadorian
  2022-02-11 22:32 ` [PR PATCH] [Merged]: " leahneukirchen
  2 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2022-02-11 22:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

New comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/35518#issuecomment-1036675507

Comment:
The package lacks compared to the previous one:

```
/usr/share/X11/xkb/rules/xfree86 -> /usr/share/X11/xkb/rules/base
/usr/share/X11/xkb/rules/xfree86.lst -> /usr/share/X11/xkb/rules/base.lst
/usr/share/X11/xkb/rules/xfree86.xml -> /usr/share/X11/xkb/rules/base.xml
```

and the locales. Is this relevant?

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: xkeyboard-config: update to 2.35.1.
  2022-02-10 21:55 [PR PATCH] xkeyboard-config: update to 2.35.1 tibequadorian
  2022-02-11 22:11 ` leahneukirchen
@ 2022-02-11 22:29 ` tibequadorian
  2022-02-11 22:32 ` [PR PATCH] [Merged]: " leahneukirchen
  2 siblings, 0 replies; 4+ messages in thread
From: tibequadorian @ 2022-02-11 22:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 613 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/35518#issuecomment-1036692256

Comment:
@leahneukirchen I noticed this, but it didn't seem relevant.

"rules symlinks is no longer supported. This option is 16y old and likely hasn't been used in the last decade or so"
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/7095744237eeb7eccfd72d9958191d990587f1d5

xorg rules were later re-added but not xfree86:
https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/ff3dcb932024ed13341938cded04142eda94600e


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Merged]: xkeyboard-config: update to 2.35.1.
  2022-02-10 21:55 [PR PATCH] xkeyboard-config: update to 2.35.1 tibequadorian
  2022-02-11 22:11 ` leahneukirchen
  2022-02-11 22:29 ` tibequadorian
@ 2022-02-11 22:32 ` leahneukirchen
  2 siblings, 0 replies; 4+ messages in thread
From: leahneukirchen @ 2022-02-11 22:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]

There's a merged pull request on the void-packages repository

xkeyboard-config: update to 2.35.1.
https://github.com/void-linux/void-packages/pull/35518

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-02-11 22:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-10 21:55 [PR PATCH] xkeyboard-config: update to 2.35.1 tibequadorian
2022-02-11 22:11 ` leahneukirchen
2022-02-11 22:29 ` tibequadorian
2022-02-11 22:32 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).