diff options
| author | Lennart Trunk <lennart.trunk@outlook.de> | 2019-01-16 23:54:59 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-16 14:54:59 -0800 |
| commit | 13ec61a842588480f49d3c3a6a3b42d70df4fa84 (patch) | |
| tree | 22e58b2e86d147dbad41c9bf90660524d881b5f8 /ports/qt5-base | |
| parent | 672ea9a1b3222673342b37ea26dacad0a1c38288 (diff) | |
| download | vcpkg-13ec61a842588480f49d3c3a6a3b42d70df4fa84.tar.gz vcpkg-13ec61a842588480f49d3c3a6a3b42d70df4fa84.zip | |
[qt5] update to QT5.12 (#4991)
* update qt5-base to 5.12
* update modules to 5.12 (qt5-declarative and dependents don't work yet)
* fix qt5-declarative for 5.12 and some hashes.
* add qt5-declarative as dependency for qt5-graphicaleffects
Diffstat (limited to 'ports/qt5-base')
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-base/fix-system-freetype.patch | 11 | ||||
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 820137710..fdf74b20c 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.11.2-1 +Version: 5.12.0 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 diff --git a/ports/qt5-base/fix-system-freetype.patch b/ports/qt5-base/fix-system-freetype.patch index 88211bc68..d83fc9891 100644 --- a/ports/qt5-base/fix-system-freetype.patch +++ b/ports/qt5-base/fix-system-freetype.patch @@ -1,12 +1,17 @@ +--- + src/gui/configure.json | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + diff --git a/src/gui/configure.json b/src/gui/configure.json -index 28c8034..4c7c0a7 100644 +index 0332631e..bd64b7b1 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -157,7 +157,7 @@ +@@ -164,8 +164,7 @@ }, "sources": [ { "type": "pkgConfig", "args": "freetype2" }, -- { "type": "freetype", "libs": "-lfreetype" } +- { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" }, +- { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + { "libs": "-lfreetype" } ] }, diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 696ae0cb6..79b7f763d 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -11,14 +11,14 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) include(configure_qt) include(install_qt) -set(MAJOR_MINOR 5.11) -set(FULL_VERSION ${MAJOR_MINOR}.2) +set(MAJOR_MINOR 5.12) +set(FULL_VERSION ${MAJOR_MINOR}.0) set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz") vcpkg_download_distfile(ARCHIVE_FILE URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" FILENAME ${ARCHIVE_NAME} - SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835 + SHA512 8e6c51b754840d17e694b5b4a0d732afe04ebe48d166bca429db01ce3ac9014bb0ed35fe99ad165973889d96919f6b6774429585bae9a7fdba6b07f4c1eb3570 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH |