Skip to content

[wtl] Add another post-release update #25229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 7 commits into from
Jun 17, 2022
Merged

[wtl] Add another post-release update #25229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fe0806e
Add another post-release update.
chrullrich Jun 14, 2022
1d9c1d6
Put the WTL includes into a subdirectory again.
chrullrich Jun 14, 2022
c818227
Update metadata.
chrullrich Jun 14, 2022
5d94093
Update more metadata.
chrullrich Jun 14, 2022
e486979
Mention the source of the post-release update list
chrullrich Jun 15, 2022
cf62e7b
Refresh metadata.
chrullrich Jun 15, 2022
e8cbecd
Revert "Put the WTL includes into a subdirectory again."
chrullrich Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ports/wtl/atlribbon.h-wtl66.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <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
+#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)
3 changes: 3 additions & 0 deletions ports/wtl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ports/wtl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7598,7 +7598,7 @@
},
"wtl": {
"baseline": "10.0.10320",
"port-version": 3
"port-version": 4
},
"wxchartdir": {
"baseline": "2.0.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wtl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c76ddf631b62e5d0b433859f7798c7ab06050f47",
"version": "10.0.10320",
"port-version": 4
},
{
"git-tree": "77302be4bab5f3221389c7948462e15ac941002b",
"version": "10.0.10320",
Expand Down