* [PR PATCH] libxkbcommon: add subpkg libxkbregistry
@ 2021-08-19 1:57 cinerea0
2021-08-19 2:14 ` cinerea0
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: cinerea0 @ 2021-08-19 1:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1666 bytes --]
There is a new pull request by cinerea0 against master on the void-packages repository
https://github.com/cinerea0/void-packages xkb
https://github.com/void-linux/void-packages/pull/32572
libxkbcommon: add subpkg libxkbregistry
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->
---
This addition is necessary for the newest release of Waybar.
A patch file from https://github.com/void-linux/void-packages/pull/32572.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xkb-32572.patch --]
[-- Type: text/x-diff, Size: 2414 bytes --]
From 91e33324b95ddcfa53ac26136236ab86416f25b7 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Wed, 18 Aug 2021 21:52:42 -0400
Subject: [PATCH] libxkbcommon: add subpkg libxkbregistry
---
common/shlibs | 1 +
srcpkgs/libxkbcommon/template | 15 ++++++++++++---
srcpkgs/libxkbregistry | 1 +
3 files changed, 14 insertions(+), 3 deletions(-)
create mode 120000 srcpkgs/libxkbregistry
diff --git a/common/shlibs b/common/shlibs
index 63dea0e2ea0b..39136a41cfe3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1155,6 +1155,7 @@ libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
+libxkbregistry.so.0 libxkbregistry-1.3.0_3
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
libhogweed.so.6 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 5cdadd1db7db..9104c8561a52 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,13 +1,14 @@
# Template file for 'libxkbcommon'
pkgname=libxkbcommon
version=1.3.0
-revision=2
+revision=3
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
configure_args="-Denable-x11=true -Denable-docs=false
- -Denable-wayland=true -Denable-xkbregistry=false"
+ -Denable-wayland=true -Denable-xkbregistry=true"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols xorgproto"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols xorgproto
+ libxml2-devel"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Isaac Freund <ifreund@ifreund.xyz>"
@@ -27,8 +28,16 @@ libxkbcommon-x11_package() {
}
}
+libxkbregistry_package() {
+ short_desc+=" - RMLVO options"
+ pkg_install() {
+ vmove "usr/lib/libxkbregistry.so.*"
+ }
+}
+
libxkbcommon-devel_package() {
depends="${sourcepkg}-x11>=${version}_${revision}
+ libxkbregistry>=${version}_${revision}
${sourcepkg}>=${version}_${revision} libxcb-devel"
short_desc+=" - development files"
pkg_install() {
diff --git a/srcpkgs/libxkbregistry b/srcpkgs/libxkbregistry
new file mode 120000
index 000000000000..51911d5197ae
--- /dev/null
+++ b/srcpkgs/libxkbregistry
@@ -0,0 +1 @@
+libxkbcommon
\ No newline at end of file
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: libxkbcommon: add subpkg libxkbregistry
2021-08-19 1:57 [PR PATCH] libxkbcommon: add subpkg libxkbregistry cinerea0
@ 2021-08-19 2:14 ` cinerea0
2021-08-19 2:43 ` ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: cinerea0 @ 2021-08-19 2:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
New comment by cinerea0 on void-packages repository
https://github.com/void-linux/void-packages/pull/32572#issuecomment-901555251
Comment:
I'm not sure how to interpret the output from the test that's causing the checks to fail:
```
17/21 libxkbcommon / registry FAIL 0.02s killed by signal 11 SIGSEGV
02:07:34 MALLOC_PERTURB_=34 HAVE_XKBCLI_INTERACTIVE_EVDEV=1 top_srcdir=/builddir/libxkbcommon-xkbcommon-1.3.0 XKB_LOG_VERBOSITY=10 top_builddir=/builddir/libxkbcommon-xkbcommon-1.3.0/build HAVE_XKBCLI_INTERACTIVE_WAYLAND=1 XKB_LOG_LEVEL=debug HAVE_XKBCLI_LIST=1 HAVE_XKBCLI_INTERACTIVE_X11=1 /builddir/libxkbcommon-xkbcommon-1.3.0/build/test-registry
```
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: libxkbcommon: add subpkg libxkbregistry
2021-08-19 1:57 [PR PATCH] libxkbcommon: add subpkg libxkbregistry cinerea0
2021-08-19 2:14 ` cinerea0
@ 2021-08-19 2:43 ` ericonr
2021-08-19 2:43 ` ericonr
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-08-19 2:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32572#issuecomment-901565242
Comment:
looks like their test has issues or is missing some file they didn't expect to be missing, like a font or keyboard definition or whatever. could open an issue with upstream asking for a list of packages needed to run tests (or look how other distros are doing it).
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: libxkbcommon: add subpkg libxkbregistry
2021-08-19 1:57 [PR PATCH] libxkbcommon: add subpkg libxkbregistry cinerea0
2021-08-19 2:14 ` cinerea0
2021-08-19 2:43 ` ericonr
@ 2021-08-19 2:43 ` ericonr
2021-08-19 19:57 ` ericonr
2021-08-19 19:57 ` [PR PATCH] [Closed]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-08-19 2:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32572#issuecomment-901565421
Comment:
And the justification you included in your PR description could be included in the commit message itself ;)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: libxkbcommon: add subpkg libxkbregistry
2021-08-19 1:57 [PR PATCH] libxkbcommon: add subpkg libxkbregistry cinerea0
` (2 preceding siblings ...)
2021-08-19 2:43 ` ericonr
@ 2021-08-19 19:57 ` ericonr
2021-08-19 19:57 ` [PR PATCH] [Closed]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-08-19 19:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32572#issuecomment-902200138
Comment:
Merged in #32584, though it incorporated your sub package change. Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: libxkbcommon: add subpkg libxkbregistry
2021-08-19 1:57 [PR PATCH] libxkbcommon: add subpkg libxkbregistry cinerea0
` (3 preceding siblings ...)
2021-08-19 19:57 ` ericonr
@ 2021-08-19 19:57 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-08-19 19:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1730 bytes --]
There's a closed pull request on the void-packages repository
libxkbcommon: add subpkg libxkbregistry
https://github.com/void-linux/void-packages/pull/32572
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->
---
This addition is necessary for the newest release of Waybar. The reasoning for creating a subpackage as opposed to grouping the files in with existing packages can be found in [upstream's packaging page](https://github.com/xkbcommon/libxkbcommon/blob/master/PACKAGING#L74).
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-19 19:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-19 1:57 [PR PATCH] libxkbcommon: add subpkg libxkbregistry cinerea0
2021-08-19 2:14 ` cinerea0
2021-08-19 2:43 ` ericonr
2021-08-19 2:43 ` ericonr
2021-08-19 19:57 ` ericonr
2021-08-19 19:57 ` [PR PATCH] [Closed]: " ericonr
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).