0001-meson.build-correctly-set-internal-vapi-dependencies.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From ebb77dad4563b882b449cbc5e882f36ac8c2de71 Mon Sep 17 00:00:00 2001
  2. From: Alexander Kanavin <alex.kanavin@gmail.com>
  3. Date: Mon, 11 May 2020 22:19:16 +0000
  4. Subject: [PATCH] meson.build: correctly set internal vapi dependencies
  5. If they are set as strings, meson will supply the right
  6. arguments to vapigen, but will not set the ninja dependencies
  7. to ensure they get built first, and so races will occur:
  8. https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1881/steps/8/logs/step1b
  9. Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/55]
  10. Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  11. ---
  12. gcr/meson.build | 2 +-
  13. ui/meson.build | 4 ++--
  14. 2 files changed, 3 insertions(+), 3 deletions(-)
  15. diff --git a/gcr/meson.build b/gcr/meson.build
  16. index 254a933..199452f 100644
  17. --- a/gcr/meson.build
  18. +++ b/gcr/meson.build
  19. @@ -203,7 +203,7 @@ if get_option('introspection')
  20. gcr_vapi = gnome.generate_vapi('gcr-@0@'.format(gcr_major_version),
  21. sources: gcr_gir[0],
  22. - packages: [ 'glib-2.0', 'gio-2.0', 'gck-@0@'.format(gck_major_version) ],
  23. + packages: [ 'glib-2.0', 'gio-2.0', gck_vapi ],
  24. metadata_dirs: meson.current_source_dir(),
  25. vapi_dirs: [
  26. build_root / 'gck',
  27. diff --git a/ui/meson.build b/ui/meson.build
  28. index 5ca3753..477412d 100644
  29. --- a/ui/meson.build
  30. +++ b/ui/meson.build
  31. @@ -174,8 +174,8 @@ if get_option('introspection')
  32. packages: [
  33. 'glib-2.0',
  34. 'gio-2.0',
  35. - 'gck-@0@'.format(gck_major_version),
  36. - 'gcr-@0@'.format(gcr_major_version),
  37. + gck_vapi,
  38. + gcr_vapi,
  39. 'gtk+-3.0'
  40. ],
  41. metadata_dirs: meson.current_source_dir(),