Qt 5.11 and static build fixes (#4164)

* fix da qt5

* fix qt config duplication

* [qt5-base] Use vcpkg_extract_source_archive_ex
[sqlite3] Enable SQLITE_ENABLE_COLUMN_METADATA

* [qt5-*] Update sub-portfiles

* qt5-base WIP

* [qt5] Fix Could not find qmlcachegen.exe

* [qt5-activeqt] Fix SHA512

* [qt5-base] Fix static builds

* [qt5-base] Bump control version

* [qt5-base] Restore removal of qmake dependencies

* [qt5-base] Partially revert #3280

* [qt5-base][vcpkg_build_qmake] Fix Qt5Bootstrap.lib issues
This commit is contained in:
Robert Colton 2018-10-22 13:49:16 -04:00 committed by Robert Schumacher
parent cba23fe693
commit 473d63c4ed
56 changed files with 176 additions and 190 deletions

View File

@ -1,4 +1,4 @@
Source: qscintilla
Version: 2.10-4
Version: 2.10-5
Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin)
Build-Depends: qt5-base

View File

@ -1,4 +1,4 @@
Source: qt5-3d
Version: 5.9.2-0
Version: 5.11.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

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qt3d 1c7dbd4e557cdd183ec6e929aae5727ce2ffcb519517942b588594bb81a78cb3d732cde4dae58085a70ec2968a8c2443eae96536125c25938222ff7c89f4f9a2)
qt_modular_library(qt3d d1a07586d6b64ff3b1e85c41c8b3b86f6327e9e63f5f45344a65a6136179f6a8361ca9da80944b244d8edc53d8b0e9f8b646d613f6b42faac6cb724f49573a8a)

View File

@ -1,4 +1,4 @@
Source: qt5-activeqt
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 ActiveQt Module - ActiveX components
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtactiveqt c013e5cba0b11af88161d3cad21923c4b3bf04b0905e5b0c527c1984806d0eb39f31322ff464b139f5d36b5c9f4afefe70492fc1e1f0e964e6e0eaa3f6edaaf9)
qt_modular_library(qtactiveqt a6fb4a3a53f5965e0913276a784f2fce81351a9c54cc190f15b431a497e04a4b823a8cec132713e382dc4e3ab2edef967e920c7aaa7392a72d7b12263c9f4876)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-activeqt/platforminputcontexts)

View File

@ -1,4 +1,4 @@
Source: qt5-base
Version: 5.9.2-7
Version: 5.11.1-2
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

View File

@ -32,11 +32,11 @@ function(configure_qt)
-debug
-prefix ${CURRENT_INSTALLED_DIR}/debug
-extprefix ${CURRENT_PACKAGES_DIR}/debug
-hostbindir ${CURRENT_INSTALLED_DIR}/debug/tools/qt5
-archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug
-datadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug
-plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins
-qmldir ${CURRENT_INSTALLED_DIR}/debug/qml
-hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5
-archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
-datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug
-plugindir ${CURRENT_PACKAGES_DIR}/debug/plugins
-qmldir ${CURRENT_PACKAGES_DIR}/debug/qml
-headerdir ${CURRENT_PACKAGES_DIR}/include
-I ${CURRENT_INSTALLED_DIR}/include
-L ${CURRENT_INSTALLED_DIR}/debug/lib
@ -53,11 +53,11 @@ function(configure_qt)
-release
-prefix ${CURRENT_INSTALLED_DIR}
-extprefix ${CURRENT_PACKAGES_DIR}
-hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5
-archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5
-datadir ${CURRENT_INSTALLED_DIR}/share/qt5
-plugindir ${CURRENT_INSTALLED_DIR}/plugins
-qmldir ${CURRENT_INSTALLED_DIR}/qml
-hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5
-archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5
-datadir ${CURRENT_PACKAGES_DIR}/share/qt5
-plugindir ${CURRENT_PACKAGES_DIR}/plugins
-qmldir ${CURRENT_PACKAGES_DIR}/qml
-I ${CURRENT_INSTALLED_DIR}/include
-L ${CURRENT_INSTALLED_DIR}/lib
-platform ${_csc_PLATFORM}

View File

