Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update qt5 to 5.12.1 and add some missing modules #5293

Merged
merged 33 commits into from
Feb 22, 2019
Merged

Update qt5 to 5.12.1 and add some missing modules #5293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
030ffd3
Update qt5-base to 5.12.1
TheScarfix Feb 2, 2019
0571055
update qt5-declarative to 5.12.1
TheScarfix Feb 2, 2019
1c36f36
update qt5-modularscripts for 5.12.1
TheScarfix Feb 2, 2019
da17a84
update qt5-3d to 5.12.1
TheScarfix Feb 2, 2019
110c75d
update qt5-activeqt to 5.12.1
TheScarfix Feb 2, 2019
d96ccf4
add qt5-connectivity
TheScarfix Feb 2, 2019
5cff9d4
update qt5-charts to 5.12.1
TheScarfix Feb 2, 2019
378de47
update qt5-datavis3d to 5.12.1
TheScarfix Feb 2, 2019
ea2e37f
update qt5-gamepad to 5.12.1
TheScarfix Feb 2, 2019
34790da
update qt5-graphicaleffects to 5.12.1
TheScarfix Feb 2, 2019
04a3f47
update qt5-imageformats to 5.12.1
TheScarfix Feb 2, 2019
31a4d84
add qt5-location
TheScarfix Feb 2, 2019
28c3595
update qt5-multimedia to 5.12.1
TheScarfix Feb 2, 2019
a007ffb
update qt5-networkauth to 5.12.1
TheScarfix Feb 2, 2019
143a8a2
add qt5-purchasing
TheScarfix Feb 2, 2019
7e207a9
update qt5-quickcontrols to 5.12.1
TheScarfix Feb 2, 2019
18a5b8f
update qt5-quickcontrols2 to 5.12.1
TheScarfix Feb 2, 2019
63f3f67
add qt5-remoteobjects
TheScarfix Feb 2, 2019
740364d
update qt5-script to 5.12.1
TheScarfix Feb 2, 2019
4bb5275
update qt5-scxml to 5.12.1
TheScarfix Feb 2, 2019
e397221
add qt5-sensors
TheScarfix Feb 2, 2019
11dd4af
update qt5-serialport to 5.12.1
TheScarfix Feb 2, 2019
93f5055
update qt5-speech to 5.12.1
TheScarfix Feb 2, 2019
4271950
update qt5-svg to 5.12.1
TheScarfix Feb 2, 2019
f365781
update qt5-tools to 5.12.1
TheScarfix Feb 2, 2019
81d43c3
update qt5-virtualkeyboard to 5.12.1
TheScarfix Feb 2, 2019
d0a8a0d
add qt5-webchannel
TheScarfix Feb 2, 2019
3fec798
update qt5-websockets to 5.12.1
TheScarfix Feb 2, 2019
91743de
update qt5-winextras to 5.12.1
TheScarfix Feb 2, 2019
c09724f
update qt5-xmlpatterns to 5.12.1
TheScarfix Feb 2, 2019
c5befff
update framework port to 5.12.1 and include the new modules
TheScarfix Feb 2, 2019
6eecb0e
fix building qt5-base on linux
TheScarfix Feb 3, 2019
19175da
[qt5] Remove non-alphanumerical ASCII chars from dependencies
vicroms Feb 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/qt5-3d/CONTROL
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ports/qt5-3d/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ include(vcpkg_common_functions)

include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)

qt_modular_library(qt3d 4df1c07d5fce5771779bf8c43f41f97c8135702f606e7d0766bb17f8819057038b0b83366469ffbcef39e36a527a771d6905ae000f37ce67e6cad3a769e28eba)
qt_modular_library(qt3d 4c054b1075e976043fca5033a27be8a3f0d2df5dde5da4a536a9e7d61cdfd91007a2bf687bc19ad59724a2d53a9730b5d2446238bb7c6289d6a5dd3bf220a409)
2 changes: 1 addition & 1 deletion ports/qt5-activeqt/CONTROL
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ports/qt5-activeqt/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ include(vcpkg_common_functions)

include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)

qt_modular_library(qtactiveqt 439ba83a10763b29419d34bac42d11c59964e9d279cbee0faa51198cfbc91ef0fe60b4b96ea516dcdcc9bc6696599d266b406a0d5e9a6e182ca61df67349a11c)
qt_modular_library(qtactiveqt ff2871a7c0fa2674354f8bbd32196d8b2af34212e09e0f8c1df23182353959464dfb8c96800e45dae380f239082f62ed6f1904e72dc93e43141edb4f2606edd9)

#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)
2 changes: 1 addition & 1 deletion ports/qt5-base/CONTROL
View file
Open in desktop
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
40 changes: 40 additions & 0 deletions ports/qt5-base/fix-gui-configure-json.patch
View file
Open in desktop
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" ]
},
Loading