From 0f7a00f60c2caec82ec6b0bc24f6dd7c00b97f2f Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sun, 4 May 2025 20:40:42 +0200 Subject: [PATCH] Compile gumbo-parser 0.13.1 with Meson --- kiwixbuild/dependencies/gumbo.py | 21 ++++++++++----------- kiwixbuild/versions.py | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/kiwixbuild/dependencies/gumbo.py b/kiwixbuild/dependencies/gumbo.py index d07b6f8..5a2456f 100644 --- a/kiwixbuild/dependencies/gumbo.py +++ b/kiwixbuild/dependencies/gumbo.py @@ -1,6 +1,6 @@ -from .base import Dependency, ReleaseDownload, MakeBuilder +from .base import Dependency, ReleaseDownload, MesonBuilder -from kiwixbuild.utils import Remotefile, run_command +from kiwixbuild.utils import Remotefile class Gumbo(Dependency): @@ -8,14 +8,13 @@ class Gumbo(Dependency): class Source(ReleaseDownload): archive = Remotefile( - "gumbo-parser-0.12.1.tar.gz", - "c0bb5354e46539680724d638dbea07296b797229a7e965b13305c930ddc10d82", - "https://dev.kiwix.org/kiwix-build/gumbo-parser-0.12.1.tar.gz", + "gumbo-parser-0.13.1.tar.gz", + "1a054d1e53d556641a6666537247411a77b0c18ef6ad5df23e30d2131676ef81", + "https://dev.kiwix.org/kiwix-build/gumbo-parser-0.13.1.tar.gz", ) - def _post_prepare_script(self, context): - context.try_skip(self.extract_path) - command = ["./autogen.sh"] - run_command(command, self.extract_path, context) - - Builder = MakeBuilder + class Builder(MesonBuilder): + configure_options = [ + "-Dtests=false" + ] + strip_options = [] diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index 6020fcb..04142c6 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -33,7 +33,7 @@ release_versions = { # This is the "version" of the whole base_deps_versions dict. # Change this when you change base_deps_versions. -base_deps_meta_version = "13" +base_deps_meta_version = "14" base_deps_versions = { "zlib": "1.2.12", @@ -45,7 +45,7 @@ base_deps_versions = { "mustache": "4.1", "pugixml": "1.2", "libmicrohttpd": "0.9.76", - "gumbo": "0.12.1", + "gumbo": "0.13.1", "icu4c": "73.2", "libaria2": "1.37.0", "libmagic": "5.44",