diff --git a/kiwixbuild/dependencies/flatpak.py b/kiwixbuild/dependencies/flatpak.py index c17e71a..3e32a98 100644 --- a/kiwixbuild/dependencies/flatpak.py +++ b/kiwixbuild/dependencies/flatpak.py @@ -8,7 +8,6 @@ pj = os.path.join class org_kde(Dependency): neutral = False name = 'org.kde' - version = '5.11' Source = NoopSource @@ -26,7 +25,7 @@ class org_kde(Dependency): command = command.format( remote_name = 'flathub', name = self.target.name, - version = self.target.version + version = self.target.version() ) run_command(command, self.buildEnv.build_dir, context, buildEnv=self.buildEnv) @@ -34,4 +33,3 @@ class org_kde(Dependency): self.command('setup_remote', self._setup_remote) self.command('install_sdk', self._install_sdk) - diff --git a/kiwixbuild/flatpak_builder.py b/kiwixbuild/flatpak_builder.py index bc0c727..b750309 100644 --- a/kiwixbuild/flatpak_builder.py +++ b/kiwixbuild/flatpak_builder.py @@ -7,6 +7,7 @@ from .platforms import PlatformInfo from .utils import remove_duplicates, run_command, StopBuild, Context from .dependencies import Dependency from .packages import PACKAGE_NAME_MAPPERS +from .versions import base_deps_versions from ._global import ( neutralEnv, option, add_target_step, get_target_step, target_steps, @@ -28,7 +29,7 @@ from shutil import copyfile MANIFEST = { 'app-id': 'org.kiwix.desktop', 'runtime': 'org.kde.Platform', - 'runtime-version': '5.11', + 'runtime-version': base_deps_versions['org.kde'], 'sdk': 'org.kde.Sdk', 'command': 'kiwix-desktop', 'rename-icon': 'kiwix-desktop', diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py index b34524d..1048da7 100644 --- a/kiwixbuild/versions.py +++ b/kiwixbuild/versions.py @@ -55,4 +55,5 @@ base_deps_versions = { 'android-ndk' : 'r13b', 'qt' : '5.10.1', 'qtwebengine' : '5.10.1', + 'org.kde' : '5.12', }