From b036df0ce156022abd686dbaa0de4e919768d0dd Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 7 Feb 2020 13:03:31 +0000 Subject: [PATCH] glib: Fix build due to Meson option changing type (#3358) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * glib: Fix build due to Meson option changing type In GLib master commit b220033c we changed the `libmount` option from a `boolean` to a `feature`, which means it now takes `enabled`/`disabled`/`auto` rather than `true`/`false`. Signed-off-by: Philip Withnall Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=20552 * glib: Fix homepage URI The FSF page on GLib is not official, loaded with their advertising, and quite out of date. Signed-off-by: Philip Withnall * infra: Add help_url to the valid section names list in Travis checks It’s documented as valid: https://google.github.io/oss-fuzz/getting-started/new-project-guide/#help_url Signed-off-by: Philip Withnall --- infra/presubmit.py | 1 + projects/glib/build.sh | 2 +- projects/glib/project.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/infra/presubmit.py b/infra/presubmit.py index 7be16a80f..71da8fd9a 100755 --- a/infra/presubmit.py +++ b/infra/presubmit.py @@ -90,6 +90,7 @@ class ProjectYamlChecker: 'vendor_ccs', 'view_restrictions', 'language', + 'help_url', ] LANGUAGES_SUPPORTED = ['c', 'cpp', 'go', 'rust', 'python'] diff --git a/projects/glib/build.sh b/projects/glib/build.sh index 4b4ac0794..b0d8f3979 100755 --- a/projects/glib/build.sh +++ b/projects/glib/build.sh @@ -24,7 +24,7 @@ meson $BUILD \ -Doss_fuzz=enabled \ -Db_lundef=false \ -Ddefault_library=static \ - -Dlibmount=false + -Dlibmount=disabled ninja -C $BUILD diff --git a/projects/glib/project.yaml b/projects/glib/project.yaml index 90a03d0c1..03db51305 100644 --- a/projects/glib/project.yaml +++ b/projects/glib/project.yaml @@ -1,4 +1,4 @@ -homepage: "https://www.gnu.org/directory/glib.html" +homepage: "https://gitlab.gnome.org/GNOME/glib/" primary_contact: "bugzilla@tecnocode.co.uk" auto_ccs: - philip.withnall@gmail.com