diff --git a/srcpkgs/libxkbcommon-tools b/srcpkgs/libxkbcommon-tools new file mode 120000 index 0000000000..51911d5197 --- /dev/null +++ b/srcpkgs/libxkbcommon-tools @@ -0,0 +1 @@ +libxkbcommon \ No newline at end of file diff --git a/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch b/srcpkgs/libxkbcommon/patches/remove-fuzzing.patch index eddc5ce2b5..46acb48878 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 708056d67f..808140b552 100644 --- a/srcpkgs/libxkbcommon/template +++ b/srcpkgs/libxkbcommon/template @@ -1,10 +1,11 @@ # 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" +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 wayland-devel wayland-protocols" depends="xkeyboard-config" @@ -13,9 +14,9 @@ maintainer="Orphaned " license="MIT" homepage="https://xkbcommon.org/" distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz" -checksum=9b4635cf5d9fc0fb9611ceec1780aafc0944299e9a29ab09c18ec2633923b9c3 +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 + } +}