mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 06:07:49 +08:00
473e803451
* Update qt5-base to 5.12.1 * update qt5-declarative to 5.12.1 * update qt5-modularscripts for 5.12.1 * update qt5-3d to 5.12.1 * update qt5-activeqt to 5.12.1 * add qt5-connectivity * update qt5-charts to 5.12.1 * update qt5-datavis3d to 5.12.1 * update qt5-gamepad to 5.12.1 * update qt5-graphicaleffects to 5.12.1 * update qt5-imageformats to 5.12.1 * add qt5-location * update qt5-multimedia to 5.12.1 * update qt5-networkauth to 5.12.1 * add qt5-purchasing * update qt5-quickcontrols to 5.12.1 * update qt5-quickcontrols2 to 5.12.1 * add qt5-remoteobjects * update qt5-script to 5.12.1 * update qt5-scxml to 5.12.1 * add qt5-sensors * update qt5-serialport to 5.12.1 * update qt5-speech to 5.12.1 * update qt5-svg to 5.12.1 * update qt5-tools to 5.12.1 * update qt5-virtualkeyboard to 5.12.1 * add qt5-webchannel * update qt5-websockets to 5.12.1 * update qt5-winextras to 5.12.1 * update qt5-xmlpatterns to 5.12.1 * update framework port to 5.12.1 and include the new modules * fix building qt5-base on linux * [qt5] Remove non-alphanumerical ASCII chars from dependencies
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
diff --git a/src/gui/configure.json b/src/gui/configure.json
|
|
index 89934c8f..70d08177 100644
|
|
--- a/src/gui/configure.json
|
|
+++ b/src/gui/configure.json
|
|
@@ -239,7 +239,8 @@
|
|
"sources": [
|
|
{ "type": "pkgConfig", "args": "freetype2" },
|
|
{ "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
|
|
- { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
|
|
+ { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
|
|
+ { "libs": "-lfreetype" }
|
|
],
|
|
"use": [
|
|
{ "lib": "zlib", "condition": "features.system-zlib" }
|
|
@@ -250,7 +251,7 @@
|
|
"test": {
|
|
"tail": [
|
|
"#ifndef FC_RGBA_UNKNOWN",
|
|
- "# error This version of fontconfig is tool old, it is missing the FC_RGBA_UNKNOWN define",
|
|
+ "# error This version of fontconfig is too old, it is missing the FC_RGBA_UNKNOWN define",
|
|
"#endif"
|
|
],
|
|
"main": [
|
|
@@ -1436,7 +1437,7 @@
|
|
},
|
|
"eglfs_x11": {
|
|
"label": "EGLFS X11",
|
|
- "condition": "features.eglfs && features.xcb && features.xcb-xlib && features.egl_x11",
|
|
+ "condition": "features.eglfs && features.xcb-xlib && features.egl_x11",
|
|
"output": [ "privateFeature" ]
|
|
},
|
|
"gif": {
|
|
@@ -1569,7 +1570,6 @@
|
|
},
|
|
"xcb-xlib": {
|
|
"label": "XCB Xlib",
|
|
- "emitIf": "features.xcb",
|
|
"condition": "features.xlib && libs.xcb_xlib",
|
|
"output": [ "privateFeature" ]
|
|
},
|