diff --git a/kiwixbuild/dependencies/kiwix_lib.py b/kiwixbuild/dependencies/kiwix_lib.py index 49524a2..6492568 100644 --- a/kiwixbuild/dependencies/kiwix_lib.py +++ b/kiwixbuild/dependencies/kiwix_lib.py @@ -21,10 +21,13 @@ class Kiwixlib(Dependency): @property def configure_option(self): - if self.buildEnv.platformInfo.build == 'android': + platformInfo = self.buildEnv.platformInfo + if platformInfo.build == 'android': return '-Dandroid=true' - if self.buildEnv.platformInfo.build == 'iOS': + if platformInfo.build == 'iOS': return '-Db_bitcode=true' + if platformInfo.name == 'flatpak': + return '--wrap-mode=nodownload' return '' @property diff --git a/kiwixbuild/dependencies/libmicrohttpd.py b/kiwixbuild/dependencies/libmicrohttpd.py index 5c11ff5..7878b11 100644 --- a/kiwixbuild/dependencies/libmicrohttpd.py +++ b/kiwixbuild/dependencies/libmicrohttpd.py @@ -9,9 +9,9 @@ class MicroHttpd(Dependency): name = "libmicrohttpd" class Source(ReleaseDownload): - archive = Remotefile('libmicrohttpd-0.9.46.tar.gz', - '06dbd2654f390fa1e8196fe063fc1449a6c2ed65a38199a49bf29ad8a93b8979', - 'http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.46.tar.gz') + archive = Remotefile('libmicrohttpd-0.9.65.tar.gz', + 'f2467959c5dd5f7fdf8da8d260286e7be914d18c99b898e22a70dafd2237b3c9', + 'http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.65.tar.gz') class Builder(MakeBuilder): configure_option = "--disable-https --without-libgcrypt --without-libcurl --disable-doc --disable-examples" diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index d2d409b..e3fdfc3 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -35,7 +35,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 = '52' +base_deps_meta_version = '53' base_deps_versions = { 'zlib' : '1.2.8', @@ -44,7 +44,7 @@ base_deps_versions = { 'xapian-core' : '1.4.10', 'mustache' : '3.2', 'pugixml' : '1.2', - 'libmicrohttpd' : '0.9.46', + 'libmicrohttpd' : '0.9.65', 'gumbo' : '0.10.1', 'icu4c' : '58.2', 'gradle' : '5.2',