Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
4aff5e97
Commit
4aff5e97
authored
1 month ago
by
Andreas Traczyk
Browse files
Options
Downloads
Patches
Plain Diff
contrib: Windows: bump openssl to 3.4.0
Gitlab:
#1108
Change-Id: Ib11ddad75a421816c1a954d96c051aff4ea0d6b9
parent
cbba52ef
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/src/openssl/openssl-uwp.patch
+0
-30
0 additions, 30 deletions
contrib/src/openssl/openssl-uwp.patch
contrib/src/openssl/package.json
+3
-3
3 additions, 3 deletions
contrib/src/openssl/package.json
with
3 additions
and
33 deletions
contrib/src/openssl/openssl-uwp.patch
deleted
100644 → 0
+
0
−
30
View file @
cbba52ef
--- a/ms/setVSvars.bat
+++ b/ms/setVSvars.bat
@@ -166,7 +166,7 @@
exit /b
:set_VS15VC
if not "%_VS15VC%"=="" goto :eof
- for /f "usebackq tokens=1* delims=: " %%i in (`%~dp0\vswhere -latest -requires Microsoft.VisualStudio.Workload.Universal -requires Microsoft.VisualStudio.ComponentGroup.UWP.VC`) do (
+ for /f "usebackq tokens=1* delims=: " %%i in (`%~dp0\vswhere -latest -requires Microsoft.VisualStudio.Workload.Universal`) do (
if /i "%%i"=="installationPath" set _VS15VC=%%j\VC\Auxiliary\Build
)
if not "%_VS15VC%"=="" goto :eof
--- a/ms/winrt.cpp
+++ b/ms/winrt.cpp
@@ -291,13 +291,6 @@
extern "C"
{
return 0;
}
-
- BOOL WINAPI FlushConsoleInputBuffer(
- _In_ HANDLE hConsoleInput
- )
- {
- return 0;
- }
BOOL DeleteDC(
_In_ HDC hdc
)
--
2.10.2.windows.1
This diff is collapsed.
Click to expand it.
contrib/src/openssl/package.json
+
3
−
3
View file @
4aff5e97
{
"name"
:
"openssl"
,
"version"
:
"
O
pen
SSL_1_1_1-stable
"
,
"cpe"
:
"cpe:2.3:a:openssl:openssl:
1.1.1
:*:*:*:*:*:*:*"
,
"url"
:
"https://github.com/openssl/openssl/archive/__VERSION__.tar.gz"
,
"version"
:
"
o
pen
ssl-3.4.0
"
,
"cpe"
:
"cpe:2.3:a:openssl:openssl:
3.4.0
:*:*:*:*:*:*:*"
,
"url"
:
"https://github.com/openssl/openssl/archive/
refs/tags/
__VERSION__.tar.gz"
,
"custom_scripts"
:
{
"build"
:
[
"call perl Configure no-asm no-hw no-tests /Z7 /FS VC-WIN64A"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment