fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-03-30 03:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix libssl connection error for Windows

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-07-22 15:58:29 +03:00
parent 63e2910b8e
commit 3759931b0d
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
appveyor.yml
View File

@@ -59,13 +59,18 @@ after_build:
- copy "%APPVEYOR_BUILD_FOLDER%\build\translations\Internationalization_*.qm" "distrib\flameshot\translations"
# Delete translations\qt_*.qm
- del /F /Q "distrib\flameshot\translations\qt_*.qm"
# Copy OpenSSL DLLs
# Copy OpenSSL DLLs ()
- if "%PLATFORM%" EQU "X64" (xcopy "openssl-utils.git\win64\*.dll" "distrib\flameshot")
- if "%PLATFORM%" EQU "x86" (xcopy "openssl-utils.git\win32\*.dll" "distrib\flameshot")
- cd distrib
- if "%PLATFORM%" EQU "X64" (mv flameshot\vcredist_x64.exe flameshot\vcredist.exe)
- if "%PLATFORM%" EQU "x86" (mv flameshot\vcredist_x86.exe flameshot\vcredist.exe)
- 7z a flameshot_%flameshot_version%_win_%PLATFORM%.zip flameshot
# Download and install vcredist-2013 for OpenSSL binnaries
- if "%PLATFORM%" EQU "X64" appveyor DownloadFile https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe
- if "%PLATFORM%" EQU "X64" (mv vcredist_x64.exe flameshot\vcredist-2013.exe)
- if "%PLATFORM%" EQU "x86" appveyor DownloadFile https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe
- if "%PLATFORM%" EQU "x86" (mv vcredist_x86.exe flameshot\vcredist-2013.exe)
# Build installation
- cp ..\..\win_setup\flameshot.iss flameshot.iss
- C:\InnoSetup\Compil32.exe /cc flameshot.iss

2
flameshot.pro
View File

@@ -6,6 +6,8 @@
win32:LIBS += -luser32 -lshell32
LIBS += -Llibeay32 -Lssleay32
BASE_VERSION = 0.7.5
TAG_VERSION = "$$system(git --git-dir $$PWD/.git rev-parse --short HEAD)"
isEmpty(TAG_VERSION){

4
win_setup/flameshot.iss
View File

@@ -32,6 +32,7 @@ Source: "flameshot\iconengines\*"; DestDir: "{app}\iconengines"
Source: "flameshot\imageformats\*"; DestDir: "{app}\imageformats"
Source: "flameshot\platforms\*"; DestDir: "{app}\platforms"
Source: "flameshot\translations\*"; DestDir: "{app}\translations"
Source: "flameshot\vcredist-2013.exe"; DestDir: {app}
Source: "flameshot\vcredist.exe"; DestDir: {app}
[Icons]
@@ -44,6 +45,9 @@ Name: "{group}\FlameShot Documentation"; Filename: "{app}\flameshot-documentatio
; you don't need a [Registry] section.
[Run]
Filename: {app}\vcredist-2013.exe; \
Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"""; \
StatusMsg: "Installing VC++ 2013 Redistributables..."
Filename: {app}\vcredist.exe; \
Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"""; \
StatusMsg: "Installing VC++ 2015 Redistributables..."