smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #361 from kiwix/nowrapdownload_flatpak 

Do not download gtest in flatpak.
This commit is contained in:
Matthieu Gautier 2019-08-20 14:23:54 +02:00 committed by GitHub
parent b814b39c38 f80afdecbc
commit 20b47df244
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kiwixbuild/dependencies/kiwix_lib.py
View File

@ -21,10 +21,13 @@ class Kiwixlib(Dependency):
@property @property
def configure_option(self): def configure_option(self):
if self.buildEnv.platformInfo.build == 'android': platformInfo = self.buildEnv.platformInfo
if platformInfo.build == 'android':
return '-Dandroid=true' return '-Dandroid=true'
if self.buildEnv.platformInfo.build == 'iOS': if platformInfo.build == 'iOS':
return '-Db_bitcode=true' return '-Db_bitcode=true'
if platformInfo.name == 'flatpak':
return '--wrap-mode=nodownload'
return '' return ''
@property @property

6
kiwixbuild/dependencies/libmicrohttpd.py
View File

@ -9,9 +9,9 @@ class MicroHttpd(Dependency):
name = "libmicrohttpd" name = "libmicrohttpd"
class Source(ReleaseDownload): class Source(ReleaseDownload):
archive = Remotefile('libmicrohttpd-0.9.46.tar.gz', archive = Remotefile('libmicrohttpd-0.9.65.tar.gz',
'06dbd2654f390fa1e8196fe063fc1449a6c2ed65a38199a49bf29ad8a93b8979', 'f2467959c5dd5f7fdf8da8d260286e7be914d18c99b898e22a70dafd2237b3c9',
'http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.46.tar.gz') 'http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.65.tar.gz')
class Builder(MakeBuilder): class Builder(MakeBuilder):
configure_option = "--disable-https --without-libgcrypt --without-libcurl --disable-doc --disable-examples" configure_option = "--disable-https --without-libgcrypt --without-libcurl --disable-doc --disable-examples"

4
kiwixbuild/versions.py
View File

@ -35,7 +35,7 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict. # This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions. # Change this when you change base_deps_versions.
base_deps_meta_version = '52' base_deps_meta_version = '53'
base_deps_versions = { base_deps_versions = {
'zlib' : '1.2.8', 'zlib' : '1.2.8',
@ -44,7 +44,7 @@ base_deps_versions = {
'xapian-core' : '1.4.10', 'xapian-core' : '1.4.10',
'mustache' : '3.2', 'mustache' : '3.2',
'pugixml' : '1.2', 'pugixml' : '1.2',
'libmicrohttpd' : '0.9.46', 'libmicrohttpd' : '0.9.65',
'gumbo' : '0.10.1', 'gumbo' : '0.10.1',
'icu4c' : '58.2', 'icu4c' : '58.2',
'gradle' : '5.2', 'gradle' : '5.2',