at-spi2-core: fix meson 0.50 build

(From OE-Core rev: cb2abe280b026af9106a968e6ef7f568b2090771)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2019-04-15 12:54:51 +02:00
committed by Richard Purdie
parent fa909d4fef
commit a857c7ea57
2 changed files with 32 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <tobias@stoeckmann.org>
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 <alex.kanavin@gmail.com>
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
---
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' ],

View File

@@ -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"