diff options
| author | Philipp Hörist <philipp@hoerist.com> | 2018-11-11 18:40:08 +0300 |
|---|---|---|
| committer | Philipp Hörist <philipp@hoerist.com> | 2018-11-11 18:40:08 +0300 |
| commit | 5ecdfbee5c4ba4e084df4dc6b291c5a6ad8fa207 (patch) | |
| tree | ea096230e8e8ecd8b051d656ad1c3200e1c9f91d /win | |
| parent | ac5bfe2d7c2bc4e917c763fbca3100c0150bb36e (diff) | |
Windows: Remove old ssl fix
Diffstat (limited to 'win')
| -rw-r--r-- | win/_base.sh | 13 | ||||
| -rw-r--r-- | win/build.sh | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/win/_base.sh b/win/_base.sh index dd1a0563a..44424de9b 100644 --- a/win/_base.sh +++ b/win/_base.sh @@ -302,19 +302,6 @@ function cleanup_install { } -function download_ssl_libs { - # Python needs these ssl libs but msys does not provide them - curl -o "${BUILD_ROOT}"/ssl.zip https://gajim.org/downloads/snap/win/build/ssl.zip - 7z x -o"${MINGW_ROOT}"/bin "${BUILD_ROOT}"/ssl.zip -} - -function move_ssl_libs { - # Pythons ssl module searches in that path for these dlls, if they are not there - # C:/Windows/system32 is searcherd and potentially wrong versioned dlls are found there - cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/libeay32.dll - cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/ssleay32.dll -} - function build_installer { (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi) (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) diff --git a/win/build.sh b/win/build.sh index 729c548e6..b77134680 100644 --- a/win/build.sh +++ b/win/build.sh @@ -17,8 +17,6 @@ function main { install_deps install_gajim cleanup_install - download_ssl_libs - move_ssl_libs build_installer } |