[pango/pango2: 103/168] Try to fix the ci build




commit 5941f983dd9a911c4d167963557a94b0a0cc37e4
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jun 13 22:48:10 2022 -0400

    Try to fix the ci build

 .gitlab-ci.yml | 4 ++--
 meson.build    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b8d413c..4658bfa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
+  COMMON_MESON_FLAGS: "--fatal-meson-warnings -Dwerror=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
   FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v9
 
@@ -22,7 +22,7 @@ linux-fedora:
   stage: build
   needs: []
   variables:
-    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
+    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both -Dharfbuzz:docs=disabled 
-Dharfbuzz:werror=false"
   script:
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS}
             _build
diff --git a/meson.build b/meson.build
index 1d89d468..3a3deab3 100644
--- a/meson.build
+++ b/meson.build
@@ -277,7 +277,7 @@ harfbuzz_dep = dependency('harfbuzz',
                           version: harfbuzz_req_version,
                           required: true,
                           fallback: ['harfbuzz', 'libharfbuzz_dep'],
-                          default_options: ['coretext=enabled'])
+                          default_options: ['coretext=enabled', 'werror=false', 'docs=disabled'])
 harfbuzz_gobj_dep = dependency('harfbuzz-gobject',
                                version: harfbuzz_req_version,
                                required: true,
@@ -290,6 +290,8 @@ if host_system == 'linux'
 
   pango_deps += fontconfig_dep
   pango_conf.set('HAVE_FONTCONFIG', 1)
+else
+  fontconfig_dep = disabler()
 endif
 
 if host_system == 'darwin'


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]