diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 21:29:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-14 01:16:56 +0000 |
| commit | ec9dfd3b0d11572b009a0ed8d6bc943ecbc1b355 (patch) | |
| tree | c226ef689a5e8e85a80294e2608ec6354c8b00b1 | |
| parent | 2aeaaea5d6511ce18ab4903bd421435f3162be06 (diff) | |
| download | gtk+-cherry-pick-6601d79b.tar.gz | |
Merge branch 'revert-82ab039a' into 'master'cherry-pick-6601d79b
Revert "Merge branch 'disable-macos-ci' into 'master'"
See merge request GNOME/gtk!3192
(cherry picked from commit 6601d79b2deb4388cbf19d2ab24fa0c9dd033382)
0ce0402e Revert "Merge branch 'disable-macos-ci' into 'master'"
b1c1e02c ci: Add debug spew on macos
5ff843f9 Stop passing introspection=false to graphene
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | meson.build | 10 |
2 files changed, 3 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00624776e5..506ab4c6f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -159,6 +159,7 @@ macos: - pip3 install --user meson==0.56 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH + - export MESON_FORCE_BACKTRACE=1 script: - meson -Dx11-backend=false -Dintrospection=disabled diff --git a/meson.build b/meson.build index 34a404d043..a35ba7b172 100644 --- a/meson.build +++ b/meson.build @@ -390,14 +390,8 @@ harfbuzz_dep = dependency('harfbuzz', version: '>= 0.9', required: false, fallback: ['harfbuzz', 'libharfbuzz_dep'], default_options: ['coretext=enabled']) xkbdep = dependency('xkbcommon', version: xkbcommon_req, required: wayland_enabled) -if os_darwin - graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, - fallback: ['graphene', 'graphene_dep'], - default_options: ['introspection=false']) -else - graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, - fallback: ['graphene', 'graphene_dep']) -endif +graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, + fallback: ['graphene', 'graphene_dep']) iso_codes_dep = dependency('iso-codes', required: false) gtk_doc_dep = dependency('gtk-doc', version: '>=1.33', |