From: Olivier Goffart <ogoffart@woboq.com>
Date: Fri, 21 Jul 2017 06:54:06 +0000 (+0200)
Subject: buildint.rst: Put back reference to openssl on windows
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~704^2^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=075c423c62da59cf12bdba676a7b17efa274a708;p=nextcloud-desktop.git

buildint.rst: Put back reference to openssl on windows

OpenSSL might no longer be needed to build the client, but we still need
it to run it.

That reverts part of commit 6e57b0219edd7dcc99509620277bb53478d958a6 for
this file.

Fix #5858
Reported in https://central.owncloud.org/t/locally-built-client-error-creating-ssl-context/8264
---

diff --git a/doc/building.rst b/doc/building.rst
index 48f6f0212..5207b45f7 100644
--- a/doc/building.rst
+++ b/doc/building.rst
@@ -120,6 +120,7 @@ follow `Windows Installer Build (Cross-Compile)`_ instead.
 
    * Make sure that you have CMake_ and Git_.
    * Download the Qt_ MinGW package. You will use the MinGW version bundled with it.
+   * Download an `OpenSSL Windows Build`_ (the non-"Light" version)
 
 2. Get the QtKeychain_ sources as well as the latest versions of the ownCloud client
    from Git as follows::
@@ -129,10 +130,11 @@ follow `Windows Installer Build (Cross-Compile)`_ instead.
 
 3. Open the Qt MinGW shortcut console from the Start Menu
 
-4. Make sure that your qtkeychain source directories are in your PATH. This will
-   allow CMake to find the library and headers, as well as allow the ownCloud
-   client to find the DLLs at runtime::
+4. Make sure that OpenSSL's ``bin`` directory as well as your qtkeychain source
+   directories are in your PATH. This will allow CMake to find the library and
+   headers, as well as allow the ownCloud client to find the DLLs at runtime::
 
+    set PATH=C:\<OpenSSL Install Dir>\bin;%PATH%
     set PATH=C:\<qtkeychain Clone Dir>;%PATH%
 
 5. Build qtkeychain **directly in the source directory** so that the DLL is built
@@ -277,6 +279,7 @@ The following are known cmake parameters:
 .. _Git: http://git-scm.com
 .. _MacPorts: http://www.macports.org
 .. _Homebrew: http://mxcl.github.com/homebrew/
+.. _OpenSSL Windows Build: http://slproweb.com/products/Win32OpenSSL.html
 .. _Qt: http://www.qt.io/download
 .. _Microsoft Authenticode: https://msdn.microsoft.com/en-us/library/ie/ms537361%28v=vs.85%29.aspx
 .. _QtKeychain: https://github.com/frankosterfeld/qtkeychain