From fc016c691f3b04d52fa2a357bcf70f082df1ddf3 Mon Sep 17 00:00:00 2001 From: Christian Stadelmann Date: Tue, 29 Nov 2016 01:05:16 +0100 Subject: [PATCH] docs(INSTALL.md): update Fedora info on sqlcipher The recently released Fedora 25 ships sqlcipher and older versions will follow. See https://apps.fedoraproject.org/packages/sqlcipher for details. Yum is so old and deprecated that there's no use in naming it any more. --- INSTALL.md | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 7849742fc..98ecec67b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -140,8 +140,6 @@ sudo apt-get install git #### Fedora -*`yum` is now officially deprecated by `dnf`. using `yum` will redirect to `dnf` -on Fedora 21 and fail on future versions.* ```bash sudo dnf install git ``` @@ -199,10 +197,11 @@ libsqlcipher-dev #### Fedora -**Note that sqlcipher is not included in Fedora(!).** - -**This means that you have to compile sqlcipher yourself, otherwise compiling -qTox will fail.** +**Note that sqlcipher is not included in all versions of Fedora yet.** +As of writing this section (November 2016), Fedora 25 ships sqlcipher, but +Fedora 24 and older don't ship it yet. +**This means that if you can't install sqlcipher from repositories, you'll +have to compile it yourself, otherwise compiling qTox will fail.** ```bash sudo dnf groupinstall "Development Tools" "C Development Tools and Libraries" # (can also use sudo dnf install @"Development Tools") @@ -210,8 +209,11 @@ sudo dnf install qt-devel qt-doc qt-creator qt5-qtsvg qt5-qtsvg-devel \ openal-soft-devel libXScrnSaver-devel qrencode-devel ffmpeg-devel \ qtsingleapplication qt5-linguist gtk2-devel libtool openssl-devel ``` +```bash +sudo dnf install sqlcipher sqlcipher-devel +``` -**Go to [sqlcipher](#sqlcipher) section to compile it.** +**Go to [sqlcipher](#sqlcipher) section to compile it if necessary.** #### openSUSE @@ -296,7 +298,8 @@ libopus-dev libvpx-dev libsodium-dev ### sqlcipher -If you are not using Fedora, skip this section, and go directly to compiling +If you are not using an old version of Fedora, skip this section, and go +directly to compiling [**toxcore**](#toxcore-compiling). ```bash