[Qt] update to 5.12.5 (#8159)

microsoft · Sep 16, 2019 · 9b4b5f4 · 9b4b5f4
1 parent f152ba3
commit 9b4b5f4
Show file tree

Hide file tree

Showing 38 changed files with 227 additions and 198 deletions.
diff --git a/ports/libqglviewer/macosx.patch b/ports/libqglviewer/macosx.patch
@@ -2,6 +2,15 @@ diff --git a/QGLViewer/QGLViewer.pro b/QGLViewer/QGLViewer.pro
 index 702925cb6..fc3cb7118 100644
 --- a/QGLViewer/QGLViewer.pro
 +++ b/QGLViewer/QGLViewer.pro
+@@ -214,7 +214,7 @@ macx|darwin-g++ {
+ 	include.files *= qglviewer.icns
+
+     # Or whatever exists in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+-    QMAKE_MAC_SDK = macosx10.12
++    #QMAKE_MAC_SDK = macosx10.12
+
+ 	lib_bundle {
+ 		FRAMEWORK_HEADERS.version = Versions
 @@ -224,7 +224,7 @@ macx|darwin-g++ {
  		QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
 

diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL
@@ -1,4 +1,4 @@
-Source: qt5-3d
-Version: 5.12.4
-Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
-Build-Depends:  qt5-base, qt5-declarative
+Source: qt5-3d
+Version: 5.12.5
+Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering
+Build-Depends:  qt5-base, qt5-declarative
diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
@@ -1,4 +1,4 @@
-Source: qt5-activeqt
-Version: 5.12.4
-Description: Qt5 ActiveQt Module - ActiveX components
-Build-Depends:  qt5-base
+Source: qt5-activeqt
+Version: 5.12.5
+Description: Qt5 ActiveQt Module - ActiveX components
+Build-Depends:  qt5-base
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-base
-Version: 5.12.4-6
+Version: 5.12.5
 Homepage: https://www.qt.io/
 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/cmake/qt_download_submodule.cmake b/ports/qt5-base/cmake/qt_download_submodule.cmake
@@ -21,12 +21,19 @@ function(qt_download_submodule)
         FILENAME ${ARCHIVE_NAME}
         SHA512 ${QT_HASH_${PORT}}
     )
-    vcpkg_extract_source_archive_ex(
-        OUT_SOURCE_PATH SOURCE_PATH
-        ARCHIVE "${ARCHIVE_FILE}"
-        REF ${FULL_VERSION}
-        PATCHES ${_csc_PATCHES}
-    )
+
+    if(QT_UPDATE_VERSION)
+        file(SHA512 "${ARCHIVE_FILE}" ARCHIVE_HASH)
+        message(STATUS "${PORT} new hash is ${ARCHIVE_HASH}")
+        file(APPEND "${VCPKG_ROOT_DIR}/ports/qt5-base/cmake/qt_new_hashes.cmake" "set(QT_HASH_${PORT} ${ARCHIVE_HASH})\n")
+    else()
+        vcpkg_extract_source_archive_ex(
+            OUT_SOURCE_PATH SOURCE_PATH
+            ARCHIVE "${ARCHIVE_FILE}"
+            REF ${FULL_VERSION}
+            PATCHES ${_csc_PATCHES}
+        )
+    endif()
 
     set(${_csc_OUT_SOURCE_PATH} ${SOURCE_PATH} PARENT_SCOPE)
 endfunction()
diff --git a/ports/qt5-base/cmake/qt_port_hashes.cmake b/ports/qt5-base/cmake/qt_port_hashes.cmake
@@ -1,51 +1,57 @@
 #Every update requires an update of these hashes and the version within the control file of each of the 32 ports. 
 #So it is probably better to have a central location for these hashes and let the ports update via a script
 set(QT_MAJOR_MINOR_VER 5.12)
-set(QT_PATCH_VER 4)
+set(QT_PATCH_VER 5)
+set(QT_UPDATE_VERSION 0) # Switch to update qt and not build qt. Creates a file cmake/qt_new_hashes.cmake in qt5-base with the new hashes.
 
 set(QT_PORT_LIST base 3d activeqt charts connectivity datavis3d declarative gamepad graphicaleffects imageformats location macextras mqtt multimedia networkauth
                  purchasing quickcontrols quickcontrols2 remoteobjects script scxml sensors serialport speech svg tools virtualkeyboard webchannel websockets
                  webview winextras xmlpatterns)
 
-#set(_VCPKG_INTERNAL_NO_HASH_CHECK 1)
-set(QT_HASH_qt5-base                28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946)
-set(QT_HASH_qt5-3d                  aa93d3661d092dc020e7903242964b7daba1e42882deb0d5fd45abff3c11e971f49a497ae5a1b7420fd497e6986daca4da0a217c94821ef8432cc3d8c617d291)
-set(QT_HASH_qt5-activeqt            1a1560424ed8f6075ffe371efaff63ae9aa52377aa84f806a39d7e995960a7d7eeb1eb575470b13569293d2623c5e247204397d8b6698c1ce2ff9f206850a912)
-set(QT_HASH_qt5-charts              d9c46f59d15377098427647cbd3c3fc2d7ff33fb9940581360db3be5e895b50bee0fe23a41c0af6b157e905b04b1bc13666c1736b047a405b21aab3a2bdbe60b)
-set(QT_HASH_qt5-connectivity        e1076c5883f29cb394d9929a52c3bfce97952cef11b1f82d1fcca59440354d1a29ab19d628f6359ca02f3318fb526b3ca78d691af6dc0f4c06741b2306c8e571)
-set(QT_HASH_qt5-datavis3d           e5041e4b666fa4e7ce8b12fd522be3ace144b43bf68fa2d45add67dfc6afc6e5788c5fac5eed81e9fa631cf6d372ce0aed8287fa139488406612322e5fd7e550)
-set(QT_HASH_qt5-declarative         953b0dac76b73a7a21b393ab88718da12d77dfc688dc07c55c96ea1658bc14acd9097bef60df4a95d2923d3fb1e02b46499c032aa53844d4fd344b0037514671)
-set(QT_HASH_qt5-gamepad             e84e637e3b2ced01e92ceb2b54b829a1e2346a4c96b15044f59bcc9764a24c91df6fcd0165f454143cfad87c05471b7d84567d9c6ea8fd3b4c753e5e771e8947)
-set(QT_HASH_qt5-graphicaleffects    fe78cb01cfbe00226709a7faa2e754abb8e41bd677d15611221fbb9e53bf876e60d244eb6660b6b03403d31be2d9155a763ad34e4c4d2d1490fa6810f54bad0c)
-set(QT_HASH_qt5-imageformats        e9adab3b7e1f5a0679e1924eb08718f2c6c53073f83018c9243886f7e1b084940bb9a642f46d76fae21552c4a76c655482536ae873cd4cfead4876a3561ebe8f)
-set(QT_HASH_qt5-location            b03380feb2e6767dabb0a75f9234c52a9adc580d53b692c356b04293195f6cdd49d9c7e8eb91404b5a7e4c7507498078dd8f41de014330d35f0e99e034b8cf3a)
-set(QT_HASH_qt5-macextras           813b26a95e0ab7119e3f6341052d08d6b401713cc914fd9a8a43675be21d87135f3ed7538edceec68d16e6cb3eb0042351083b545624e18ea217c23a105185e4)
-set(QT_HASH_qt5-mqtt                f2c254947d767e30a8ba683ef8f4c14e6aad911cd887e675abadf0f315771b62adababab3831d7712e09a953d9b7e95df6db0f3fc82cb7bb5aad988bdfa127b5)
-set(QT_HASH_qt5-multimedia          28eaaf4a704649616cd77ae5560ddd6298c82e525f59fa4d5a0178826fe2d6c9b77dcb067f2b5b56e88da7d6043a3f8e34b5c810d12751c74fdc65e5440586fa)
-set(QT_HASH_qt5-networkauth         0f36530393abe5315154bf95d0cae1330a8af1af8af5a525d20336d4227f11aa9133b7e3258f651be6f212593ad7e0d2d5d15536fab3c07392a94f2954afe7c8)
-set(QT_HASH_qt5-purchasing          06124d275dcb9c969ccebccd9847c9819eb460ec00b73ab442533dafa8df875c8729148d714555f301da1c273488f8e41ac0b176f11cfadba4e121e3230579da)
-set(QT_HASH_qt5-quickcontrols       315f711d856a4f2882c4e60435bd5fc77623b4ba3bd10fea8e8d052e0a183556c4b5342236b18fade0bbae3a45df8b1426a26a87b1d7b071bb3e5846585775f6)
-set(QT_HASH_qt5-quickcontrols2      41e44ee733ef3ac5021543407b472750c7b8d61bdeb6960d043477f0c5604699cafb5cca4f755a26ce3cfef1f948e85bb85623ecd21e70c876bd5a8c1f5547bf)
-set(QT_HASH_qt5-remoteobjects       6297af20b6d73cafb29a3c9d000be51b7b4a668163c0d2796cd51d8d292759a9ea0a8beeff4ace6590a22b94eea51350142510d52a8b4ca73594508c204e4b58)
-set(QT_HASH_qt5-script              6d3b802c7cdfb270318b9210df4ad9dbd2d29f485d9194051dbf278a48c25cc5c6311adeaf56b4fe2a7746dbc10234544e75e61a2e9c86f653aed0a92e07e717)
-set(QT_HASH_qt5-scxml               45bf18c1bece80120b2a8f81357afda86584ad5455a49b0db0658b4dd7f0a4ef53c7cc7ef8fff26842f476661b162752db7e8a48ed3566342ad0c1537d4ac8f9)
-set(QT_HASH_qt5-sensors             39bc6b2a435dd54d574f6c19ccc15698f8ade3f2b64170baa3e0d0bd24f64bc16a9088620a6be41a61ed170bd84d4795bf2819b40a188c5c2255a54d0e466035)
-set(QT_HASH_qt5-serialport          c51fa5eca92a16c41678eef37c3e33c6ea7f61ad881dd309548b83bafa3fedf191afc324437863dcf1a35dafc512363e7588f65136c07ad8f0d51c6854da178f)
-set(QT_HASH_qt5-speech              85f77f32d2a3fc28262fa0af2dc1ff13c572835bff8fef3a79b4af0efdee0fc325754e1803d98ce25042fd717de28f3ecb3cc916de729cbb267c14be136007a9)
-set(QT_HASH_qt5-svg                 40d7dc82e0acde52e1258e1b1753cc93609c31cf69057c52dc2dd30dc59f2d7d434e20fa4f7f27db3fa300fd3c8f23a8fb03cc26b27cc1c02cc3bf6d97383503)
-set(QT_HASH_qt5-tools               072d09315fc73ec610d2e0d9a1380e5539a79fa1d73104a801e0f8b9afe489b735fefcc46d7c9e519ee8c1b14975386260239be24183933281dead2fec00f466)
-set(QT_HASH_qt5-virtualkeyboard     04960c475a01f65901279fdab352742e4dc77753a306c7bd9996cf32be4a63524e7be034d60b398c6862c0099b02eedcef89f28fd09b1c7fa3075f89adba5a7a)
-set(QT_HASH_qt5-webchannel          956c57c019623a2ccc4b4a7fc8ca2404a04862b7a3fdb8d1317dfd0d24d00f73db4698df22a9758667256646129163ea1b3a588435aa01f28e72e35300637458)
-set(QT_HASH_qt5-websockets          b5abd39664f07afe08805876980bc3850a83a032462a7b73e9d5c5458a2f195df85ec903e8a16bf93bde6089ec90ab9b930ea6b1ebb0d99d0955ad36de0613dd)
-set(QT_HASH_qt5-webview             c7d5b5225a7edcf642249eb68f0db52ec56cd071f1e17e1f846a210f48229e71c649d99323dc70e9d3bcdca925b0ae1d9c56282d6b31398478ef024b22835fc7)
-set(QT_HASH_qt5-winextras           4d972884bce7736d2a6e6b8d61291647cdf54a175cb6d0fca102e389074084e0f3d25dec35b2b8df2188760ebeee4b2b7f0158ebc37a0c6c1e208d7b10d2a778)
-set(QT_HASH_qt5-xmlpatterns         769fb26b1b72bbe3a1fc0c13dee6f12c4bc5280824954194e676331082af91aacecd2c295aa2e566365f4679f19732b1caa3da18825e3560b402b86568b3ac4e)
+set(QT_HASH_qt5-base                9a95060318cadfcd6dace6b28353fa868a8dcfe9def0bd884edf7d9f72606bae625de0269323a94b81d594a6c398106c266304106329b79c7dae4e5b88269660)
+set(QT_HASH_qt5-3d                  8cc23417b4a41bf9d19052e05c7e3be8773be062f1f5998a7784573ef9c35a04da50ce67a65b3709065bb3cf243aac8ede4bea60f0420a5400cbe6c9c7bdf05b)
+set(QT_HASH_qt5-activeqt            6233bb64ca45b6b0065afa50a3082c6df7e4e20d36040dfaf391e02876f50c41ec293db79a13636aeae9469deefad35ced42902548f9fcd78476359ad4450bee)
+set(QT_HASH_qt5-charts              a3ba8c6a606430cd87f85661116dbb2692e0bb472f0a73310aca1950f4437563d04ee950437a48a399b1a4881dd264cd1e6fdd4f30b6c3110704ec48d1467da1)
+set(QT_HASH_qt5-connectivity        96cdb27aa0e439094e3f1de0c7a680973c3ce2c65bbbff38affe25a3708c9e4e3c1c6a403d698303f77a5f261b44ac657e01a769b62a1565e0a8c64c8ac80bd5)
+set(QT_HASH_qt5-datavis3d           7911d911678827ca4a704b824b8841c8e8508484fb83265d4d05e64787ac1184387b9ed0870090b3233c736f5e484adc7776ba12a1173da0fceeaac46845c6f4)
+set(QT_HASH_qt5-declarative         026c5024c06e44b6e91099d1ee912f38017f314ae0125227010d25d733447c692299cc7c47edc1a4bf39366a9c9c9fe77d3a249905f2ae982d0725317d824b9b)
+set(QT_HASH_qt5-gamepad             bc4148bb75de53dd0885fc25ce7d679d7a5426a23ce9c93482fd11e8d6003cebe4c958fc07f17817a43f1d4449756deff24c0350fd33e100aeb2c302c650ae33)
+set(QT_HASH_qt5-graphicaleffects    489a308af5f56ff2b023375ddf705f8a1b15c0e1fb1ec3bc6e5f66a80b5863d63aa0e57a3aef025ab965694add8d71424123bca120ce8d8b8448e7218f7fc640)
+set(QT_HASH_qt5-imageformats        9fa76b7eec083596c45f68642b49dc88c2759a28cb9359935c3a64604082acea9adecee49bb0828cc587b86d469aec7169f8f72f83a15194c4fc10f0ca25fae0)
+set(QT_HASH_qt5-location            fe82194e4e6bc2a2e6e3c55e3360afdfd56a6495a8d87bfbdceb29255430954d4c1adc62f1f82e63b23778f0bf03b0a50d6f5d2a963bd786f2cf2fbed7450ccc)
+set(QT_HASH_qt5-macextras           80779bf9c49ff89b866327a3358cede9308c41d6a49d8d6aa29661f4ad98d191c2f68d9af0d89be36fe54d094972f7a7689ecc26bc2bfcf53e9be1305e107178)
+set(QT_HASH_qt5-mqtt                3167de873dc3d42607440237c7b341c270079a1edd72588ebe95082ab209bbd24496d60d41c87ade166b595fda924a52cb2ff0efd05b48aa4c77c7b51b125f36)
+set(QT_HASH_qt5-multimedia          a59983d887c8de462399fd53beb640c1b865c17f8b1a83635c2e1d27903861dd588eb64935d7c02d733c51c9a21174065e70a5fc1aa78600e5540c489b7695a3)
+set(QT_HASH_qt5-networkauth         d7849518614a7bdb2ddbcf92b773f5e7c26f1af4ba07f0304b4634ed69bf3c17798509d28af2c49aba0cfad35a1cad5bda27acdbde3aa8d86038efeb9f5001e0)
+set(QT_HASH_qt5-purchasing          b9f7e43cf4a8e23bc167d2473fa6f8af47455f066b584daf18d97d4a67dd766aaf17c7b897b2bae20cf636253174430be664815e1e86aeb07ed870bb2969ad0d)
+set(QT_HASH_qt5-quickcontrols       4539a6ce1ee20f71f6bf48271bc3fe1125bd21899cf36142d1c3d41a68ba56211f27d6e4403c69e86bd4698c7c7c79bc60f2a78ef1b19c5eab5b8690d1a01037)
+set(QT_HASH_qt5-quickcontrols2      afbd742783d83eabf182031e218c2f611709cd66f2b4886317bd356ffff2afabe820e1f552f478a0c3f74daf6fd1f5256900448f5445b84792d6a71b42ccd20a)
+set(QT_HASH_qt5-remoteobjects       ed3314b1c66f9375bdc101029eaf730a630157ee41c094de2ff9cc5340c3c92a781dcb2b2cf0b8bbad8b19e566fb80f2d3b76e58624e990f90f23b8cdd21bd54)
+set(QT_HASH_qt5-script              a422e47873ddf4c84adf00f51b721465acedfac535b0daeede63eac0d41c6f4f07d5a5f86513c86e981f3a0024020be03730670befab2a20cd4d6564c98d6c90)
+set(QT_HASH_qt5-scxml               23d340994af3e217ae58698dd0cd38f30d67d74a042d58cabbd0f38a6c13a8d64d6238cd6dee246ce0f99d5206bc210749941b88e5f745d3b92207eab06730b1)
+set(QT_HASH_qt5-sensors             81ac74e4c0a3d1942393c9267bbcc50af0e04a6f163d566010d6053dc4c69a67395c3f4b7564a50ec84ac88a715edd002920be4e145e6bd23d082a021dee1e5a)
+set(QT_HASH_qt5-serialport          f3a5fb8c9a9513c16f52bd22b4fd4c6400819863237762f459d9f612ef2457447733cc8ed2bd645f182ab9eab6ddb5bcdbca2fbd67745def1a5fad1392087f4e)
+set(QT_HASH_qt5-speech              2a1a2c86ee3b5501623bb0c2c8e5b6f96b353707fe0eb804629187899eca5952c665ef037c4257f635edf34ddea03bc686f472a4a346d9f8e2adc7479f640482)
+set(QT_HASH_qt5-svg                 3d7f89d106b36c8a0fd04c6e6f0ccde0c50ced7192980ea7d9330ba73d9307559e60ed2b10c28481a419d19aaae6609bde9e1dd74ccedf340dacf0194a60429d)
+set(QT_HASH_qt5-tools               e88af049ad9261720bc44ff9030113179d9429eaf073bed45115decd520ecf5d3ca860983f012bac189310ce9f3826b1fcb484faadb4f6d0b16c67c0d998f34c)
+set(QT_HASH_qt5-virtualkeyboard     e4581673451c40bf39b9793b0131bbad29e8a3f9db2d42adb23b48847bd674b6820717c051b76e506d4fd52e87c79b042533be85285a0cce9bcdc49cca964e66)
+set(QT_HASH_qt5-webchannel          8ea543f29e8f686961b033c1246714b1535d0be730026bef4b4ee172ce602c706d8a16b8391510a302df7be6545007a2f42311eb1aea4da326c3addde16ca2b2)
+set(QT_HASH_qt5-websockets          970ad232ad1258630404d5e7347721505a780497e1775f88591098f11bca48cbf62c4f02491b133d31e4304eb9e16f923292c5b778e22d530d7a5a4e95d422ba)
+set(QT_HASH_qt5-webview             310beedf88cefc05458e99838e7cb71971aa24ba6c460ff3da804c2ab7f56167ca1067ddca71ee29ced32ea974fe405261f24c8bbcac0c7b69063d7c4e38a4de)
+set(QT_HASH_qt5-winextras           053ca5f60c7946f6409ef34094b4a7d1431039407a5195e539e8edfda795da20fc695ceec58ae0df15e4dcc597047518d06a424d11fb4aaf6ae82f1d4badab33)
+set(QT_HASH_qt5-xmlpatterns         30b25e152970bfe51fcdeffa43d11dd51496e5ea6a5da644b13fa0ce4835302ebec651c1ecdcf9590c6689598cea9bd63748aab4ee0ec69f9155dc310a7c04c3)
 
 if(QT_UPDATE_VERSION)
-    foreach(_current_qt_port ${QT_PORT_LIST})
-        set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/CONTROL")
-        file(READ ${_current_control} _control_contents)
-        string(REGEX REPLACE "Version: [0-9]\.[0-9]+\.[0-9]" "Version: ${QT_MAJOR_MINOR_VER}.${QT_MAJOR_MINOR_VER}" _control_contents "${_control_contents}")
-        file(WRITE ${_current_control} "${_control_contents}")
-    endforeach()
+    message(STATUS "Running Qt in automatic version port update mode!")
+    set(_VCPKG_INTERNAL_NO_HASH_CHECK 1)
+    if("${PORT}" MATCHES "qt5-base")
+        foreach(_current_qt_port ${QT_PORT_LIST})
+            set(_current_control "${VCPKG_ROOT_DIR}/ports/qt5-${_current_qt_port}/CONTROL")
+            file(READ ${_current_control} _control_contents)
+            #message(STATUS "Before: \n${_control_contents}")
+            string(REGEX REPLACE "Version:[^0-9]+[0-9]\.[0-9]+\.[0-9]+[^\n]*\n" "Version: ${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}\n" _control_contents "${_control_contents}")
+            #message(STATUS "After: \n${_control_contents}")
+            file(WRITE ${_current_control} "${_control_contents}")
+        endforeach()
+    endif()
 endif()
diff --git a/ports/qt5-base/cmake/qt_submodule_installation.cmake b/ports/qt5-base/cmake/qt_submodule_installation.cmake
@@ -2,6 +2,10 @@
 
 function(qt_submodule_installation)
     qt_download_submodule(OUT_SOURCE_PATH TARGET_SOURCE_PATH ${ARGV})
-    qt_build_submodule(${TARGET_SOURCE_PATH})
-    qt_install_copyright(${TARGET_SOURCE_PATH})
+    if(QT_UPDATE_VERSION)
+        SET(VCPKG_POLICY_EMPTY_PACKAGE enabled PARENT_SCOPE)
+    else()
+        qt_build_submodule(${TARGET_SOURCE_PATH})
+        qt_install_copyright(${TARGET_SOURCE_PATH})
+    endif()
 endfunction()