@ -1,56 +0,0 @@
diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h
index c0f7709f..3784ceff 100644
--- a/src/corelib/tools/qalgorithms.h
+++ b/src/corelib/tools/qalgorithms.h
@@ -590,6 +590,7 @@ Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NO
}
#elif defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) && !defined(Q_PROCESSOR_ARM)
#define QT_POPCOUNT_CONSTEXPR
+#define QT_POPCOUNT_RELAXED_CONSTEXPR
#define QT_HAS_BUILTIN_CTZ
Q_ALWAYS_INLINE unsigned long qt_builtin_ctz(quint32 val)
{
@@ -676,6 +677,7 @@ Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NOTHROW
#ifndef QT_POPCOUNT_CONSTEXPR
#define QT_POPCOUNT_CONSTEXPR Q_DECL_CONSTEXPR
+#define QT_POPCOUNT_RELAXED_CONSTEXPR Q_DECL_RELAXED_CONSTEXPR
#endif
} //namespace QAlgorithmsPrivate
@@ -819,7 +821,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint32 v) Q_DECL_NOT
#endif
}
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) Q_DECL_NOTHROW
+QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) Q_DECL_NOTHROW
{
#if defined(QT_HAS_BUILTIN_CLZ)
return v ? QAlgorithmsPrivate::qt_builtin_clz(v)-24U : 8U;
@@ -831,7 +833,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) Q_DECL_NOTH
#endif
}
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DECL_NOTHROW
+QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DECL_NOTHROW
{
#if defined(QT_HAS_BUILTIN_CLZS)
return v ? QAlgorithmsPrivate::qt_builtin_clzs(v) : 16U;
@@ -844,7 +846,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DECL_NOT
#endif
}
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) Q_DECL_NOTHROW
+QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) Q_DECL_NOTHROW
{
#if defined(QT_HAS_BUILTIN_CLZLL)
return v ? QAlgorithmsPrivate::qt_builtin_clzll(v) : 64U;
@@ -859,7 +861,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) Q_DECL_NOT
#endif
}
-Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(unsigned long v) Q_DECL_NOTHROW
+QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(unsigned long v) Q_DECL_NOTHROW
{
return qCountLeadingZeroBits(QIntegerForSizeof<long>::Unsigned(v));
}

View File

@ -0,0 +1,27 @@
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)

View File

