From 233029ca210b459f02a36abcc703218509885709 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Tue, 10 Sep 2024 12:25:54 -0500 Subject: [PATCH 1/8] add patch and git apply --stat scripts/dev/0001-ubuntu-24.04.patch thanks, MrCyjaneK --- docs/building.md | 11 +- pubspec.lock | 6 +- scripts/app_config/templates/pubspec.template | 4 +- scripts/dev/0001-ubuntu-24.04.patch | 100 ++++++++++++++++++ scripts/linux/build_secp256k1.sh | 2 +- scripts/linux/build_secure_storage_deps.sh | 2 +- 6 files changed, 116 insertions(+), 9 deletions(-) create mode 100644 scripts/dev/0001-ubuntu-24.04.patch diff --git a/docs/building.md b/docs/building.md index d4597d7e8..12948e4ae 100644 --- a/docs/building.md +++ b/docs/building.md @@ -53,14 +53,21 @@ 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 vapigen meson +``` + +libtinfo5 (required for monero_c, will be dropped once we are at 0.19.x.. maybe) +``` +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) with command: ``` curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh source ~/.bashrc -rustup install 1.67.1 1.72.0 1.73.0 +rustup install 1.67.1 1.71.0 1.72.0 1.73.0 rustup default 1.67.1 cargo install cargo-ndk --version 2.12.7 --locked ``` diff --git a/pubspec.lock b/pubspec.lock index 71163db91..7bd79531d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -732,9 +732,9 @@ packages: dependency: "direct main" description: path: "." - ref: "7a11d0cadf8c7a6a5d5144dab18cef9536aa5943" - resolved-ref: "7a11d0cadf8c7a6a5d5144dab18cef9536aa5943" - url: "https://github.com/cypherstack/flutter_libsparkmobile.git" + ref: "69e9a50715b89497951eba67f1313549708b7c6d" + resolved-ref: "69e9a50715b89497951eba67f1313549708b7c6d" + url: "https://github.com/mrcyjanek/flutter_libsparkmobile.git" source: git version: "0.0.1" flutter_lints: diff --git a/scripts/app_config/templates/pubspec.template b/scripts/app_config/templates/pubspec.template index ee10f28ab..963457afc 100644 --- a/scripts/app_config/templates/pubspec.template +++ b/scripts/app_config/templates/pubspec.template @@ -32,8 +32,8 @@ dependencies: flutter_libsparkmobile: git: - url: https://github.com/cypherstack/flutter_libsparkmobile.git - ref: 7a11d0cadf8c7a6a5d5144dab18cef9536aa5943 + url: https://github.com/mrcyjanek/flutter_libsparkmobile.git + ref: 69e9a50715b89497951eba67f1313549708b7c6d flutter_libmonero: path: ./crypto_plugins/flutter_libmonero diff --git a/scripts/dev/0001-ubuntu-24.04.patch b/scripts/dev/0001-ubuntu-24.04.patch new file mode 100644 index 000000000..08f642182 --- /dev/null +++ b/scripts/dev/0001-ubuntu-24.04.patch @@ -0,0 +1,100 @@ +From f76f37404784a9283c55a7b11eef109edda3d05a Mon Sep 17 00:00:00 2001 +From: Czarek Nakamoto +Date: Tue, 3 Sep 2024 09:04:02 +0200 +Subject: [PATCH] ubuntu 24.04 + +--- + docs/building.md | 11 +++++++++-- + pubspec.lock | 6 +++--- + scripts/app_config/templates/pubspec.template | 4 ++-- + scripts/linux/build_secp256k1.sh | 2 +- + scripts/linux/build_secure_storage_deps.sh | 2 +- + 5 files changed, 16 insertions(+), 9 deletions(-) + +diff --git a/docs/building.md b/docs/building.md +index d4597d7e..12948e4a 100644 +--- a/docs/building.md ++++ b/docs/building.md +@@ -53,14 +53,21 @@ 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 vapigen meson ++``` ++ ++libtinfo5 (required for monero_c, will be dropped once we are at 0.19.x.. maybe) ++``` ++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) with command: + ``` + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + source ~/.bashrc +-rustup install 1.67.1 1.72.0 1.73.0 ++rustup install 1.67.1 1.71.0 1.72.0 1.73.0 + rustup default 1.67.1 + cargo install cargo-ndk --version 2.12.7 --locked + ``` +diff --git a/pubspec.lock b/pubspec.lock +index 001cb4b6..f51df73d 100644 +--- a/pubspec.lock ++++ b/pubspec.lock +@@ -732,9 +732,9 @@ packages: + dependency: "direct main" + description: + path: "." +- ref: "7a11d0cadf8c7a6a5d5144dab18cef9536aa5943" +- resolved-ref: "7a11d0cadf8c7a6a5d5144dab18cef9536aa5943" +- url: "https://github.com/cypherstack/flutter_libsparkmobile.git" ++ ref: "69e9a50715b89497951eba67f1313549708b7c6d" ++ resolved-ref: "69e9a50715b89497951eba67f1313549708b7c6d" ++ url: "https://github.com/mrcyjanek/flutter_libsparkmobile.git" + source: git + version: "0.0.1" + flutter_lints: +diff --git a/scripts/app_config/templates/pubspec.template b/scripts/app_config/templates/pubspec.template +index dc0323d2..0116b939 100644 +--- a/scripts/app_config/templates/pubspec.template ++++ b/scripts/app_config/templates/pubspec.template +@@ -32,8 +32,8 @@ dependencies: + + flutter_libsparkmobile: + git: +- url: https://github.com/cypherstack/flutter_libsparkmobile.git +- ref: 7a11d0cadf8c7a6a5d5144dab18cef9536aa5943 ++ url: https://github.com/mrcyjanek/flutter_libsparkmobile.git ++ ref: 69e9a50715b89497951eba67f1313549708b7c6d + + flutter_libmonero: + path: ./crypto_plugins/flutter_libmonero +diff --git a/scripts/linux/build_secp256k1.sh b/scripts/linux/build_secp256k1.sh +index 6fdd9f58..e333b723 100755 +--- a/scripts/linux/build_secp256k1.sh ++++ b/scripts/linux/build_secp256k1.sh +@@ -6,5 +6,5 @@ mkdir -p build && cd build + cmake .. + cmake --build . + mkdir -p ../../../../../build +-cp src/libsecp256k1.so.2.2.1 "../../../../../build/libsecp256k1.so" ++cp src/libsecp256k1.so.2.*.* "../../../../../build/libsecp256k1.so" + cd ../../../ +diff --git a/scripts/linux/build_secure_storage_deps.sh b/scripts/linux/build_secure_storage_deps.sh +index aff3097d..9956d286 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 +-- +2.43.0 + diff --git a/scripts/linux/build_secp256k1.sh b/scripts/linux/build_secp256k1.sh index 6fdd9f58c..e333b723c 100755 --- a/scripts/linux/build_secp256k1.sh +++ b/scripts/linux/build_secp256k1.sh @@ -6,5 +6,5 @@ mkdir -p build && cd build cmake .. cmake --build . mkdir -p ../../../../../build -cp src/libsecp256k1.so.2.2.1 "../../../../../build/libsecp256k1.so" +cp src/libsecp256k1.so.2.*.* "../../../../../build/libsecp256k1.so" cd ../../../ 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 From c47bf0b21ce00113278635d658bcaa028fe60cb4 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Tue, 10 Sep 2024 23:49:02 -0500 Subject: [PATCH 2/8] mirror flutter_libsparkmobile changes to cypherstack --- scripts/app_config/templates/pubspec.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/app_config/templates/pubspec.template b/scripts/app_config/templates/pubspec.template index 963457afc..d9acb3782 100644 --- a/scripts/app_config/templates/pubspec.template +++ b/scripts/app_config/templates/pubspec.template @@ -32,8 +32,8 @@ dependencies: flutter_libsparkmobile: git: - url: https://github.com/mrcyjanek/flutter_libsparkmobile.git - ref: 69e9a50715b89497951eba67f1313549708b7c6d + url: https://github.com/cypherstack/flutter_libsparkmobile.git + ref: d88de9506fda95a3114134817d172a841d93947e flutter_libmonero: path: ./crypto_plugins/flutter_libmonero From 99ea691bef080fd693abc6bff2e102191b24288e Mon Sep 17 00:00:00 2001 From: sneurlax Date: Tue, 10 Sep 2024 23:51:23 -0500 Subject: [PATCH 3/8] update docs for 24.04 reqs --- docs/building.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/building.md b/docs/building.md index 12948e4ae..dc31dfedb 100644 --- a/docs/building.md +++ b/docs/building.md @@ -81,9 +81,19 @@ rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-andro Linux desktop specific dependencies: ``` sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev meson python3-pip libgirepository1.0-dev valac xsltproc docbook-xsl +``` + +For Ubuntu 20.04, +``` 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 +``` + After installing the prerequisites listed above, download the code and init the submodules ``` git clone https://github.com/cypherstack/stack_wallet.git From 51c45d43320866cc5794b486a0bd6407df8bd449 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Wed, 11 Sep 2024 00:18:31 -0500 Subject: [PATCH 4/8] touch docs and scripts move windows dep from docs to script that's already ran according to the docs but also correct the docs re: the windows scripts --- docs/building.md | 62 ++++++++++++++++++++--------------------- scripts/windows/deps.sh | 7 +++-- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/docs/building.md b/docs/building.md index dc31dfedb..4e73ea6e4 100644 --- a/docs/building.md +++ b/docs/building.md @@ -56,17 +56,28 @@ Install basic dependencies 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 vapigen meson ``` -libtinfo5 (required for monero_c, will be dropped once we are at 0.19.x.. maybe) +For Ubuntu 20.04, +``` +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) with command: +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: ``` curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -source ~/.bashrc +source ~/.bashrc rustup install 1.67.1 1.71.0 1.72.0 1.73.0 rustup default 1.67.1 cargo install cargo-ndk --version 2.12.7 --locked @@ -83,17 +94,7 @@ Linux desktop specific dependencies: sudo apt-get install clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev meson python3-pip libgirepository1.0-dev valac xsltproc docbook-xsl ``` -For Ubuntu 20.04, -``` -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 -``` - +### Clone the repository and initialize submodules After installing the prerequisites listed above, download the code and init the submodules ``` git clone https://github.com/cypherstack/stack_wallet.git @@ -109,17 +110,15 @@ cd scripts/linux cd ../.. ``` -### Build coinlib -Coinlib's native secp256k1 library must be built prior to running Stack Wallet. It can be built from within the root `stack_wallet` folder on a... - - Linux host for Linux targets: `dart run coinlib:build_linux`, or +### Build secp256k1 +Coinlib requires a secp256k1 library to be built prior to running Stack Wallet. It can be built from within the root `stack_wallet` folder on a... + - Linux host for Linux targets: `dart run coinlib:build_linux` (requires [Docker](https://docs.docker.com/engine/install/ubuntu/) or [`podman`](https://podman.io/docs/installation)) - Linux host for Windows targets: `dart run coinlib:build_windows_crosscompile` - Windows host: `dart run coinlib:build_windows` - WSL2 host: `dart run coinlib:build_wsl` - macOS host: `dart run coinlib:build_macos` -To build coinlib on Linux, you will need `docker` (see [installation instructions](https://docs.docker.com/engine/install/ubuntu/)) or [`podman`](https://podman.io/docs/installation) (`sudo apt-get -y install podman`) - -For Windows targets, you can use a `secp256k1.dll` produced by any of the three middle options if the first attempt doesn't succeed. +or by using `scripts/linux/build_secp256k1.sh` or `scripts/windows/build_secp256k1.bat`. ### Run prebuild script @@ -134,7 +133,7 @@ or manually by creating the files referenced in that script with the specified c ### Build plugins #### Build script: `build_app.sh` -The `build_app.sh` script is use to build applications Stack Wallet. View the script's help message with `./build_app.sh -h` for more information on its usage. +The `build_app.sh` script is used to build the Stack Wallet and its family of applications. View the script's help message with `./build_app.sh -h` for more information on its usage. Options: @@ -161,7 +160,7 @@ cd scripts cd scripts ./build_app.sh -a stack_wallet -p linux ``` - + +TODO: configure compiler to prefer built over system libraries. Should already use them? --> #### Building plugins and configure for Windows +Install dependencies like MXE: ``` -cd scripts +cd scripts/windows ./deps.sh -./build_app.sh -a stack_wallet -p windows +``` + +and use `scripts/build_app.sh` to build plugins: +``` +cd .. +./build_app.sh -a stack_wallet -p windows -v 2.1.0 -b 210 ``` ### Running @@ -289,16 +294,11 @@ Install the following libraries: sudo apt-get install libgtk2.0-dev ``` -You will also need to install MXE on the WSL2 Ubuntu 20.04 host and can do so by running `stack_wallet/scripts/windows/deps.sh`: -``` -./stack_wallet/scripts/windows/deps.sh -``` - The WSL2 host may optionally be navigated to the `stack_wallet` repository on the Windows host in order to build the plugins in-place and skip the next section in which you copy the `dll`s from WSL2 to Windows. Then build windows `dll` libraries by running the following script on the WSL2 Ubuntu 20.04 host: - `stack_wallet/scripts/windows/build_all.sh` -Copy the resulting `dll`s to their respective positions on the Windows host: +If the DLLs were built on the WSL filesystem instead of on Windows, copy the resulting `dll`s to their respective positions on the Windows host: - `stack_wallet/crypto_plugins/flutter_libepiccash/scripts/windows/build/libepic_cash_wallet.dll` - `stack_wallet/crypto_plugins/flutter_liblelantus/scripts/windows/build/libmobileliblelantus.dll` diff --git a/scripts/windows/deps.sh b/scripts/windows/deps.sh index 802ca8f8a..c9975b457 100644 --- a/scripts/windows/deps.sh +++ b/scripts/windows/deps.sh @@ -1,8 +1,9 @@ #!/bin/bash -(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) & +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" From f7b367a3aafa0896487ed6c587c6d4102921a6ae Mon Sep 17 00:00:00 2001 From: sneurlax Date: Wed, 11 Sep 2024 11:32:07 -0500 Subject: [PATCH 5/8] re-add vapigen to 20.04 docs --- docs/building.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/building.md b/docs/building.md index 72a052a63..614282512 100644 --- a/docs/building.md +++ b/docs/building.md @@ -53,11 +53,12 @@ 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 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 vapigen meson +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 ``` From 57a50a96cdbaf0ef050ac86bbeeb5c98ca73f6ce Mon Sep 17 00:00:00 2001 From: sneurlax Date: Wed, 11 Sep 2024 11:42:34 -0500 Subject: [PATCH 6/8] mirror mrcyjanek/monero_c to cypherstack as of 9/11 --- crypto_plugins/flutter_libmonero | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero index c0b899400..52bdb85f0 160000 --- a/crypto_plugins/flutter_libmonero +++ b/crypto_plugins/flutter_libmonero @@ -1 +1 @@ -Subproject commit c0b8994009d29bc7fd2f0f2edbb004c39bf93951 +Subproject commit 52bdb85f0a87793327a794aba477ac8b967c315f From ae9a844ed86327aa889da30dd2b97c63cd927568 Mon Sep 17 00:00:00 2001 From: julian Date: Wed, 20 Nov 2024 11:40:57 -0600 Subject: [PATCH 7/8] remove patchception --- scripts/dev/0001-ubuntu-24.04.patch | 100 ---------------------------- 1 file changed, 100 deletions(-) delete mode 100644 scripts/dev/0001-ubuntu-24.04.patch diff --git a/scripts/dev/0001-ubuntu-24.04.patch b/scripts/dev/0001-ubuntu-24.04.patch deleted file mode 100644 index 08f642182..000000000 --- a/scripts/dev/0001-ubuntu-24.04.patch +++ /dev/null @@ -1,100 +0,0 @@ -From f76f37404784a9283c55a7b11eef109edda3d05a Mon Sep 17 00:00:00 2001 -From: Czarek Nakamoto -Date: Tue, 3 Sep 2024 09:04:02 +0200 -Subject: [PATCH] ubuntu 24.04 - ---- - docs/building.md | 11 +++++++++-- - pubspec.lock | 6 +++--- - scripts/app_config/templates/pubspec.template | 4 ++-- - scripts/linux/build_secp256k1.sh | 2 +- - scripts/linux/build_secure_storage_deps.sh | 2 +- - 5 files changed, 16 insertions(+), 9 deletions(-) - -diff --git a/docs/building.md b/docs/building.md -index d4597d7e..12948e4a 100644 ---- a/docs/building.md -+++ b/docs/building.md -@@ -53,14 +53,21 @@ 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 vapigen meson -+``` -+ -+libtinfo5 (required for monero_c, will be dropped once we are at 0.19.x.. maybe) -+``` -+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) with command: - ``` - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh - source ~/.bashrc --rustup install 1.67.1 1.72.0 1.73.0 -+rustup install 1.67.1 1.71.0 1.72.0 1.73.0 - rustup default 1.67.1 - cargo install cargo-ndk --version 2.12.7 --locked - ``` -diff --git a/pubspec.lock b/pubspec.lock -index 001cb4b6..f51df73d 100644 ---- a/pubspec.lock -+++ b/pubspec.lock -@@ -732,9 +732,9 @@ packages: - dependency: "direct main" - description: - path: "." -- ref: "7a11d0cadf8c7a6a5d5144dab18cef9536aa5943" -- resolved-ref: "7a11d0cadf8c7a6a5d5144dab18cef9536aa5943" -- url: "https://github.com/cypherstack/flutter_libsparkmobile.git" -+ ref: "69e9a50715b89497951eba67f1313549708b7c6d" -+ resolved-ref: "69e9a50715b89497951eba67f1313549708b7c6d" -+ url: "https://github.com/mrcyjanek/flutter_libsparkmobile.git" - source: git - version: "0.0.1" - flutter_lints: -diff --git a/scripts/app_config/templates/pubspec.template b/scripts/app_config/templates/pubspec.template -index dc0323d2..0116b939 100644 ---- a/scripts/app_config/templates/pubspec.template -+++ b/scripts/app_config/templates/pubspec.template -@@ -32,8 +32,8 @@ dependencies: - - flutter_libsparkmobile: - git: -- url: https://github.com/cypherstack/flutter_libsparkmobile.git -- ref: 7a11d0cadf8c7a6a5d5144dab18cef9536aa5943 -+ url: https://github.com/mrcyjanek/flutter_libsparkmobile.git -+ ref: 69e9a50715b89497951eba67f1313549708b7c6d - - flutter_libmonero: - path: ./crypto_plugins/flutter_libmonero -diff --git a/scripts/linux/build_secp256k1.sh b/scripts/linux/build_secp256k1.sh -index 6fdd9f58..e333b723 100755 ---- a/scripts/linux/build_secp256k1.sh -+++ b/scripts/linux/build_secp256k1.sh -@@ -6,5 +6,5 @@ mkdir -p build && cd build - cmake .. - cmake --build . - mkdir -p ../../../../../build --cp src/libsecp256k1.so.2.2.1 "../../../../../build/libsecp256k1.so" -+cp src/libsecp256k1.so.2.*.* "../../../../../build/libsecp256k1.so" - cd ../../../ -diff --git a/scripts/linux/build_secure_storage_deps.sh b/scripts/linux/build_secure_storage_deps.sh -index aff3097d..9956d286 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 --- -2.43.0 - From 6c42da2add3cbeba2610661d2f32f85857b0198f Mon Sep 17 00:00:00 2001 From: julian Date: Wed, 20 Nov 2024 16:57:33 -0600 Subject: [PATCH 8/8] use updated spark lib --- scripts/app_config/templates/pubspec.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: