diff options
| author | Mike Gorse <mgorse@suse.com> | 2019-11-20 22:41:06 +0000 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2019-11-20 22:41:06 +0000 |
| commit | f8da36ca7c76bb845694ba158d22f93fca302c14 (patch) | |
| tree | a3d1d2383dc349d33ffba92573ed2e0619cf85fb | |
| parent | b2356a1e1069ced3239657bc7251555838f1162d (diff) | |
| parent | 85fd92bec53ce596c7a02da87f3a29875085b465 (diff) | |
| download | at-spi2-atk-f8da36ca7c76bb845694ba158d22f93fca302c14.tar.gz | |
Merge branch 'subprojects' into 'master'
Add atk and atspi-2 as subprojects
See merge request GNOME/at-spi2-atk!18
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | subprojects/at-spi2-core.wrap | 5 | ||||
| -rw-r--r-- | subprojects/atk.wrap | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 906dda6..358381a 100644 --- a/meson.build +++ b/meson.build @@ -46,8 +46,8 @@ libdbus_dep = dependency('dbus-1', version: libdbus_req_version) glib_dep = dependency('glib-2.0', version: glib_req_version) gobject_dep = dependency('gobject-2.0', version: gobject_req_version) gmodule_dep = dependency('gmodule-2.0', version: gmodule_req_version) -atk_dep = dependency('atk', version: atk_req_version) -atspi_dep = dependency('atspi-2', version: atspi_req_version) +atk_dep = dependency('atk', version: atk_req_version, fallback : ['atk', 'libatk_dep']) +atspi_dep = dependency('atspi-2', version: atspi_req_version, fallback : ['at-spi2-core', 'atspi_dep']) libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false) if get_option('disable_p2p') diff --git a/subprojects/at-spi2-core.wrap b/subprojects/at-spi2-core.wrap new file mode 100644 index 0000000..2ed1f3e --- /dev/null +++ b/subprojects/at-spi2-core.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=at-spi2-core +url=https://gitlab.gnome.org/GNOME/at-spi2-core.git +push-url=git@gitlab.gnome.org:GNOME/at-spi2-core.git +revision=master diff --git a/subprojects/atk.wrap b/subprojects/atk.wrap new file mode 100644 index 0000000..8666a3a --- /dev/null +++ b/subprojects/atk.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=atk +url=https://gitlab.gnome.org/GNOME/atk.git +push-url=git@gitlab.gnome.org:GNOME/atk.git +revision=master |