@ -1,17 +1,16 @@
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index a5a1b66..5a48a05 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -163,8 +163,10 @@
"builds": {
"debug": "-lpcre2-16d",
"release": "-lpcre2-16"
- }
- }
+ },
+ "condition": "config.win32"
+ },
+ { "libs": "-lpcre2-16", "condition": "!config.win32" }
]
},
"pps": {
diff -Naur a/src/corelib/configure.json b/src/corelib/configure.json
--- a/src/corelib/configure.json 2018-08-23 02:58:54.544949500 -0400
+++ b/src/corelib/configure.json 2018-08-23 02:59:31.481175300 -0400
@@ -181,8 +181,10 @@
"builds": {
"debug": "-lpcre2-16d",
"release": "-lpcre2-16"
- }
- }
+ },
+ "condition": "config.win32"
+ },
+ { "libs": "-lpcre2-16", "condition": "!config.win32" }
]
},
"pps": {

View File

@ -1,11 +1,10 @@
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index a5b69a2..01c5cde 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -159,7 +159,12 @@
]
diff -Naur a/src/corelib/configure.json b/src/corelib/configure.json
--- a/src/corelib/configure.json 2018-06-15 03:29:31.000000000 -0400
+++ b/src/corelib/configure.json 2018-08-23 00:46:04.380187100 -0400
@@ -177,7 +177,12 @@
},
"sources": [
{ "type": "pkgConfig", "args": "libpcre2-16" },
- "-lpcre2-16"
+ {
+ "builds": {

View File

@ -7,31 +7,32 @@ if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
)
endif()
if((NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Qt5 doesn't currently support static builds. Please use a dynamic triplet instead.")
endif()
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
include(configure_qt)
include(install_qt)
set(SRCDIR_NAME "qtbase-5.9.2")
set(ARCHIVE_NAME "qtbase-opensource-src-5.9.2")
set(ARCHIVE_EXTENSION ".tar.xz")
set(MAJOR_MINOR 5.11)
set(FULL_VERSION ${MAJOR_MINOR}.1)
set(ARCHIVE_NAME "qtbase-everywhere-src-${FULL_VERSION}.tar.xz")
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME})
vcpkg_download_distfile(ARCHIVE_FILE
URLS "http://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/${ARCHIVE_NAME}${ARCHIVE_EXTENSION}"
FILENAME ${SRCDIR_NAME}${ARCHIVE_EXTENSION}
SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7
URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
FILENAME ${ARCHIVE_NAME}
SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE "${ARCHIVE_FILE}"
REF ${FULL_VERSION}
PATCHES
fix-system-freetype.patch
fix-system-pcre2.patch
fix-system-pcre2-linux.patch
fix-msvc2017.patch
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
if (EXISTS ${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME})
file(RENAME ${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME} ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME})
endif()
# Remove vendored dependencies to ensure they are not picked up by the build
foreach(DEPENDENCY freetype zlib harfbuzzng libjpeg libpng double-conversion)
foreach(DEPENDENCY freetype zlib harfbuzzng libjpeg libpng double-conversion sqlite)
if(EXISTS ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
file(REMOVE_RECURSE ${SOURCE_PATH}/src/3rdparty/${DEPENDENCY})
endif()
@ -39,15 +40,6 @@ endforeach()
file(REMOVE_RECURSE ${SOURCE_PATH}/include/QtZlib)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
"${CMAKE_CURRENT_LIST_DIR}/fix-system-pcre2.patch"
"${CMAKE_CURRENT_LIST_DIR}/fix-system-freetype.patch"
"${CMAKE_CURRENT_LIST_DIR}/fix-system-pcre2-linux.patch"
"${CMAKE_CURRENT_LIST_DIR}/fix-C3615.patch"
)
# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
set(ENV{_CL_} "/utf-8")
@ -61,26 +53,31 @@ set(CORE_OPTIONS
-system-pcre
-system-harfbuzz
-system-doubleconversion
-system-sqlite
-no-fontconfig
-nomake examples -nomake tests
-nomake examples
-nomake tests
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND CORE_OPTIONS
-static
)
else()
list(APPEND CORE_OPTIONS
-sql-sqlite
-sql-psql
)
endif()
if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
set(PLATFORM "win32-msvc2015")
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
set(PLATFORM "win32-msvc2017")
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120")
set(PLATFORM "win32-msvc2013")
endif()
set(PLATFORM "win32-msvc")
configure_qt(
SOURCE_PATH ${SOURCE_PATH}
PLATFORM ${PLATFORM}
OPTIONS
${CORE_OPTIONS}
-sql-sqlite
-sql-psql
-system-sqlite
-mp
-opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop"
LIBJPEG_LIBS="-ljpeg"
@ -88,12 +85,14 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
ZLIB_LIBS="-lzlib"
LIBPNG_LIBS="-llibpng16"
FREETYPE_LIBS="-lfreetype"
PSQL_LIBS="-llibpq"
OPTIONS_DEBUG
ZLIB_LIBS="-lzlibd"
LIBPNG_LIBS="-llibpng16d"
PSQL_LIBS="-llibpqd"
FREETYPE_LIBS="-lfreetyped"
)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
configure_qt(
SOURCE_PATH ${SOURCE_PATH}
@ -168,6 +167,15 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qtmain.lib)
file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/qtmaind.prl)
#---------------------------------------------------------------------------
# Qt5Bootstrap: only used to bootstrap qmake dependencies
#---------------------------------------------------------------------------
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.lib)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Bootstrap.prl)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.lib ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.lib)
file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Qt5Bootstrap.prl ${CURRENT_PACKAGES_DIR}/tools/qt5/Qt5Bootstrap.prl)
#---------------------------------------------------------------------------
endif()
file(GLOB_RECURSE PRL_FILES "${CURRENT_PACKAGES_DIR}/lib/*.prl" "${CURRENT_PACKAGES_DIR}/debug/lib/*.prl")

View File

