-
Notifications
You must be signed in to change notification settings - Fork 6.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[qt5] Update to 5.12.1 and add some missing modules (#5293)
* 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
- Loading branch information
1 parent
63265da
commit 473e803
Showing
63 changed files
with
334 additions
and
244 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: qt5-3d | ||
Version: 5.12.0 | ||
Version: 5.12.1 | ||
Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering | ||
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: qt5-activeqt | ||
Version: 5.12.0 | ||
Version: 5.12.1 | ||
Description: Qt5 ActiveQt Module - ActiveX components | ||
Build-Depends: qt5-modularscripts, qt5-base |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: qt5-base | ||
Version: 5.12.0 | ||
Version: 5.12.1 | ||
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. | ||
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
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" ] | ||
}, |
Oops, something went wrong.