diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2023-01-18 21:19:40 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2023-01-18 21:19:40 +0000 |
| commit | 6e223501be381d1ff7e454be9ec09057b1eb7fb1 (patch) | |
| tree | 06c3bee7dbcfd7e8e0900ade1058d54ae3216692 | |
| parent | a311818b35de119b084a00ef3860c5042ff77640 (diff) | |
| parent | 984af2a09b43e1c9fb684feaa3498e29fa3de014 (diff) | |
| download | at-spi2-core-6e223501be381d1ff7e454be9ec09057b1eb7fb1.tar.gz | |
Merge branch 'downgrade-meson' into 'main'
(#104): Use meson 0.63 for GNOME 44
See merge request GNOME/at-spi2-core!125
| -rw-r--r-- | ci/container_builds.yml | 4 | ||||
| -rw-r--r-- | devel-docs/meson.build | 5 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | tests/at-spi2-atk/meson.build | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/ci/container_builds.yml b/ci/container_builds.yml index dea74b3d..07d8899d 100644 --- a/ci/container_builds.yml +++ b/ci/container_builds.yml @@ -13,7 +13,7 @@ include: variables: # When branching change the suffix to avoid conflicts with images # from the main branch - BASE_TAG: "2022-12-13.3-main" + BASE_TAG: "2023-01-18.0-main" RUST_STABLE: "1.64.0" .container.opensuse@x86_64: @@ -96,7 +96,7 @@ opensuse-container@x86_64: python3-pip systemd-devel FDO_DISTRIBUTION_EXEC: >- - pip3 install meson==0.64 + pip3 install meson==0.63 fedora-container@x86_64: extends: diff --git a/devel-docs/meson.build b/devel-docs/meson.build index 6ef4570d..d1b00219 100644 --- a/devel-docs/meson.build +++ b/devel-docs/meson.build @@ -75,7 +75,10 @@ docs_sources = [ # and just do the build from there. copied_docs_sources = [] foreach i: docs_sources - copied_docs_sources += fs.copyfile(i) + copied_docs_sources += configure_file(copy: true, input: i, output: i) + + # When we bump meson to 0.64 or later, replace the line above with this: + # copied_docs_sources += fs.copyfile(i) endforeach custom_target( diff --git a/meson.build b/meson.build index 3200fc67..f659daf4 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project('at-spi2-core', 'c', 'warning_level=1', 'c_std=c99', ], - meson_version: '>= 0.64.0') + meson_version: '>= 0.63.0') add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE' ], language: 'c') diff --git a/tests/at-spi2-atk/meson.build b/tests/at-spi2-atk/meson.build index 4207fadb..4caf5d92 100644 --- a/tests/at-spi2-atk/meson.build +++ b/tests/at-spi2-atk/meson.build @@ -79,4 +79,4 @@ foreach t: tests endif endforeach -test('atk-test', atk_test_bin, timeout: 120) +test('atk-test', atk_test_bin, timeout: 300) |