From 7c4c09a498547678c0740513f0c0319082f66a36 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sat, 23 Feb 2019 04:39:21 -0300 Subject: [PATCH] libxkbcommon: update to 0.8.4. --- srcpkgs/libxkbcommon/patches/fix-cross.patch | 25 ++++++++++++++++++++ srcpkgs/libxkbcommon/template | 6 ++--- 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/libxkbcommon/patches/fix-cross.patch diff --git a/srcpkgs/libxkbcommon/patches/fix-cross.patch b/srcpkgs/libxkbcommon/patches/fix-cross.patch new file mode 100644 index 0000000000..44aed9030b --- /dev/null +++ b/srcpkgs/libxkbcommon/patches/fix-cross.patch @@ -0,0 +1,25 @@ +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 10ad53e6ba..49fdb1ac84 100644 --- a/srcpkgs/libxkbcommon/template +++ b/srcpkgs/libxkbcommon/template @@ -1,11 +1,11 @@ # Template file for 'libxkbcommon' pkgname=libxkbcommon -version=0.8.3 +version=0.8.4 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" +hostmakedepends="pkgconf bison wayland-protocols" makedepends="xkeyboard-config libxcb-devel wayland-devel" depends="xkeyboard-config" short_desc="Library to handle keyboard descriptions" @@ -13,7 +13,7 @@ maintainer="maxice8 " license="MIT" homepage="https://xkbcommon.org/" distfiles="https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-${version}.tar.gz" -checksum=aefea423f6f18422f0a80395f36404d9dbcbc45b881d3e70ceea95c623559069 +checksum=299b47558188017047354995f5882d43c2c8a60367df553319dcecebadb73e1d if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wayland-devel"