74c8b77c70
Add upstream patch [1] to fix build with meson 0.50.0 (as suggested
by Thomas Petazzoni ).
Fixes [2]:
atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path.
[1] 44a812ea51.patch
[1] http://autobuild.buildroot.net/results/83250522c79b5749fc8236ba2b0e873a12747413
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 3b154996a27ede1c94cbc590e2db3858389d18c2 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.
|
|
|
|
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
|
|
|
|
Upstream: https://github.com/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
atspi/meson.build | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/atspi/meson.build b/atspi/meson.build
|
|
index 17bfc45..2e44ffd 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' ],
|
|
--
|
|
2.21.0
|
|
|