@ -1,4 +1,4 @@
Source: qt5-charts
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtcharts 297547b565dd71b05237bb05ecc1abf1a774a4909668417e78bd65e805c1e47a456a5a06898fe06d4c4614118e4129e19893d4c77598667a9354ab969307a293)
qt_modular_library(qtcharts e3c02ea9bd985a8d051e305dd04e58711de3b666128a695011afd65271a2c7bcb11763c18fe201045ce03df96326490ca7322bdc0f77e97988ec59427505886b)

View File

@ -1,4 +1,4 @@
Source: qt5-datavis3d
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtdatavis3d 5f173401ba2f0ebb4bbb1ff65053f1ece44a97a8bf1d9fc8d81540709c588e140c533d5f317d6a9109d538e38aa742d42bf00906f63d433811bc1c8526788dc3)
qt_modular_library(qtdatavis3d e88f2471fa39fd4f4c7900df5edadc568d000b537eb00f892fadc6cf1d7845987b9fd98adbea4c35c6469c9a9bfce087b26440a6419ca758451dbe3b669d19cd)

View File

@ -1,4 +1,4 @@
Source: qt5-declarative
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtdeclarative 49b8b50932b73ea39da14ac3425044193dfd64eabceadba379aa01cf2fc141177f9870c387caf1cf93ce09e8b197828a54b8d9fcefc4d9cdf400a6c6dd9a9e90)
qt_modular_library(qtdeclarative d4252f58fcc811273b1a51f80167bca19f744d70c47362b631bbb7875473a808402d64b26475e2f5ff1813d8b8cc66b81cac1b8a4b5e36f7ca1fdbb15666f053)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/platforminputcontexts)

View File

@ -1,4 +1,4 @@
Source: qt5-gamepad
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtgamepad 398d6ff0268460358584a4ea8ba0588881970dcc1dff6c5aa91d1630065ba112c86d7a1fe96dceb8ff301b350aef7f74ad1ee6212048a4cdfb26ff5d944d6222)
qt_modular_library(qtgamepad 47dfe1fdd693300520f9710d0a161936d8f1805b4558d6f692ed204f8d6784d45adb73bd472fb255deed792a610c94b35a72143deb0d8f227b8a9996dd1703cc)

View File

@ -1,4 +1,4 @@
Source: qt5-graphicaleffects
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 GraphicalEffects Module.
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -4,4 +4,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtgraphicaleffects 66464c26c9cc78763fda18898cd9c424bc4c0a5cbffc83d68d388e53327aeb77ae0e3c2c4cea947c3b6b7ec5af7bf5124492fc9642ff3c4ba75b06b9fa3883a4)
qt_modular_library(qtgraphicaleffects 0e79eac7debfd8904063d6b03938f62ed72194b5de164e0700d27bd2aac15e390cbdd337fa9afb62435862972e488fb01ae54f08d2a492719baa21a410272297)

View File

@ -1,4 +1,4 @@
Source: qt5-imageformats
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtimageformats 5f1b93c0e5fffa4c2c063d14c12ad97114a452b16814ca9ac45f00ec36308a09770b3b4d137cb5d19bd3aa3a6f576724084df5d0dad75236d49868af9243c9d2)
qt_modular_library(qtimageformats 527bd6d324904d1c7c6d931fe96bfa43575a904d2b94cbda3129c4a883fb79b9bdf6f009b41d2747e8aec2c410a2b23bfa0e94fc4eea698d54a0878bc934514d)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

View File

@ -1,3 +1,3 @@
Source: qt5-modularscripts
Version: 4
Version: 2018-09-10-2
Description: Vcpkg helpers to package qt5 modules

View File

