diff --git a/ports/wtl/atlribbon.h-wtl66.patch b/ports/wtl/atlribbon.h-wtl66.patch new file mode 100644 index 00000000000000..d4ebac4874a7ce --- /dev/null +++ b/ports/wtl/atlribbon.h-wtl66.patch @@ -0,0 +1,17 @@ +--- a/Include/atlribbon.h 2022-06-06 03:12:54.312690900 +0200 ++++ b/Include/atlribbon.h 2022-06-06 03:13:24.337068900 +0200 +@@ -27,10 +27,10 @@ + #error atlribbon.h requires atlapp.h to be included first + #endif + +-#include // for RecentDocumentList classes +-#include // for Frame and UpdateUI classes +-#include // required for atlctrlw.h +-#include // for CCommandBarCtrl ++#include "atlmisc.h" // for RecentDocumentList classes ++#include "atlframe.h" // for Frame and UpdateUI classes ++#include "atlctrls.h" // required for atlctrlw.h ++#include "atlctrlw.h" // for CCommandBarCtrl + + #ifndef __ATLSTR_H__ + #pragma warning(push) diff --git a/ports/wtl/portfile.cmake b/ports/wtl/portfile.cmake index 23c13b9c46bbd7..d80bb7d7efeb0c 100644 --- a/ports/wtl/portfile.cmake +++ b/ports/wtl/portfile.cmake @@ -6,8 +6,11 @@ vcpkg_from_sourceforge( NO_REMOVE_ONE_LEVEL SHA512 086a6cf6a49a4318a8c519136ba6019ded7aa7f2c1d85f78c30b21183654537b3428a400a64fcdacba3a7a10a9ef05137b6f2119f59594da300d55f9ebfb1309 PATCHES + # WTL 10 post-release updates; see + # https://sourceforge.net/projects/wtl/files/WTL%2010/WTL10%20Post-Release%20Updates.txt/download appwizard_setup.js-vs2022.patch atlmisc.h-bug329.patch + atlribbon.h-wtl66.patch ) file(INSTALL "${SOURCE_PATH}/Include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN "*.h") diff --git a/ports/wtl/vcpkg.json b/ports/wtl/vcpkg.json index eda850d79c59ec..605dde9b293858 100644 --- a/ports/wtl/vcpkg.json +++ b/ports/wtl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wtl", "version": "10.0.10320", - "port-version": 3, + "port-version": 4, "description": "Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.", "homepage": "https://sourceforge.net/projects/wtl/", "license": "MS-PL" diff --git a/versions/baseline.json b/versions/baseline.json index c315072c5e6ed3..2e2232d6a303c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7598,7 +7598,7 @@ }, "wtl": { "baseline": "10.0.10320", - "port-version": 3 + "port-version": 4 }, "wxchartdir": { "baseline": "2.0.0", diff --git a/versions/w-/wtl.json b/versions/w-/wtl.json index e6c04547bd7904..b0448a20bfa333 100644 --- a/versions/w-/wtl.json +++ b/versions/w-/wtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c76ddf631b62e5d0b433859f7798c7ab06050f47", + "version": "10.0.10320", + "port-version": 4 + }, { "git-tree": "77302be4bab5f3221389c7948462e15ac941002b", "version": "10.0.10320",