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 #356 from kiwix/new_version 

New version of kiwix-lib and kiwix-tools.
This commit is contained in:
Matthieu Gautier 2019-07-31 17:11:02 +02:00 committed by GitHub
parent 750d60435f 7c2527c38f
commit 67a5985324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/dependencies/libzim.py
View File

@ -25,4 +25,6 @@ class Libzim(Dependency):
return "-Db_bitcode=true" return "-Db_bitcode=true"
if platformInfo.name == 'native_mixed' and option('target') == 'libzim': if platformInfo.name == 'native_mixed' and option('target') == 'libzim':
return "-Dstatic-linkage=true" return "-Dstatic-linkage=true"
if platformInfo.name == "flatpak":
return "--wrap-mode=nodownload"
return "" return ""

10
kiwixbuild/versions.py
View File

@ -1,8 +1,8 @@
# This file reference all the versions of the depedencies we use in kiwix-build. # This file reference all the versions of the depedencies we use in kiwix-build.
main_project_versions = { main_project_versions = {
'kiwix-lib': '5.1.0', 'kiwix-lib': '5.2.0',
'kiwix-tools': '2.0.0', 'kiwix-tools': '2.1.0',
'libzim': '5.0.1', 'libzim': '5.0.1',
'zim-tools': '1.0.3', 'zim-tools': '1.0.3',
'zimwriterfs': '1.3.3', 'zimwriterfs': '1.3.3',
@ -25,10 +25,10 @@ main_project_versions = {
release_versions = { release_versions = {
'libzim': 0, # Depends of base deps (was 0) 'libzim': 0, # Depends of base deps (was 0)
'kiwix-lib': None, # Depends of libzim (was 0) 'kiwix-lib': 0, # Depends of libzim (was 0)
'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0) 'kiwix-tools': 0, # Depends of kiwix-lib and libzim (was 0)
'zim-tools': None, # Depends of libzim (was 0) 'zim-tools': 0, # Depends of libzim (was 0)
'zimwriterfs': 1, # Depends of libzim (was 0) 'zimwriterfs': 2, # Depends of libzim (was 1)
'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0) 'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0)
} }