mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-06-07 12:26:08 +08:00
[fltk] fix narrowing error in clang-cl (#29995)
* [fltk] fix narrowing error in clang-cl * v db
This commit is contained in:
parent
e12d82b8eb
commit
391313b9de
13
ports/fltk/fix-narrow.patch
Normal file
13
ports/fltk/fix-narrow.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/fluid/ExternalCodeEditor_WIN32.cxx b/fluid/ExternalCodeEditor_WIN32.cxx
|
||||||
|
index 4646fe5..3b7f693 100644
|
||||||
|
--- a/fluid/ExternalCodeEditor_WIN32.cxx
|
||||||
|
+++ b/fluid/ExternalCodeEditor_WIN32.cxx
|
||||||
|
@@ -474,7 +474,7 @@ void ExternalCodeEditor::reap_cleanup() {
|
||||||
|
int ExternalCodeEditor::reap_editor(DWORD *pid_reaped) {
|
||||||
|
if ( pid_reaped ) *pid_reaped = 0;
|
||||||
|
if ( !is_editing() ) return -2;
|
||||||
|
- int err;
|
||||||
|
+ DWORD err;
|
||||||
|
DWORD msecs_wait = 50; // .05 sec
|
||||||
|
switch ( err = WaitForSingleObject(pinfo_.hProcess, msecs_wait) ) {
|
||||||
|
case WAIT_TIMEOUT: { // process didn't reap, still running
|
@ -12,6 +12,7 @@ vcpkg_from_github(
|
|||||||
include.patch
|
include.patch
|
||||||
fix-system-link.patch
|
fix-system-link.patch
|
||||||
math-h-polyfill.patch
|
math-h-polyfill.patch
|
||||||
|
fix-narrow.patch
|
||||||
)
|
)
|
||||||
file(REMOVE_RECURSE
|
file(REMOVE_RECURSE
|
||||||
"${SOURCE_PATH}/jpeg"
|
"${SOURCE_PATH}/jpeg"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "fltk",
|
"name": "fltk",
|
||||||
"version": "1.3.8",
|
"version": "1.3.8",
|
||||||
"port-version": 4,
|
"port-version": 5,
|
||||||
"description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
|
"description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.",
|
||||||
"homepage": "https://www.fltk.org/",
|
"homepage": "https://www.fltk.org/",
|
||||||
"license": null,
|
"license": null,
|
||||||
|
@ -2486,7 +2486,7 @@
|
|||||||
},
|
},
|
||||||
"fltk": {
|
"fltk": {
|
||||||
"baseline": "1.3.8",
|
"baseline": "1.3.8",
|
||||||
"port-version": 4
|
"port-version": 5
|
||||||
},
|
},
|
||||||
"fluidlite": {
|
"fluidlite": {
|
||||||
"baseline": "2020-08-27",
|
"baseline": "2020-08-27",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "bb00fc235046a91ebcdb47e9bcb4474b82cb81d8",
|
||||||
|
"version": "1.3.8",
|
||||||
|
"port-version": 5
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "20def1217e8d9ac6306e900f9bdc5662bf593d82",
|
"git-tree": "20def1217e8d9ac6306e900f9bdc5662bf593d82",
|
||||||
"version": "1.3.8",
|
"version": "1.3.8",
|
||||||
|
Loading…
Reference in New Issue
Block a user