Skip to content

Captcha4

Gabriel Margiani requested to merge gamarg/whisperfish:captcha4 into master

This time it works (hopefully)

Contains bundled sqlcipher sources. Alternatively, they could be removed and pulled in using the get-sqlcipher.sh from build.rs to pull them in. We may need to switch to a newer version for Sailfish4, I haven't checked.

For a successful build, -lcrypto has to be added to the RUSTC link-flags. This can't be added from build.rs because cargo gets the ordering wrong. (It has to come after -lsqlcipher, which is added by libsqlite-sys and therefore comes after all flags from build.rs)

The rendering is quite fragile - I'm a little scared it could break on other screen aspect rations. Maybe we will find a way to make this more reliable some day, but for now, this is the best we've got.

TODO

  • cargo fmt -> now the diff contains a lot of unrelated lines, sorry
  • libsignal-service merge
    • Remove the Cargo [patch] section
Edited by Gabriel Margiani

Merge request reports