Add missing openssl libs to windows package. Fix #173

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Fixed: AppImage update fails with "None of the artifacts matched the pattern in the update information". ([#166](https://github.com/DamirPorobic/ksnip/issues/166))
 * Fixed: Wildcards in path are not resolved. ([#168](https://github.com/DamirPorobic/ksnip/issues/168))
 * Fixed: CLI arg --rectarea doesn't work. ([#170](https://github.com/DamirPorobic/ksnip/issues/170))
+* Fixed: Imgur Uploader on windows issue. ([#173](https://github.com/DamirPorobic/ksnip/issues/173))
 * Fixed kImageAnnotator: Unable to select number annotation when clicking on the number without background. ([#46](https://github.com/DamirPorobic/kImageAnnotator/issues/46))
 
 ## Release 1.5.0

ci/scripts/bootstrap.sh

@@ -16,20 +16,23 @@ elif [[ "${BUILD_TYPE}" == "rpm" ]]; then
 elif [[ "${BUILD_TYPE}" == "exe" ]]; then
     source ci/scripts/exe/bootstrap_envvars.sh
 
-    echo "--> Download Qt"
+    echo "--> Download Dependencies"
 
     QT_BASE_URL="https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_563/qt.563.win32_msvc2015/5.6.3-0-201709190903"
     wget --quiet -O qtbase.7z "${QT_BASE_URL}qtbase-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86.7z"
     wget --quiet -O qtwinextras.7z "${QT_BASE_URL}qtwinextras-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86.7z"
     wget --quiet -O qttools.7z "${QT_BASE_URL}qttools-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86.7z"
     wget --quiet -O qttranslations.7z "${QT_BASE_URL}qttranslations-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86.7z"
     wget --quiet -O qtsvg.7z "${QT_BASE_URL}qtsvg-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86.7z"
+	wget --quiet -O openssl.zip "https://indy.fulgan.com/SSL/openssl-1.0.2q-i386-win32.zip"
 
     7z x qtbase.7z -o/c/qt
     7z x qtwinextras.7z -o/c/qt
     7z x qttools.7z -o/c/qt
     7z x qttranslations.7z -o/c/qt
     7z x qtsvg.7z -o/c/qt
+
+    7z x openssl.zip -o/c/openssl
 
     # windeployqt fails to find the binaries so we link the binaries where its looking for it
     WINDEPLOYQT_QT_DIR="/c/Users/qt/work"

ci/scripts/build.sh

@@ -14,16 +14,16 @@ elif [[ "${BUILD_TYPE}" == "exe" ]]; then
     cmake .. -G"NMake Makefiles" -DCMAKE_CXX_COMPILER=cl -DVERSION_SUFIX=${VERSION_SUFFIX} -DBUILD_NUMBER=${BUILD_NUMBER} -DCMAKE_BUILD_TYPE=Release
     nmake
     cd ..
+
     echo "--> Package Windows"
     mkdir packageDir
     mv build/src/ksnip*.exe packageDir/ksnip.exe
     windeployqt.exe packageDir/ksnip.exe
     cp build/translations/ksnip_*.qm ./packageDir/translations/
-    7z a ksnip-${VERSION}-windows.zip ./packageDir/*
-
-	echo "--> Check for OpenSSL Libs"
-	sudo find /c -name "ssleay32.dll" -o -name "libeay32.dll" 2>&-
+	cp /c/openssl/libeay32.dll ./packageDir/
+	cp /c/openssl/ssleay32.dll ./packageDir/
 
+    7z a ksnip-${VERSION}-windows.zip ./packageDir/*
 elif [[ "${BUILD_TYPE}" == "app" ]]; then
     mkdir build && cd build
     cmake .. -DVERSION_SUFIX=${VERSION_SUFFIX} -DBUILD_NUMBER=${BUILD_NUMBER} -DCMAKE_BUILD_TYPE=Release

ci/scripts/rpm/build_rpm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 cd ksnip-*
-rpmbuild -ba SPECS/ksnip-*.spec --define '_topdir %(pwd)'
+rpmbuild -ba SPECS/ksnip-*.spec --define '_topdir %(pwd)'

ci/scripts/rpm/setup_rpm_directory_structure.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 echo "--> Create directory and everything we need to deliver"
-mkdir ksnip-$VERSION_NUMBER
-cp -R CMakeLists.txt cmake/ desktop/ icons/ LICENSE README.md src/ translations/ ksnip-$VERSION_NUMBER/
+mkdir ksnip-${VERSION_NUMBER}
+cp -R CMakeLists.txt cmake/ desktop/ icons/ LICENSE README.md src/ translations/ ksnip-${VERSION_NUMBER}/
 echo "--> Package directory"
-tar -cvzf ksnip-$VERSION_NUMBER.tar.gz ksnip-$VERSION_NUMBER/
-echo "--> Copy package to SOURCE directory"
-mkdir ksnip-$VERSION_NUMBER/SOURCES
-cp ksnip-$VERSION_NUMBER.tar.gz ksnip-$VERSION_NUMBER/SOURCES/
+tar -cvzf ksnip-${VERSION_NUMBER}.tar.gz ksnip-${VERSION_NUMBER}/
+echo "--> Move package to SOURCE directory"
+mkdir ksnip-${VERSION_NUMBER}/SOURCES
+mv ksnip-${VERSION_NUMBER}.tar.gz ksnip-${VERSION_NUMBER}/SOURCES/
 echo "--> Copy spec file to SPEC directory"
-mkdir ksnip-$VERSION_NUMBER/SPECS
-cp ksnip.spec ksnip-$VERSION_NUMBER/SPECS/ksnip-$VERSION_NUMBER.spec
+mkdir ksnip-${VERSION_NUMBER}/SPECS
+cp ksnip.spec ksnip-${VERSION_NUMBER}/SPECS/ksnip-${VERSION_NUMBER}.spec

ci/scripts/setup.sh

@@ -76,7 +76,7 @@ elif [[ "${BUILD_TYPE}" == "rpm" ]]; then
     source ci/scripts/rpm/setup_spec_file.sh
     source ci/scripts/rpm/setup_rpm_directory_structure.sh
 
-    sudo chown -R root:root ksnip-$VERSION_NUMBER
+    sudo chown -R root:root ksnip-${VERSION_NUMBER}
 elif [[ "${BUILD_TYPE}" == "exe" ]]; then
     source ci/scripts/exe/setup_dependencies_windows.sh
 elif [[ "${BUILD_TYPE}" == "app" ]]; then