diff --git a/docs/building.md b/docs/building.md index 9707f1f1a..492639b05 100644 --- a/docs/building.md +++ b/docs/building.md @@ -53,7 +53,26 @@ sudo apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 libbz2- ### Build dependencies Install basic dependencies ``` -sudo apt-get install libssl-dev curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev llvm python3-distutils g++ gcc gperf libopencv-dev +sudo apt-get install libssl-dev curl unzip automake build-essential file pkg-config git python3 libtool libtinfo6 cmake libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev llvm g++ gcc gperf libopencv-dev python3-typogrify xsltproc valac gobject-introspection meson +``` + +For Ubuntu 20.04, +``` +sudo apt-get install vapigen +pip3 install --upgrade meson==0.64.1 markdown==3.4.1 markupsafe==2.1.1 jinja2==3.1.2 pygments==2.13.0 toml==0.10.2 typogrify==2.0.7 tomli==2.0.1 +``` + +For Ubuntu 24.04, +``` +sudo apt install pipx libgcrypt20-dev libglib2.0-dev libsecret-1-dev +pipx install meson==0.64.1 markdown==3.4.1 markupsafe==2.1.1 jinja2==3.1.2 pygments==2.13.0 toml==0.10.2 typogrify==2.0.7 tomli==2.0.1 +``` + +Install `libtinfo5` (required by [monero_c](https://github.com/MrCyjaneK/monero_c), should be dropped in the future): +``` +wget http://mirrors.kernel.org/ubuntu/pool/universe/n/ncurses/libtinfo5_6.3-2ubuntu0.1_amd64.deb -O libtinfo5.deb \ + && apt install ./libtinfo5.deb \ + && rm libtinfo5.deb ``` Install [Rust](https://www.rust-lang.org/tools/install) via [rustup.rs](https://rustup.rs), the required Rust toolchains, and `cargo-ndk 2.12.7` with command: diff --git a/scripts/app_config/templates/pubspec.template b/scripts/app_config/templates/pubspec.template index 09f01701d..862731c6e 100644 --- a/scripts/app_config/templates/pubspec.template +++ b/scripts/app_config/templates/pubspec.template @@ -33,7 +33,7 @@ dependencies: flutter_libsparkmobile: git: url: https://github.com/cypherstack/flutter_libsparkmobile.git - ref: cc7b43b731e4a7906dd25d4364a08e34554cee19 + ref: 9318bdd8e76e4dc8a49e3d64e8851c85e017eff3 # cs_monero compat (unpublished) compat: diff --git a/scripts/linux/build_secure_storage_deps.sh b/scripts/linux/build_secure_storage_deps.sh index aff3097dc..9956d286c 100755 --- a/scripts/linux/build_secure_storage_deps.sh +++ b/scripts/linux/build_secure_storage_deps.sh @@ -32,7 +32,7 @@ if ! [ -x "$(command -v meson)" ]; then echo 'Error: meson is not installed.' >&2 exit 1 fi -meson _build +meson _build -Dmanpage=false -Dgtk_doc=false if ! [ -x "$(command -v ninja)" ]; then echo 'Error: ninja is not installed.' >&2 exit 1 diff --git a/scripts/windows/deps.sh b/scripts/windows/deps.sh index 4914d074f..c9975b457 100644 --- a/scripts/windows/deps.sh +++ b/scripts/windows/deps.sh @@ -3,6 +3,7 @@ cd ../../crypto_plugins/flutter_libepiccash/scripts/windows && ./deps.sh cd ../../crypto_plugins/flutter_liblelantus/scripts/windows && ./mxedeps.sh # cd ../../crypto_plugins/flutter_libmonero/scripts/windows && ./monerodeps.sh && ./mxedeps.sh +sudo apt install libgtk2.0-dev wait echo "Done building"