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

Update flatpak build 

Fix https://github.com/flathub/org.kiwix.desktop/issues/10
Fix https://github.com/kiwix/kiwix-desktop/issues/961
This commit is contained in:
Matthieu Gautier 2024-08-13 13:36:23 +02:00
parent 08efe8e1f7
commit 907d39ab84
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kiwixbuild/dependencies/base.py
View File

@ -323,8 +323,8 @@ class Builder:
module["subdir"] = self.subsource_dir module["subdir"] = self.subsource_dir
if getattr(self, "flatpack_build_options", None): if getattr(self, "flatpack_build_options", None):
module["build-options"] = self.flatpack_build_options module["build-options"] = self.flatpack_build_options
if getattr(self, "configure_option", ""): if getattr(self, "configure_options", ""):
module["config-opts"] = self.configure_option.split(" ") module["config-opts"] = list(self.configure_options)
def get_env(self, *, cross_comp_flags, cross_compilers, cross_path): def get_env(self, *, cross_comp_flags, cross_compilers, cross_path):
env = self.buildEnv.get_env( env = self.buildEnv.get_env(

8
kiwixbuild/dependencies/kiwix_desktop.py
View File

@ -14,15 +14,11 @@ class KiwixDesktop(Dependency):
make_install_targets = ["install"] make_install_targets = ["install"]
configure_env = None configure_env = None
flatpack_build_options = {"env": ["QMAKEPATH=/app/lib"]} flatpack_build_options = {"env": {"QMAKEPATH": "/app/lib"}}
@property @property
def configure_options(self): def configure_options(self):
if self.buildEnv.configInfo.name == "flatpak": if self.buildEnv.configInfo.name != "flatpak":
yield "QMAKE_INCDIR+=/app/include/QtWebEngine"
yield "QMAKE_INCDIR+=/app/include/QtWebEngineCore"
yield "QMAKE_INCDIR+=/app/include/QtWebEngineWidgets"
else:
yield f"PREFIX={self.buildEnv.install_dir}" yield f"PREFIX={self.buildEnv.install_dir}"
if self.buildEnv.configInfo.static: if self.buildEnv.configInfo.static:
yield "CONFIG+=static" yield "CONFIG+=static"

14
kiwixbuild/flatpak_builder.py
View File

@ -37,19 +37,18 @@ MANIFEST = {
"runtime": "org.kde.Platform", "runtime": "org.kde.Platform",
"runtime-version": base_deps_versions["org.kde"], "runtime-version": base_deps_versions["org.kde"],
"base": "io.qt.qtwebengine.BaseApp", "base": "io.qt.qtwebengine.BaseApp",
"base-version": base_deps_versions[ "base-version": base_deps_versions["io.qt.qtwebengine"],
"org.kde"
], # keep BaseApp (qwebengine) in sync with org.kde
"sdk": "org.kde.Sdk", "sdk": "org.kde.Sdk",
"command": "kiwix-desktop", "command": "kiwix-desktop",
"rename-icon": "kiwix-desktop", "rename-icon": "kiwix-desktop",
"finish-args": [ "finish-args": [
"--device=dri",
"--env=QTWEBENGINEPROCESS_PATH=/app/bin/QtWebEngineProcess",
"--socket=wayland", "--socket=wayland",
"--socket=x11", "--socket=fallback-x11",
"--socket=pulseaudio",
"--share=network", "--share=network",
"--share=ipc", "--share=ipc",
"--device=dri",
"--socket=pulseaudio",
], ],
"cleanup": [ "cleanup": [
"/include", "/include",
@ -69,6 +68,7 @@ MANIFEST = {
"/share/doc", "/share/doc",
"/share/man", "/share/man",
], ],
"cleanup-commands": ["/app/cleanup-BaseApp.sh"],
} }
GET_REF_URL_API_TEMPLATE = "https://api.github.com/repos{repo}/git/refs/tags/{ref}" GET_REF_URL_API_TEMPLATE = "https://api.github.com/repos{repo}/git/refs/tags/{ref}"
@ -297,7 +297,7 @@ class FlatpakBuilder:
tlc = Dependency.all_deps[tlcName] tlc = Dependency.all_deps[tlcName]
builderDef = (cfgName, tlcName) builderDef = (cfgName, tlcName)
builder = get_target_step(builderDef) builder = get_target_step(builderDef)
print("build {} ({}):".format(builder.name, cfgName[0])) print("build {} ({}):".format(builder.name, cfgName))
add_target_step(builderDef, builder) add_target_step(builderDef, builder)
builder.build() builder.build()
print("[GENERATE FLATPAK MANIFEST]") print("[GENERATE FLATPAK MANIFEST]")

4
kiwixbuild/versions.py
View File

@ -58,8 +58,8 @@ base_deps_versions = {
"android-ndk": "r21e", "android-ndk": "r21e",
"qt": "5.10.1", "qt": "5.10.1",
"qtwebengine": "5.10.1", "qtwebengine": "5.10.1",
"org.kde": "5.15-21.08", "org.kde": "5.15-23.08",
"io.qt.qtwebengine": "5.15-21.08", "io.qt.qtwebengine": "5.15-23.08",
"zim-testing-suite": "0.6.0", "zim-testing-suite": "0.6.0",
"emsdk": "3.1.41", "emsdk": "3.1.41",
} }