From cb2abe280b026af9106a968e6ef7f568b2090771 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 15 Apr 2019 12:54:51 +0200 Subject: at-spi2-core: fix meson 0.50 build Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- .../atk/at-spi2-core/meson-0.50-fix.patch | 31 ++++++++++++++++++++++ meta/recipes-support/atk/at-spi2-core_2.30.0.bb | 1 + 2 files changed, 32 insertions(+) create mode 100644 meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch (limited to 'meta/recipes-support/atk') diff --git a/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch b/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch new file mode 100644 index 0000000000..fbdf7d0e2e --- /dev/null +++ b/meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch @@ -0,0 +1,31 @@ +From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +Date: Tue, 12 Mar 2019 11:46:24 +0100 +Subject: [PATCH] Fix meson.build for meson 0.50.0. + +Since meson 0.50.0 it is not possible anymore to specify an +absolute directory for subdir. To keep current functionality, +use install_dir instead. + +atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +Signed-off-by: Tobias Stoeckmann +--- + atspi/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atspi/meson.build b/atspi/meson.build +index b7a9357..2a6915d 100644 +--- a/atspi/meson.build ++++ b/atspi/meson.build +@@ -57,7 +57,7 @@ atspi_headers = [ + + atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi') + +-install_headers(atspi_headers, subdir: atspi_includedir) ++install_headers(atspi_headers, install_dir: atspi_includedir) + + atspi_enums = gnome.mkenums('atspi-enum-types', + sources: [ 'atspi-constants.h', 'atspi-types.h' ], diff --git a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb b/meta/recipes-support/atk/at-spi2-core_2.30.0.bb index 06fb7195b6..36e8a9ef48 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.30.0.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.30.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ + file://meson-0.50-fix.patch \ " SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5" -- cgit 1.2.3-korg