0001-Fix-meson.build-for-meson-0.50.0.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435
  1. From 3b154996a27ede1c94cbc590e2db3858389d18c2 Mon Sep 17 00:00:00 2001
  2. From: Tobias Stoeckmann <tobias@stoeckmann.org>
  3. Date: Tue, 12 Mar 2019 11:46:24 +0100
  4. Subject: [PATCH] Fix meson.build for meson 0.50.0.
  5. Since meson 0.50.0 it is not possible anymore to specify an
  6. absolute directory for subdir. To keep current functionality,
  7. use install_dir instead.
  8. atspi/meson.build:60:0: ERROR: Subdir keyword must not be an absolute path.
  9. Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
  10. Upstream: https://github.com/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a.patch
  11. Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  12. ---
  13. atspi/meson.build | 2 +-
  14. 1 file changed, 1 insertion(+), 1 deletion(-)
  15. diff --git a/atspi/meson.build b/atspi/meson.build
  16. index 17bfc45..2e44ffd 100644
  17. --- a/atspi/meson.build
  18. +++ b/atspi/meson.build
  19. @@ -57,7 +57,7 @@ atspi_headers = [
  20. atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
  21. -install_headers(atspi_headers, subdir: atspi_includedir)
  22. +install_headers(atspi_headers, install_dir: atspi_includedir)
  23. atspi_enums = gnome.mkenums('atspi-enum-types',
  24. sources: [ 'atspi-constants.h', 'atspi-types.h' ],
  25. --
  26. 2.21.0