diff --git a/srcpkgs/libxkbcommon/patches/fix-cross.patch b/srcpkgs/libxkbcommon/patches/fix-cross.patch deleted file mode 100644 index 44aed9030b6..00000000000 --- a/srcpkgs/libxkbcommon/patches/fix-cross.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit ed8efcf9263d3ed12b201de5b4a4eb10df77b81c -Author: maxice8 -Date: Sat Feb 23 05:55:00 2019 -0300 - - meson.build: use program from build machine not host or target. - - We can't always execute binaries from the host or target machine, - as is the case in cross compilation. - - closes #89 - -diff --git meson.build meson.build -index 9fef9c3..6f0b596 100644 ---- meson.build -+++ meson.build -@@ -411,7 +411,7 @@ endif - if get_option('enable-wayland') - wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) - wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.7', required: false) -- wayland_scanner_dep = dependency('wayland-scanner', required: false) -+ wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) - if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() - error('''The Wayland demo programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. - You can disable the Wayland demo programs with -Denable-wayland=false.''') - diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template index 332834bbe6c..6b09b9f4b26 100644 --- a/srcpkgs/libxkbcommon/template +++ b/srcpkgs/libxkbcommon/template @@ -1,24 +1,19 @@ # Template file for 'libxkbcommon' pkgname=libxkbcommon -version=0.8.4 -revision=2 +version=0.9.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" -makedepends="xkeyboard-config libxcb-devel wayland-devel" +hostmakedepends="pkg-config bison 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 " license="MIT" homepage="https://xkbcommon.org/" distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz" -checksum=299b47558188017047354995f5882d43c2c8a60367df553319dcecebadb73e1d - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" wayland-devel" - makedepends+=" wayland-protocols" -fi +checksum=4d869ed841a27ca4a2e5ca41ca6bacc97f8f6b42b1aa6ae9ee29c6e9768e2f1a pkg_install() { vlicense LICENSE