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

Use the right option to build kiwix_desktop and pugixml on flatpak.

This commit is contained in:
Matthieu Gautier 2018-11-27 10:11:23 +01:00
parent ed63ffe24c
commit 833c5844a1
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwixbuild/dependencies/kiwix_desktop.py
View File

@ -14,6 +14,8 @@ class KiwixDesktop(Dependency):
dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2"] dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2"]
@property @property
def configure_option(self): def configure_option(self):
if self.buildEnv.platformInfo.name == 'flatpak':
return []
options = ["PREFIX={}".format(self.buildEnv.install_dir)] options = ["PREFIX={}".format(self.buildEnv.install_dir)]
if self.buildEnv.platformInfo.static: if self.buildEnv.platformInfo.static:
options.append('"CONFIG+=static"') options.append('"CONFIG+=static"')

1
kiwixbuild/dependencies/pugixml.py
View File

@ -12,5 +12,6 @@ class Pugixml(Dependency):
archive = Remotefile('pugixml-1.2.tar.gz', archive = Remotefile('pugixml-1.2.tar.gz',
'0f422dad86da0a2e56a37fb2a88376aae6e931f22cc8b956978460c9db06136b') '0f422dad86da0a2e56a37fb2a88376aae6e931f22cc8b956978460c9db06136b')
patches = ["pugixml_meson.patch"] patches = ["pugixml_meson.patch"]
flatpak_dest = "src"
Builder = MesonBuilder Builder = MesonBuilder