-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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.
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
[poco] update to 1.12.4 #27288
Merged
+244
−180
Merged
[poco] update to 1.12.4 #27288
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
ca597ee
[poco] update to 1.12.2
russelltg e9f513d
./vcpkg x-add-version --all
russelltg 79e1ab4
oops
russelltg 112b5a7
./vcpkg x-add-version --all --overwrite-version
russelltg a6b6aac
address some failures, cleanup
russelltg c1632dd
./vcpkg x-add-version --all --overwrite-version
russelltg 9191037
address comments
russelltg 87df69c
./vcpkg x-add-version --all --overwrite-version
russelltg 4fcf49e
fix accidental change
russelltg e1160c3
./vcpkg x-add-version --all --overwrite-version
russelltg 2d8b8a1
update to 1.12.3
russelltg 946ef9e
./vcpkg x-add-version --all --overwrite-version
russelltg 20c92e5
update to 1.12.4
russelltg 2ffca41
./vcpkg x-add-version --all --overwrite-version
russelltg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt | ||
| index f504bc1..226dadb 100644 | ||
| --- a/Foundation/CMakeLists.txt | ||
| +++ b/Foundation/CMakeLists.txt | ||
| @@ -109,6 +109,23 @@ set_target_properties(Foundation | ||
| if(POCO_UNBUNDLED) | ||
| target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB) | ||
| target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) | ||
| + add_definitions( | ||
| + -D_pcre2_utf8_table1=_poco_pcre2_utf8_table1 | ||
| + -D_pcre2_utf8_table1_size=_poco_pcre2_utf8_table1_size | ||
| + -D_pcre2_utf8_table2=_poco_pcre2_utf8_table2 | ||
| + -D_pcre2_utf8_table3=_poco_pcre2_utf8_table3 | ||
| + -D_pcre2_utf8_table4=_poco_pcre2_utf8_table4 | ||
| + -D_pcre2_OP_lengths_8=_poco_pcre2_OP_lengths_8 | ||
| + -D_pcre2_callout_end_delims_8=_poco_pcre2_callout_end_delims_8 | ||
| + -D_pcre2_callout_start_delims_8=_poco_pcre2_callout_start_delims_8 | ||
| + -D_pcre2_hspace_list_8=_poco_pcre2_hspace_list_8 | ||
| + -D_pcre2_vspace_list_8=_poco_pcre2_vspace_list_8 | ||
| + -D_pcre2_ucp_gbtable_8=_poco_pcre2_ucp_gbtable_8 | ||
| + -D_pcre2_ucp_gentype_8=_poco_pcre2_ucp_gentype_8 | ||
| + -D_pcre2_utt_8=_poco_pcre2_utt_8 | ||
| + -D_pcre2_utt_names_8=_poco_pcre2_utt_names_8 | ||
| + -D_pcre2_utt_size_8=_poco_pcre2_utt_size_8 | ||
| + ) | ||
| endif(POCO_UNBUNDLED) | ||
|
|
||
| target_include_directories(Foundation | ||
98 changes: 49 additions & 49 deletions
98
ports/poco/arm64_pcre.patch → ports/poco/0002-arm64-pcre.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,49 @@ | ||
| diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp | ||
| index 1f51296..c67b71b 100644 | ||
| --- a/Foundation/src/EventLogChannel.cpp | ||
| +++ b/Foundation/src/EventLogChannel.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
| +#pragma comment(lib,"advapi32.lib") | ||
| #include "Poco/EventLogChannel.h" | ||
| #include "Poco/Message.h" | ||
| diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h | ||
| index 0a222c7..0843315 100644 | ||
| --- a/Foundation/src/utils.h | ||
| +++ b/Foundation/src/utils.h | ||
| @@ -91,7 +91,7 @@ int main(int argc, char** argv) { | ||
| // | ||
| // If it prints "correct" then the architecture should be here, in the "correct" section. | ||
| #if defined(_M_X64) || defined(__x86_64__) || \ | ||
| - defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ | ||
| + defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || defined(_M_ARM64) || \ | ||
| defined(__hppa__) || defined(__ia64__) || \ | ||
| defined(__mips__) || \ | ||
| defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ | ||
| diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp | ||
| index 1a75379..b4081fd 100644 | ||
| --- a/Net/src/Net.cpp | ||
| +++ b/Net/src/Net.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
| +#pragma comment(lib,"advapi32.lib") | ||
| #include "Poco/Net/Net.h" | ||
| diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp | ||
| index 7fd1a28..a07c5d2 100644 | ||
| --- a/Util/src/WinRegistryKey.cpp | ||
| +++ b/Util/src/WinRegistryKey.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
| +#pragma comment(lib,"advapi32.lib") | ||
| #include "Poco/Util/WinRegistryKey.h" | ||
| #include "Poco/Exception.h" | ||
| diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp | ||
| index f9a9fb1..b032f9d 100644 | ||
| --- a/Foundation/src/EventLogChannel.cpp | ||
| +++ b/Foundation/src/EventLogChannel.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
|
|
||
| +#pragma comment(lib,"advapi32.lib") | ||
|
|
||
| #include "Poco/EventLogChannel.h" | ||
| #include "Poco/Message.h" | ||
| diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h | ||
| index c9b6c00..710c199 100644 | ||
| --- a/Foundation/src/utils.h | ||
| +++ b/Foundation/src/utils.h | ||
| @@ -129,7 +129,7 @@ int main(int argc, char** argv) { | ||
| // | ||
| // If it prints "correct" then the architecture should be here, in the "correct" section. | ||
| #if defined(_M_X64) || defined(__x86_64__) || \ | ||
| - defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ | ||
| + defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || defined(_M_ARM64) || \ | ||
| defined(__hppa__) || defined(__ia64__) || \ | ||
| defined(__mips__) || \ | ||
| defined(__loongarch__) || \ | ||
| diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp | ||
| index 1a75379..b4081fd 100644 | ||
| --- a/Net/src/Net.cpp | ||
| +++ b/Net/src/Net.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
|
|
||
| +#pragma comment(lib,"advapi32.lib") | ||
|
|
||
| #include "Poco/Net/Net.h" | ||
|
|
||
| diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp | ||
| index 7fd1a28..a07c5d2 100644 | ||
| --- a/Util/src/WinRegistryKey.cpp | ||
| +++ b/Util/src/WinRegistryKey.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
|
|
||
| +#pragma comment(lib,"advapi32.lib") | ||
|
|
||
| #include "Poco/Util/WinRegistryKey.h" | ||
| #include "Poco/Exception.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
24 changes: 12 additions & 12 deletions
24
ports/poco/fix-error-c3861.patch → ports/poco/0005-fix-error-c3861.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| diff --git a/XML/include/Poco/XML/ParserEngine.h b/XML/include/Poco/XML/ParserEngine.h | ||
| index e0c8455..363654c 100644 | ||
| --- a/XML/include/Poco/XML/ParserEngine.h | ||
| +++ b/XML/include/Poco/XML/ParserEngine.h | ||
| @@ -19,6 +19,7 @@ | ||
| #include "Poco/XML/XML.h" | ||
| #if defined(POCO_UNBUNDLED) | ||
| +#include <expat_config.h> | ||
| #include <expat.h> | ||
| #else | ||
| #include "Poco/XML/expat.h" | ||
| diff --git a/XML/include/Poco/XML/ParserEngine.h b/XML/include/Poco/XML/ParserEngine.h | ||
| index e0c8455..363654c 100644 | ||
| --- a/XML/include/Poco/XML/ParserEngine.h | ||
| +++ b/XML/include/Poco/XML/ParserEngine.h | ||
| @@ -19,6 +19,7 @@ | ||
|
|
||
| #include "Poco/XML/XML.h" | ||
| #if defined(POCO_UNBUNDLED) | ||
| +#include <expat_config.h> | ||
| #include <expat.h> | ||
| #else | ||
| #include "Poco/XML/expat.h" |
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this to modify target
Foundation?add_definitionsacts globally, but IIUC only to target created after the command.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It only affects the current and child tress, so should be equivalent to a target_compile_definitions.