From e0d4eea0503ff3e79c6e8357291898dc0a363fc4 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Fri, 19 May 2023 15:28:34 +0200 Subject: [PATCH 1/2] Bump-up libmagic to version 5.44 --- kiwixbuild/dependencies/libmagic.py | 6 +++--- kiwixbuild/versions.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kiwixbuild/dependencies/libmagic.py b/kiwixbuild/dependencies/libmagic.py index 4d269c3..b1314d7 100644 --- a/kiwixbuild/dependencies/libmagic.py +++ b/kiwixbuild/dependencies/libmagic.py @@ -15,9 +15,9 @@ class LibMagic(Dependency): class Source(ReleaseDownload): name = "libmagic" source_dir = "libmagic" - archive_top_dir = 'file-5.35' - archive = Remotefile('file-5.35.tar.gz', - '30c45e817440779be7aac523a905b123cba2a6ed0bf4f5439e1e99ba940b5546') + archive_top_dir = 'file-5.44' + archive = Remotefile('file-5.44.tar.gz', + '3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b') class Builder(MakeBuilder): diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index eca8de2..030407e 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -39,7 +39,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 = '86' +base_deps_meta_version = '87' base_deps_versions = { 'zlib' : '1.2.12', @@ -54,7 +54,7 @@ base_deps_versions = { 'gumbo' : '0.10.1', 'icu4c' : '58.2', 'libaria2' : '1.36.0', - 'libmagic' : '5.35', + 'libmagic' : '5.44', 'android-ndk' : 'r21e', 'qt' : '5.10.1', 'qtwebengine' : '5.10.1', From 5057444acdcf814455965775cbfc6be55a9f3384 Mon Sep 17 00:00:00 2001 From: Emmanuel Engelhart Date: Sat, 20 May 2023 10:57:53 +0200 Subject: [PATCH 2/2] Disable decompression feature in libmagic --- kiwixbuild/dependencies/libmagic.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kiwixbuild/dependencies/libmagic.py b/kiwixbuild/dependencies/libmagic.py index b1314d7..53f3302 100644 --- a/kiwixbuild/dependencies/libmagic.py +++ b/kiwixbuild/dependencies/libmagic.py @@ -20,6 +20,13 @@ class LibMagic(Dependency): '3751c7fba8dbc831cb8d7cc8aff21035459b8ce5155ef8b0880a27d028475f3b') class Builder(MakeBuilder): + @property + def configure_option(self): + return ("--disable-bzlib " + "--disable-xzlib " + "--disable-zstdlib " + "--disable-lzlib " + ) @classmethod def get_dependencies(cls, platformInfo, allDeps):