diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2018-11-07 23:49:47 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-11-07 14:49:47 -0800 |
| commit | 4aba36cd381f42bead4b74bc49362359873f9760 (patch) | |
| tree | 47e3ae7f46f18c91f97bc4c08be9d1f43ea3b53e /ports/qt5-base | |
| parent | 799de417ea2f703151dc275527ff723ab8801a2b (diff) | |
| download | vcpkg-4aba36cd381f42bead4b74bc49362359873f9760.tar.gz vcpkg-4aba36cd381f42bead4b74bc49362359873f9760.zip | |
Qt version bump 5.11.2 (#4629)
* Qt 5.11.2 version bump
* removed unecessary qt patch
* fix wrong hash for qt5-networkauth
Diffstat (limited to 'ports/qt5-base')
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-base/fix-msvc2017.patch | 27 | ||||
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 5 |
3 files changed, 3 insertions, 31 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 4eb7e3842..820137710 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ Source: qt5-base -Version: 5.11.1-5 +Version: 5.11.2-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 diff --git a/ports/qt5-base/fix-msvc2017.patch b/ports/qt5-base/fix-msvc2017.patch deleted file mode 100644 index c1f9254ff..000000000 --- a/ports/qt5-base/fix-msvc2017.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf ---- a/mkspecs/common/msvc-version.conf 2018-06-15 03:29:31.000000000 -0400 -+++ b/mkspecs/common/msvc-version.conf 2018-08-23 00:26:46.436806400 -0400 -@@ -112,4 +112,11 @@ - COMPAT_MKSPEC = - } - -+ -+# MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without -+# this flag since the fix breaks binary compatibility. -+greaterThan(QMAKE_MSC_VER, 1914) { -+ DEFINES += _ENABLE_EXTENDED_ALIGNED_STORAGE -+} -+ - !isEmpty(COMPAT_MKSPEC):!$$COMPAT_MKSPEC: CONFIG += $$COMPAT_MKSPEC -diff -Naur a/qmake/Makefile.win32 b/qmake/Makefile.win32 ---- a/qmake/Makefile.win32 2018-06-15 03:29:31.000000000 -0400 -+++ b/qmake/Makefile.win32 2018-08-23 00:27:45.764849600 -0400 -@@ -39,7 +39,7 @@ - -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS \ - -DQT_VERSION_STR=\"$(QT_VERSION)\" -DQT_VERSION_MAJOR=$(QT_MAJOR_VERSION) -DQT_VERSION_MINOR=$(QT_MINOR_VERSION) -DQT_VERSION_PATCH=$(QT_PATCH_VERSION) \ - -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL \ -- -DQT_NO_FOREACH -DUNICODE -+ -DQT_NO_FOREACH -DUNICODE -D_ENABLE_EXTENDED_ALIGNED_STORAGE - CFLAGS = $(CFLAGS_PCH) $(CFLAGS_BARE) $(CFLAGS) - - CXXFLAGS_BARE = $(CFLAGS_BARE) diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index b58fe326e..b6d140f88 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -12,13 +12,13 @@ include(configure_qt) include(install_qt) set(MAJOR_MINOR 5.11) -set(FULL_VERSION ${MAJOR_MINOR}.1) +set(FULL_VERSION ${MAJOR_MINOR}.2) 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 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81 + SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -28,7 +28,6 @@ vcpkg_extract_source_archive_ex( fix-system-freetype.patch fix-system-pcre2.patch fix-system-pcre2-linux.patch - fix-msvc2017.patch ) # Remove vendored dependencies to ensure they are not picked up by the build |