* [PR PATCH] libxkbcommon: update to 1.0.1.
@ 2020-09-27 17:12 dashezup
2020-09-27 18:19 ` [PR PATCH] [Updated] " dashezup
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: dashezup @ 2020-09-27 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 587 bytes --]
There is a new pull request by dashezup against master on the void-packages repository
https://github.com/dashezup/void-packages libxkbcommon-1.0.1
https://github.com/void-linux/void-packages/pull/25134
libxkbcommon: update to 1.0.1.
btw I saw this and added libxkbregistry.so.0 to shlibs
`=> WARNING: libxkbcommon-1.0.1_1: libxkbregistry.so.0 not found in common/shlibs!`
Are those shlibs usually added when there are new ones are found like this, or add only when it's actually needed?
A patch file from https://github.com/void-linux/void-packages/pull/25134.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxkbcommon-1.0.1-25134.patch --]
[-- Type: text/x-diff, Size: 3123 bytes --]
From f050e864b3e4995a29ee64310ffd2c5220241d0f Mon Sep 17 00:00:00 2001
From: Dash Eclipse <dash@ezup.dev>
Date: Sun, 27 Sep 2020 17:04:29 +0000
Subject: [PATCH] libxkbcommon: update to 1.0.1.
---
common/shlibs | 1 +
srcpkgs/libxkbcommon/patches/remove-fuzzing.patch | 10 +++++-----
srcpkgs/libxkbcommon/template | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index aae753c73a1..f5ee6203ac1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1220,6 +1220,7 @@ libwayland-cursor.so.0 wayland-1.6.0_1
libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
+libxkbregistry.so.0 libxkbcommon-1.0.1_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
index eddc5ce2b5b..46acb48878e 100644
--- a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
+++ b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
@@ -4,8 +4,8 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
--- meson.build
+++ meson.build
-@@ -382,12 +382,6 @@ if get_option('enable-x11')
- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+@@ -670,12 +670,6 @@
+ message('valgrind not found, disabling valgrind test setup')
endif
-
@@ -14,6 +14,6 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
-
-
- # Demo programs.
- executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
- executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
+ # Benchmarks.
+ libxkbcommon_bench_internal = static_library(
+ 'xkbcommon-bench-internal',
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 708056d67f7..d831a966f38 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,19 +1,19 @@
# Template file for 'libxkbcommon'
pkgname=libxkbcommon
-version=0.10.0
+version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols libxml2-devel"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://xkbcommon.org/"
distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=9b4635cf5d9fc0fb9611ceec1780aafc0944299e9a29ab09c18ec2633923b9c3
+checksum=270e2ad4ce5699f633e49042114cb68a5697fa1ed45b65c1d96a833cfac20954
pkg_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
@ 2020-09-27 18:19 ` dashezup
2020-09-29 14:08 ` ahesford
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-27 18:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 731 bytes --]
There is an updated pull request by dashezup against master on the void-packages repository
https://github.com/dashezup/void-packages libxkbcommon-1.0.1
https://github.com/void-linux/void-packages/pull/25134
libxkbcommon: update to 1.0.1.
btw I saw this and added libxkbregistry.so.0 to shlibs
`=> WARNING: libxkbcommon-1.0.1_1: libxkbregistry.so.0 not found in common/shlibs!`
Are those shlibs usually added when there are new ones are found like this, or add only when it's actually needed?
Should I add `shlib_provides="libxkbcommon.so.0 libxkbregistry.so.0"` and `shlib_provides="libxkbcommon-x11.so.0"` to package template?
A patch file from https://github.com/void-linux/void-packages/pull/25134.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxkbcommon-1.0.1-25134.patch --]
[-- Type: text/x-diff, Size: 3337 bytes --]
From 70f59020a9ebb401000a7d1bdfa4fd2a40aa6c02 Mon Sep 17 00:00:00 2001
From: Dash Eclipse <dash@ezup.dev>
Date: Sun, 27 Sep 2020 18:18:54 +0000
Subject: [PATCH] libxkbcommon: update to 1.0.1.
---
common/shlibs | 1 +
srcpkgs/libxkbcommon/patches/remove-fuzzing.patch | 10 +++++-----
srcpkgs/libxkbcommon/template | 8 +++++---
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index aae753c73a1..f5ee6203ac1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1220,6 +1220,7 @@ libwayland-cursor.so.0 wayland-1.6.0_1
libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
+libxkbregistry.so.0 libxkbcommon-1.0.1_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
index eddc5ce2b5b..46acb48878e 100644
--- a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
+++ b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
@@ -4,8 +4,8 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
--- meson.build
+++ meson.build
-@@ -382,12 +382,6 @@ if get_option('enable-x11')
- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+@@ -670,12 +670,6 @@
+ message('valgrind not found, disabling valgrind test setup')
endif
-
@@ -14,6 +14,6 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
-
-
- # Demo programs.
- executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
- executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
+ # Benchmarks.
+ libxkbcommon_bench_internal = static_library(
+ 'xkbcommon-bench-internal',
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 708056d67f7..6ce96ab92c3 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,25 +1,27 @@
# Template file for 'libxkbcommon'
pkgname=libxkbcommon
-version=0.10.0
+version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols libxml2-devel"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://xkbcommon.org/"
distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=9b4635cf5d9fc0fb9611ceec1780aafc0944299e9a29ab09c18ec2633923b9c3
+checksum=270e2ad4ce5699f633e49042114cb68a5697fa1ed45b65c1d96a833cfac20954
+shlib_provides="libxkbcommon.so.0 libxkbregistry.so.0"
pkg_install() {
vlicense LICENSE
}
libxkbcommon-x11_package() {
+ shlib_provides="libxkbcommon-x11.so.0"
short_desc+=" - X11 support"
pkg_install() {
vmove "usr/lib/*x11*.so.*"
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
2020-09-27 18:19 ` [PR PATCH] [Updated] " dashezup
@ 2020-09-29 14:08 ` ahesford
2020-09-29 20:59 ` [PR PATCH] [Updated] " dashezup
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-09-29 14:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-700729997
Comment:
`shlib_provides` is used to tell `xbps-src` about shared objects it doesn't automatically find, for example if a package keeps an unversioned file like `/usr/share/somelib/liblib.so` and you want to link other packages against that library. In this case, you should remove those lines.
As for `common/shlibs`, it doesn't *really* matter that libraries are included unless you want to link against them in another package. However, I'd say that, for consistency, if you have to have one of the libraries listed (which is the case here), you might as well include both. The exception is if the libraries are in some private directory like `/usr/lib/xkbcommon/libxkbregistry.so.0`, which will be picked up by `xbps-src` but are probably not intended for public consumption.
What dependants have you tested against this update? They claim API and ABI compatibility across the big version jump, but given the broad list of dependants, it would be good to do some sanity checks.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
2020-09-27 18:19 ` [PR PATCH] [Updated] " dashezup
2020-09-29 14:08 ` ahesford
@ 2020-09-29 20:59 ` dashezup
2020-09-29 21:26 ` dashezup
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-29 20:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 831 bytes --]
There is an updated pull request by dashezup against master on the void-packages repository
https://github.com/dashezup/void-packages libxkbcommon-1.0.1
https://github.com/void-linux/void-packages/pull/25134
libxkbcommon: update to 1.0.1.
btw I saw this and added libxkbregistry.so.0 to shlibs
`=> WARNING: libxkbcommon-1.0.1_1: libxkbregistry.so.0 not found in common/shlibs!`
Questions:
1. Are those shlibs usually added when there are new ones are found like this, or add only when it's actually needed?
2. Should I add `shlib_provides="libxkbcommon.so.0 libxkbregistry.so.0"` and `shlib_provides="libxkbcommon-x11.so.0"` to package template? I also added it for now, ask me to remove them if it's not supposed to be added
A patch file from https://github.com/void-linux/void-packages/pull/25134.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxkbcommon-1.0.1-25134.patch --]
[-- Type: text/x-diff, Size: 3123 bytes --]
From 5fc0d180c5772032411d5ed39154ea66ec1e3739 Mon Sep 17 00:00:00 2001
From: Dash Eclipse <dash@ezup.dev>
Date: Tue, 29 Sep 2020 20:58:43 +0000
Subject: [PATCH] libxkbcommon: update to 1.0.1.
---
common/shlibs | 1 +
srcpkgs/libxkbcommon/patches/remove-fuzzing.patch | 10 +++++-----
srcpkgs/libxkbcommon/template | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ded49667426..19f95a83819 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1221,6 +1221,7 @@ libwayland-cursor.so.0 wayland-1.6.0_1
libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
+libxkbregistry.so.0 libxkbcommon-1.0.1_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
index eddc5ce2b5b..46acb48878e 100644
--- a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
+++ b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
@@ -4,8 +4,8 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
--- meson.build
+++ meson.build
-@@ -382,12 +382,6 @@ if get_option('enable-x11')
- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+@@ -670,12 +670,6 @@
+ message('valgrind not found, disabling valgrind test setup')
endif
-
@@ -14,6 +14,6 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
-
-
- # Demo programs.
- executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
- executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
+ # Benchmarks.
+ libxkbcommon_bench_internal = static_library(
+ 'xkbcommon-bench-internal',
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 708056d67f7..3e2fdfcf92d 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,19 +1,19 @@
# Template file for 'libxkbcommon'
pkgname=libxkbcommon
-version=0.10.0
+version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
+makedepends="xkeyboard-config libxcb-devel libxml2-devel wayland-protocols wayland-devel"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://xkbcommon.org/"
distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=9b4635cf5d9fc0fb9611ceec1780aafc0944299e9a29ab09c18ec2633923b9c3
+checksum=270e2ad4ce5699f633e49042114cb68a5697fa1ed45b65c1d96a833cfac20954
pkg_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (2 preceding siblings ...)
2020-09-29 20:59 ` [PR PATCH] [Updated] " dashezup
@ 2020-09-29 21:26 ` dashezup
2020-09-29 21:55 ` dashezup
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-29 21:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
New comment by dashezup on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-701000320
Comment:
@ahesford thanks i got it, see the message I edited. updated and rebased on lasted commit on master branch.
I've checked dependencies, all of dependencies listed are necessarily.
It builds fine here on x86_64-musl, armv7l-musl (cross) and aarch64-musl (cross).
tested sway and mpv (current build of package) both works fine with this version of libxkbcommon on x86_64-musl.
I didn't try to rebuild existing packages which requires libxkbcommon
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (3 preceding siblings ...)
2020-09-29 21:26 ` dashezup
@ 2020-09-29 21:55 ` dashezup
2020-09-29 21:55 ` dashezup
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-29 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 318 bytes --]
New comment by dashezup on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-701012602
Comment:
wait, I got this error while building wlroots `ERROR: wlroots-devel-0.11.0_2: failed to install 'MesaLib-devel-20.1.8_1' dependency! (error 40)`
could it be because of this?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (4 preceding siblings ...)
2020-09-29 21:55 ` dashezup
@ 2020-09-29 21:55 ` dashezup
2020-09-29 21:56 ` [PR PATCH] [Updated] " dashezup
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-29 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
New comment by dashezup on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-701012602
Comment:
I got this error while building wlroots `ERROR: wlroots-devel-0.11.0_2: failed to install 'MesaLib-devel-20.1.8_1' dependency! (error 40)`
could it be because of this?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (5 preceding siblings ...)
2020-09-29 21:55 ` dashezup
@ 2020-09-29 21:56 ` dashezup
2020-09-29 22:12 ` dashezup
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-29 21:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
There is an updated pull request by dashezup against master on the void-packages repository
https://github.com/dashezup/void-packages libxkbcommon-1.0.1
https://github.com/void-linux/void-packages/pull/25134
libxkbcommon: update to 1.0.1.
btw I saw this and added libxkbregistry.so.0 to shlibs
`=> WARNING: libxkbcommon-1.0.1_1: libxkbregistry.so.0 not found in common/shlibs!`
Questions:
1. ~~Are those shlibs usually added when there are new ones are found like this, or add only when it's actually needed?~~
`libxkbregistry.so.0` is located at `/usr/lib/libxkbregistry.so.0`, I've added it to common/shlibs
2. ~~Should I add `shlib_provides="libxkbcommon.so.0 libxkbregistry.so.0"` and `shlib_provides="libxkbcommon-x11.so.0"` to package template? I also added it for now, ask me to remove them if it's not supposed to be added~~
I will keep it as before, `shlib_provides` is not added in this commit.
A patch file from https://github.com/void-linux/void-packages/pull/25134.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxkbcommon-1.0.1-25134.patch --]
[-- Type: text/x-diff, Size: 3123 bytes --]
From 0a684c7393f8d7e9a5a5bcd50802f21a6213f55a Mon Sep 17 00:00:00 2001
From: Dash Eclipse <dash@ezup.dev>
Date: Tue, 29 Sep 2020 20:58:43 +0000
Subject: [PATCH] libxkbcommon: update to 1.0.1.
---
common/shlibs | 1 +
srcpkgs/libxkbcommon/patches/remove-fuzzing.patch | 10 +++++-----
srcpkgs/libxkbcommon/template | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ded49667426..19f95a83819 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1221,6 +1221,7 @@ libwayland-cursor.so.0 wayland-1.6.0_1
libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
+libxkbregistry.so.0 libxkbcommon-1.0.1_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
index eddc5ce2b5b..46acb48878e 100644
--- a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
+++ b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
@@ -4,8 +4,8 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
--- meson.build
+++ meson.build
-@@ -382,12 +382,6 @@ if get_option('enable-x11')
- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+@@ -670,12 +670,6 @@
+ message('valgrind not found, disabling valgrind test setup')
endif
-
@@ -14,6 +14,6 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
-
-
- # Demo programs.
- executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
- executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
+ # Benchmarks.
+ libxkbcommon_bench_internal = static_library(
+ 'xkbcommon-bench-internal',
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 708056d67f7..3e2fdfcf92d 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,19 +1,19 @@
# Template file for 'libxkbcommon'
pkgname=libxkbcommon
-version=0.10.0
+version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
+makedepends="xkeyboard-config libxcb-devel libxml2-devel wayland-protocols wayland-devel"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://xkbcommon.org/"
distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=9b4635cf5d9fc0fb9611ceec1780aafc0944299e9a29ab09c18ec2633923b9c3
+checksum=270e2ad4ce5699f633e49042114cb68a5697fa1ed45b65c1d96a833cfac20954
pkg_install() {
vlicense LICENSE
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (6 preceding siblings ...)
2020-09-29 21:56 ` [PR PATCH] [Updated] " dashezup
@ 2020-09-29 22:12 ` dashezup
2020-09-29 22:12 ` dashezup
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-29 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
New comment by dashezup on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-701012602
Comment:
I got this error while building wlroots
```=> ERROR: wlroots-devel-0.11.0_2: failed to install 'MesaLib-devel-20.1.8_1' dependency! (error 40)
Package `wayland-devel-1.18.0_3' already installed.
=> ERROR: Please see above for the real error, exiting...```
could it be because of this?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (7 preceding siblings ...)
2020-09-29 22:12 ` dashezup
@ 2020-09-29 22:12 ` dashezup
2020-09-29 22:42 ` dashezup
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-29 22:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
New comment by dashezup on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-701012602
Comment:
I got this error while building wlroots
```
=> ERROR: wlroots-devel-0.11.0_2: failed to install 'MesaLib-devel-20.1.8_1' dependency! (error 40)
Package `wayland-devel-1.18.0_3' already installed.
=> ERROR: Please see above for the real error, exiting...
```
could it be because of this?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (8 preceding siblings ...)
2020-09-29 22:12 ` dashezup
@ 2020-09-29 22:42 ` dashezup
2020-09-30 1:24 ` [PR PATCH] [Updated] " ahesford
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-29 22:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 560 bytes --]
New comment by dashezup on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-701012602
Comment:
I got this error while building wlroots
```
=> ERROR: wlroots-devel-0.11.0_2: failed to install 'MesaLib-devel-20.1.8_1' dependency! (error 40)
Package `wayland-devel-1.18.0_3' already installed.
=> ERROR: Please see above for the real error, exiting...
```
I'm confused, how could adding one makedepends (libxml2-devel) to libxkbcommon result in wlroots throw this error? I think we need to figure this out.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (9 preceding siblings ...)
2020-09-29 22:42 ` dashezup
@ 2020-09-30 1:24 ` ahesford
2020-09-30 1:29 ` ahesford
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-09-30 1:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/dashezup/void-packages libxkbcommon-1.0.1
https://github.com/void-linux/void-packages/pull/25134
libxkbcommon: update to 1.0.1.
btw I saw this and added libxkbregistry.so.0 to shlibs
`=> WARNING: libxkbcommon-1.0.1_1: libxkbregistry.so.0 not found in common/shlibs!`
Questions:
1. ~~Are those shlibs usually added when there are new ones are found like this, or add only when it's actually needed?~~
`libxkbregistry.so.0` is located at `/usr/lib/libxkbregistry.so.0`, I've added it to common/shlibs
2. ~~Should I add `shlib_provides="libxkbcommon.so.0 libxkbregistry.so.0"` and `shlib_provides="libxkbcommon-x11.so.0"` to package template? I also added it for now, ask me to remove them if it's not supposed to be added~~
I will keep it as before, `shlib_provides` is not added in this commit.
A patch file from https://github.com/void-linux/void-packages/pull/25134.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxkbcommon-1.0.1-25134.patch --]
[-- Type: text/x-diff, Size: 5986 bytes --]
From 0a684c7393f8d7e9a5a5bcd50802f21a6213f55a Mon Sep 17 00:00:00 2001
From: Dash Eclipse <dash@ezup.dev>
Date: Tue, 29 Sep 2020 20:58:43 +0000
Subject: [PATCH 1/2] libxkbcommon: update to 1.0.1.
---
common/shlibs | 1 +
srcpkgs/libxkbcommon/patches/remove-fuzzing.patch | 10 +++++-----
srcpkgs/libxkbcommon/template | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ded49667426..19f95a83819 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1221,6 +1221,7 @@ libwayland-cursor.so.0 wayland-1.6.0_1
libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
+libxkbregistry.so.0 libxkbcommon-1.0.1_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
index eddc5ce2b5b..46acb48878e 100644
--- a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
+++ b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch
@@ -4,8 +4,8 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
--- meson.build
+++ meson.build
-@@ -382,12 +382,6 @@ if get_option('enable-x11')
- executable('test-x11comp', 'test/x11comp.c', dependencies: x11_test_dep)
+@@ -670,12 +670,6 @@
+ message('valgrind not found, disabling valgrind test setup')
endif
-
@@ -14,6 +14,6 @@ Reason: removes creation of fuzzing infrastructure which isn't included in the d
-executable('fuzz-compose', 'fuzz/compose/target.c', dependencies: test_dep)
-
-
- # Demo programs.
- executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
- executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
+ # Benchmarks.
+ libxkbcommon_bench_internal = static_library(
+ 'xkbcommon-bench-internal',
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 708056d67f7..3e2fdfcf92d 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -1,19 +1,19 @@
# Template file for 'libxkbcommon'
pkgname=libxkbcommon
-version=0.10.0
+version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
+makedepends="xkeyboard-config libxcb-devel libxml2-devel wayland-protocols wayland-devel"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://xkbcommon.org/"
distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
-checksum=9b4635cf5d9fc0fb9611ceec1780aafc0944299e9a29ab09c18ec2633923b9c3
+checksum=270e2ad4ce5699f633e49042114cb68a5697fa1ed45b65c1d96a833cfac20954
pkg_install() {
vlicense LICENSE
From 301a9bf9bc53afa752ae0755de19e5f241a94303 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 29 Sep 2020 21:18:42 -0400
Subject: [PATCH 2/2] libxkbcommon: split tools into libxkbcommon-tools
subpackage
---
common/shlibs | 1 -
srcpkgs/libxkbcommon-tools | 1 +
srcpkgs/libxkbcommon/template | 19 +++++++++++++++----
3 files changed, 16 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/libxkbcommon-tools
diff --git a/common/shlibs b/common/shlibs
index 19f95a83819..ded49667426 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1221,7 +1221,6 @@ libwayland-cursor.so.0 wayland-1.6.0_1
libtomcrypt.so.1 libtomcrypt-1.18.0_1
libHX.so.28 libHX-3.14_1
libxkbcommon.so.0 libxkbcommon-0.2.0_1
-libxkbregistry.so.0 libxkbcommon-1.0.1_1
libxkbcommon-x11.so.0 libxkbcommon-x11-0.4.2_1
libgee-0.8.so.2 libgee08-0.8.2_1
libnettle.so.8 nettle-3.6_1
diff --git a/srcpkgs/libxkbcommon-tools b/srcpkgs/libxkbcommon-tools
new file mode 120000
index 00000000000..51911d5197a
--- /dev/null
+++ b/srcpkgs/libxkbcommon-tools
@@ -0,0 +1 @@
+libxkbcommon
\ No newline at end of file
diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template
index 3e2fdfcf92d..808140b5524 100644
--- a/srcpkgs/libxkbcommon/template
+++ b/srcpkgs/libxkbcommon/template
@@ -4,9 +4,10 @@ version=1.0.1
revision=1
wrksrc="${pkgname}-${pkgname#lib}-${version}"
build_style=meson
-configure_args="-Denable-wayland=true -Denable-docs=false -Denable-x11=true"
+configure_args="-Denable-x11=true -Denable-docs=false
+ -Denable-wayland=true -Denable-xkbregistry=false"
hostmakedepends="pkg-config bison wayland-protocols wayland-devel"
-makedepends="xkeyboard-config libxcb-devel libxml2-devel wayland-protocols wayland-devel"
+makedepends="xkeyboard-config libxcb-devel wayland-devel wayland-protocols"
depends="xkeyboard-config"
short_desc="Library to handle keyboard descriptions"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,7 +16,7 @@ homepage="https://xkbcommon.org/"
distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz"
checksum=270e2ad4ce5699f633e49042114cb68a5697fa1ed45b65c1d96a833cfac20954
-pkg_install() {
+post_install() {
vlicense LICENSE
}
@@ -27,7 +28,8 @@ libxkbcommon-x11_package() {
}
libxkbcommon-devel_package() {
- depends="libxcb-devel ${sourcepkg}-x11>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
+ depends="${sourcepkg}-x11>=${version}_${revision}
+ ${sourcepkg}>=${version}_${revision} libxcb-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
@@ -35,3 +37,12 @@ libxkbcommon-devel_package() {
vmove "usr/lib/*.so"
}
}
+
+libxkbcommon-tools_package() {
+ short_desc+=" - utilities"
+ pkg_install() {
+ vmove usr/bin
+ vmove usr/libexec
+ vmove usr/share/man
+ }
+}
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (10 preceding siblings ...)
2020-09-30 1:24 ` [PR PATCH] [Updated] " ahesford
@ 2020-09-30 1:29 ` ahesford
2020-09-30 9:48 ` dashezup
2020-09-30 12:39 ` [PR PATCH] [Closed]: " ahesford
13 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-09-30 1:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 924 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-701105750
Comment:
OK, I pushed some changes to your branch. The new `libxkbcommon` builds some command-line tools that, in your PR, added Wayland and X11 dependencies that caused the problem you observed. To get around this, I moved the tools into a new `libxkbcommon-tools` subpackage so these dependencies are not attached to the `libxkbcommon` base package. I have successfully built `wlroots`, `i3lock`, `wev`, `kitty` and `rofi` on `x86_64`. We should be OK now.
Finally, the xkbregistry library is optional and, since we obviously have nothing that depends on it, I've just disabled it during the build. We can enable it in a subsequent build if a package needs it.
If you accept these changes, let me know; I will squash and merge. Otherwise, feel free to make an alternative suggestion.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (11 preceding siblings ...)
2020-09-30 1:29 ` ahesford
@ 2020-09-30 9:48 ` dashezup
2020-09-30 12:39 ` [PR PATCH] [Closed]: " ahesford
13 siblings, 0 replies; 15+ messages in thread
From: dashezup @ 2020-09-30 9:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
New comment by dashezup on void-packages repository
https://github.com/void-linux/void-packages/pull/25134#issuecomment-701285802
Comment:
Thanks that looks good, I just tried to build `wlroots`, `dmenu-wayland`, `sway`, `wlroots`, `xdotools` `kitty` all of them builds successfully (x86_64-musl, and cross compile for armv7l-musl and aarch64-musl)
go ahead, squash and merge.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Closed]: libxkbcommon: update to 1.0.1.
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
` (12 preceding siblings ...)
2020-09-30 9:48 ` dashezup
@ 2020-09-30 12:39 ` ahesford
13 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-09-30 12:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
There's a closed pull request on the void-packages repository
libxkbcommon: update to 1.0.1.
https://github.com/void-linux/void-packages/pull/25134
Description:
btw I saw this and added libxkbregistry.so.0 to shlibs
`=> WARNING: libxkbcommon-1.0.1_1: libxkbregistry.so.0 not found in common/shlibs!`
Questions:
1. ~~Are those shlibs usually added when there are new ones are found like this, or add only when it's actually needed?~~
`libxkbregistry.so.0` is located at `/usr/lib/libxkbregistry.so.0`, I've added it to common/shlibs
2. ~~Should I add `shlib_provides="libxkbcommon.so.0 libxkbregistry.so.0"` and `shlib_provides="libxkbcommon-x11.so.0"` to package template? I also added it for now, ask me to remove them if it's not supposed to be added~~
I will keep it as before, `shlib_provides` is not added in this commit.
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-09-30 12:39 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-27 17:12 [PR PATCH] libxkbcommon: update to 1.0.1 dashezup
2020-09-27 18:19 ` [PR PATCH] [Updated] " dashezup
2020-09-29 14:08 ` ahesford
2020-09-29 20:59 ` [PR PATCH] [Updated] " dashezup
2020-09-29 21:26 ` dashezup
2020-09-29 21:55 ` dashezup
2020-09-29 21:55 ` dashezup
2020-09-29 21:56 ` [PR PATCH] [Updated] " dashezup
2020-09-29 22:12 ` dashezup
2020-09-29 22:12 ` dashezup
2020-09-29 22:42 ` dashezup
2020-09-30 1:24 ` [PR PATCH] [Updated] " ahesford
2020-09-30 1:29 ` ahesford
2020-09-30 9:48 ` dashezup
2020-09-30 12:39 ` [PR PATCH] [Closed]: " ahesford
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).