@ -8,24 +8,20 @@ function(qt_modular_library NAME HASH)
)
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "Qt5 doesn't currently support static builds. Please use a dynamic triplet instead.")
endif()
set(MAJOR_MINOR 5.11)
set(FULL_VERSION ${MAJOR_MINOR}.1)
set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz")
set(SRCDIR_NAME "${NAME}-5.9.2")
set(ARCHIVE_NAME "${NAME}-opensource-src-5.9.2")
set(ARCHIVE_EXTENSION ".tar.xz")
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME})
vcpkg_download_distfile(ARCHIVE_FILE
URLS "http://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/${ARCHIVE_NAME}${ARCHIVE_EXTENSION}"
FILENAME ${SRCDIR_NAME}${ARCHIVE_EXTENSION}
URLS "http://download.qt.io/official_releases/qt/${MAJOR_MINOR}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"
FILENAME ${ARCHIVE_NAME}
SHA512 ${HASH}
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
if (EXISTS ${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME})
file(RENAME ${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME} ${CURRENT_BUILDTREES_DIR}/src/${SRCDIR_NAME})
endif()
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE "${ARCHIVE_FILE}"
REF ${FULL_VERSION}
)
# This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
set(ENV{_CL_} "/utf-8")
@ -61,9 +57,11 @@ function(qt_modular_library NAME HASH)
file(GLOB_RECURSE MAKEFILES ${DEBUG_DIR}/*Makefile* ${RELEASE_DIR}/*Makefile*)
#Set the correct install directory to packages
foreach(MAKEFILE ${MAKEFILES})
vcpkg_replace_string(${MAKEFILE} "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}")
file(READ "${MAKEFILE}" _contents)
#Set the correct install directory to packages
string(REPLACE "(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}" "(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}" _contents "${_contents}")
file(WRITE "${MAKEFILE}" "${_contents}")
endforeach()
#Install the module files

View File

@ -1,4 +1,4 @@
Source: qt5-multimedia
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtmultimedia b9fab874706440e97185475bfd0ad769c23d5ddbff5086cc0da9783777e81ed8140fb06fa0e7536ebfb67f2c9db39e1b9f3c2241834e74a9e1fb6ffd5cb7af11)
qt_modular_library(qtmultimedia cfce510f5f5825ce12207070ce34bbc97e5433b5174bbdd562befcd383c74459436dfce23e5fd8ee5c5a4c28573b85374383d17ca3d0c61daa51b50c915b324c)

View File

@ -1,4 +1,4 @@
Source: qt5-networkauth
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Network Authorization Module
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtnetworkauth 2e83eefd5db62aa1cdbe451b432ba1937541e435dcc35205d3bb9b947f2ac7e31663dc069a6cfad5bbf34e1fa799d519820f7ed61b9c247016611a533385bebf)
qt_modular_library(qtnetworkauth 1f2b55870d61027f4af00d54507baf4953f162ca63a4e571a9c6f4095daa0235c2a93f67515cac627ff0a6655d94b01a3b3ba759bbbf75f9b108efbf12777c0d)

View File

@ -1,4 +1,4 @@
Source: qt5-quickcontrols
Version: 5.9.2-1
Version: 5.11.1
Description: Qt5 QuickControls Module.
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

View File

@ -4,4 +4,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtquickcontrols fd5833bd3823e3a53b54ac542857af5bb109952035869ad0a151e807abc9d304ef5d3fa04b75df3b59faf0b95412f593d86b56198f96734f3a75b1620688ba4f)
qt_modular_library(qtquickcontrols d12cffe5a91f10e37b2ebea435fa147508fa60dc83076a1fb1c26d4ea16666c13ced0c36a5222092b6c4d6c1c723bed5b881fc33557353e09cb9aca068dde26c)

View File

@ -1,4 +1,4 @@
Source: qt5-quickcontrols2
Version: 5.9.2-1
Version: 5.11.1
Description: Qt5 QuickControls2 Module.
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtquickcontrols2 e283320aabbaa153067c909804cb34bbcbf6fcb7246bb214957b6092ceb0f01c4fae2efd9d7a6cb011274deafff4aaf0a45dbda06a3fdce1154622e48740048c)
qt_modular_library(qtquickcontrols2 b4d42d5ec5abdd819badfef147492fecc8ed433b88705c418845d75d35ee5880b11afaf70f17e3913855ccaa9aa47b3a9d497350ecb105b4f0672cf29111eb68)

View File

@ -1,4 +1,4 @@
Source: qt5-scxml
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtscxml c33db992ab456e5dd8b9be65c5619c503048106bbb1839b0930f2d4df36eed0780dfa1fc2912d7758aa72195269e59cbe8826cbaa414c2f339ca66c565809c88)
qt_modular_library(qtscxml d64dba323b009525078e999e0972fd09a16bb806980411ce7cc452aee0951632ee440f71c2b5124cfd6ed5020aa869d8490017aaba374a8d4b83f43c1f0b0689)

View File

@ -1,4 +1,4 @@
Source: qt5-serialport
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Serial Port - provides access to hardware and virtual serial ports
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtserialport cc8899c1ae2ed9fd8cf1c213ab7efaec12b3b16836006fdbf74cb7ea457705505a13e82c2f2873ee9426ae66473ec42259f4e728de64576ee44420f116cc433d)
qt_modular_library(qtserialport 2f13122438dfe91c6885534e4470e119abf1c7134b1d344e9c0700661c002566f483aa2bcdde53e4860df349fff4ff8ef05bfafb0aa1bb4484d3e5d07c989404)

View File

@ -1,4 +1,4 @@
Source: qt5-speech
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Speech Module
Build-Depends: qt5-modularscripts, qt5-base, atlmfc (windows)

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtspeech 8213ad13d33732fee3fc5b5e408b870970a3003d461be24195222e1d1209210039d1d0cd2f3c537a0db62629fb297d88b33ed4734ecb6c8d74f5406a87e7e0c0)
qt_modular_library(qtspeech d17a0ab62083b9a8cef5f458b649b7789b0e3394a660c71f9ea6e6311c5e37edda10b16692817b8e165dd66a38cf34560e37940a63beec99ece3e2ee862adf51)

View File

@ -1,4 +1,4 @@
Source: qt5-svg
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtsvg c21c5a12fa10ff9f91deda88c99c995ee2138bdffa21c793b0c42f25155f01f87ede5206624b9d82713649f8cf1cfdb95f1d5b7e792de62f3848d3a9ec665fdd)
qt_modular_library(qtsvg 2e9b126e72335b4b39296d033c6ea8761739148b812841797e1678135eaad944a5e4073010b5dbfb17708bd8fc8de0dd6b2b092330176b3b29c7637357353e39)

View File

@ -1,4 +1,4 @@
Source: qt5-tools
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications
Build-Depends: qt5-modularscripts, qt5-base, qt5-declarative

View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qttools afce063e167de96dfa264cfd27dc8d80c23ef091a30f4f8119575cae83f39716c3b332427630b340f518b82d6396cca1893f28e00f3c667ba201d7e4fc2aefe1)
qt_modular_library(qttools cf690c630db79b4cd86d5d608175fb2c5463a985d7cb8a592c0995db04593c2c2ddddb52a3dc21348462639efdd3f9c57d3897a8384708b912b42cf1ac2c7482)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}//tools/qt5-tools/platforminputcontexts)
#file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools/qt5-tools/platforminputcontexts)

View File

@ -1,4 +1,4 @@
Source: qt5-virtualkeyboard
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,6 +2,6 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtvirtualkeyboard f8c39b789e877e60389ee9aab4a5c17e6018093f72fc57f526ce2584183135206306d4d5a7c7551a6de45969aa6f55444bb39f4ea3324cdf10611533f0bc2b22)
qt_modular_library(qtvirtualkeyboard e3010450553cad42850b4cf1b07e157b30e9a6a74b8c551e21ab45a04da76e55e83c08b4421c081eda44e8928c8e0b69f9c8146855a4e02bbf3779f5a0e290d0)
set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

View File

@ -1,4 +1,4 @@
Source: qt5-websockets
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtwebsockets 9330d6806251bc77d4c2a497a31b1b0e42a1e6bfe3ea7c00cee123052e9e1f9080e33cf4dfcd6ee6e4732c62f41257a77ec25ad607528f4e8ebe61ccaee3e159)
qt_modular_library(qtwebsockets 01eb3fabfa0f46c6ecedc3cd9a05e504fef91926ffeab1f534557e50c15d7fd284edaa553f545d8363343a32c0c3187e77e3e5d6edea8331e9234c05c0e318fc)

View File

@ -1,4 +1,4 @@
Source: qt5-winextras
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.
Build-Depends: qt5-modularscripts, qt5-base, atlmfc

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtwinextras dbfb89833cc291fade8e9fe2ad9c7b7a78c2032de8dcbca1049d637f829811b99e1852ae39ca73a6eac2960df168765bee28023bb723e69c87e2f3bb50b7ef02)
qt_modular_library(qtwinextras 6ba1ddb6ff467fc413bf6a3d111e449215b696949dcfb399c17de9eb6d2ca20f867dd0c57d467e2924452e1d3d429fcc3dd119cc7d8bbfbcf0feeb9f6ca92918)

View File

@ -1,4 +1,4 @@
Source: qt5-xmlpatterns
Version: 5.9.2-0
Version: 5.11.1
Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
Build-Depends: qt5-modularscripts, qt5-base

View File

@ -2,4 +2,4 @@ include(vcpkg_common_functions)
include(${CURRENT_INSTALLED_DIR}/share/qt5modularscripts/qt_modular_library.cmake)
qt_modular_library(qtxmlpatterns c14dbd97988473ba73b4e21352c5560278aa4dbfdf2be1d12e9119c0b5dbe8a0e4eff9a682052024a01bb21dcf52d40ba00da98947901fb91518af92a225da83)
qt_modular_library(qtxmlpatterns 207fda037fce412412909799ba7737764ebfa5d8cd4b0185f158791adbecd9a0e0db15bb7e40aaa5e664809b600e77a7a3398a35d2f4e087f1ab15a31e706066)

View File

@ -1,4 +1,4 @@
Source: qwt
Version: 6.1.3-5
Version: 6.1.3-6
Description: Qt widgets library for technical applications
Build-Depends: qt5-base, qt5-svg, qt5-tools

View File

@ -16,6 +16,7 @@ target_compile_definitions(
${API}
-DSQLITE_ENABLE_RTREE
-DSQLITE_ENABLE_UNLOCK_NOTIFY
-DSQLITE_ENABLE_COLUMN_METADATA
)
target_include_directories(sqlite3 INTERFACE $<INSTALL_INTERFACE:include>)
if(NOT WIN32)

View File

@ -1,5 +1,5 @@
Source: sqlite3
Version: 3.24.0-1
Version: 3.24.0-2
Description: SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.
Feature: tool

View File

@ -52,6 +52,11 @@ function(vcpkg_build_qmake)
string(REPLACE "zlib.lib" "zlibd.lib" _contents "${_contents}")
string(REPLACE "installed\\${TARGET_TRIPLET}\\lib" "installed\\${TARGET_TRIPLET}\\debug\\lib" _contents "${_contents}")
string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib qtmaind.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib\\manual-link qtmaind.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\debug\\lib" _contents "${_contents}")
string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
string(REPLACE "lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
string(REPLACE " Qt5Bootstrap.lib " " ${NATIVE_INSTALLED_DIR}\\tools\\qt5\\Qt5Bootstrap.lib Ole32.lib Netapi32.lib Advapi32.lib ${NATIVE_INSTALLED_DIR}\\lib\\zlib.lib Shell32.lib " _contents "${_contents}")
file(WRITE "${DEBUG_MAKEFILE}" "${_contents}")
endforeach()
endif()
@ -68,6 +73,11 @@ function(vcpkg_build_qmake)
foreach(RELEASE_MAKEFILE ${RELEASE_MAKEFILES})
file(READ "${RELEASE_MAKEFILE}" _contents)
string(REPLACE "/LIBPATH:${NATIVE_INSTALLED_DIR}\\lib qtmain.lib" "shell32.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib\\manual-link qtmain.lib /LIBPATH:${NATIVE_INSTALLED_DIR}\\lib" _contents "${_contents}")
string(REPLACE "tools\\qt5\\qmlcachegen.exe" "tools\\qt5-declarative\\qmlcachegen.exe" _contents "${_contents}")
string(REPLACE "tools/qt5/qmlcachegen" "tools/qt5-declarative/qmlcachegen" _contents "${_contents}")
string(REPLACE "debug\\lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
string(REPLACE "lib\\Qt5Bootstrap.lib" "tools\\qt5\\Qt5Bootstrap.lib" _contents "${_contents}")
string(REPLACE " Qt5Bootstrap.lib " " ${NATIVE_INSTALLED_DIR}\\tools\\qt5\\Qt5Bootstrap.lib Ole32.lib Netapi32.lib Advapi32.lib ${NATIVE_INSTALLED_DIR}\\lib\\zlib.lib Shell32.lib " _contents "${_contents}")
file(WRITE "${RELEASE_MAKEFILE}" "${_contents}")
endforeach()
endif()