summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-15 12:54:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:10:02 +0100
commita857c7ea57f1cfdf9397151c0458bc06b26306ee (patch)
tree7fd4aac054e29377d6f5c6e65d89c290cb89ada5 /meta
parentfa909d4fef2fe8613aeea963c60bddbfc4213cb4 (diff)
downloadpoky-a857c7ea57f1cfdf9397151c0458bc06b26306ee.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/atk/at-spi2-core/meson-0.50-fix.patch31
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.30.0.bb1
2 files changed, 32 insertions, 0 deletions
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 @@
1From 44a812ea51223d82f21a098a2d45fcc5c329ce7a Mon Sep 17 00:00:00 2001
2From: Tobias Stoeckmann <tobias@stoeckmann.org>
3Date: Tue, 12 Mar 2019 11:46:24 +0100
4Subject: [PATCH] Fix meson.build for meson 0.50.0.
5
6Since meson 0.50.0 it is not possible anymore to specify an
7absolute directory for subdir. To keep current functionality,
8use install_dir instead.
9
10atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path.
11
12Upstream-Status: Backport
13Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
15---
16 atspi/meson.build | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/atspi/meson.build b/atspi/meson.build
20index b7a9357..2a6915d 100644
21--- a/atspi/meson.build
22+++ b/atspi/meson.build
23@@ -57,7 +57,7 @@ atspi_headers = [
24
25 atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
26
27-install_headers(atspi_headers, subdir: atspi_includedir)
28+install_headers(atspi_headers, install_dir: atspi_includedir)
29
30 atspi_enums = gnome.mkenums('atspi-enum-types',
31 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"
6MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 6MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
7 7
8SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ 8SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
9 file://meson-0.50-fix.patch \
9 " 10 "
10 11
11SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5" 12SRC_URI[md5sum] = "d4f22c66b3210ffe6b10d01c04e008b5"