From 0a684c7393f8d7e9a5a5bcd50802f21a6213f55a Mon Sep 17 00:00:00 2001 From: Dash Eclipse 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 " 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" 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 " @@ -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 + } +}