Skip to content
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

[poco] Update Version to 1.11.2 #24425

Merged
merged 2 commits into from
Apr 27, 2022
Merged

[poco] Update Version to 1.11.2 #24425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b84820
[poco] Update Version to 1.11.2
JonLiu1993 Apr 26, 2022
aba6880
update version
JonLiu1993 Apr 26, 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
15 changes: 1 addition & 14 deletions ports/poco/arm64_pcre.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h
index 9a945f3..f5a9a7f 100644
--- a/Foundation/include/Poco/Platform.h
+++ b/Foundation/include/Poco/Platform.h
@@ -191,7 +191,7 @@
#else
#define POCO_ARCH_LITTLE_ENDIAN 1
#endif
-#elif defined(__arm64__) || defined(__arm64)
+#elif defined(__arm64__) || defined(__arm64) || defined(_M_ARM64)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code has been applied to the latest version

#define POCO_ARCH POCO_ARCH_ARM64
#if defined(__ARMEB__)
#define POCO_ARCH_BIG_ENDIAN 1
diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp
index 1f51296..c67b71b 100644
--- a/Foundation/src/EventLogChannel.cpp
Expand All @@ -24,7 +11,7 @@ index 1f51296..c67b71b 100644
#include "Poco/EventLogChannel.h"
#include "Poco/Message.h"
diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
index 4328344..5eeafcd 100644
index 0a222c7..0843315 100644
--- a/Foundation/src/utils.h
+++ b/Foundation/src/utils.h
@@ -91,7 +91,7 @@ int main(int argc, char** argv) {
Expand Down
4 changes: 2 additions & 2 deletions ports/poco/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO pocoproject/poco
REF de61f0049175a941cc83c2615c3bdc5e947b89f9 # poco-1.11.1-release
SHA512 0290eeeca8a85286efe8f583224062ea97668c2730f8f7db4e075ce75e997b0a0c969159d4034c27fbb2e8d4b9c6504888d8ffa001193f7eb0e450bca2d5d7a2
REF 9d1c428c861f2e5ccf09149bbe8d2149720c5896 # poco-1.11.2-release
SHA512 b812bb194783c94e2a048daf6659e0f0fa5e9040ebd49342a5d39636cee600754d0465f8b28725d76dcb2681d1b64dfd8b08ac9c85b95b4ac8edf9b53d68feb1
HEAD_REF master
PATCHES
# Fix embedded copy of pcre in static linking mode
Expand Down
2 changes: 1 addition & 1 deletion ports/poco/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "poco",
"version": "1.11.1",
"version": "1.11.2",
"description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.",
"homepage": "https://github.com/pocoproject/poco",
"license": "BSL-1.0",
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 @@ -5477,7 +5477,7 @@
"port-version": 3
},
"poco": {
"baseline": "1.11.1",
"baseline": "1.11.2",
"port-version": 0
},
"podofo": {
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/poco.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "de13e6b66833cb816a0f85528697c7ee63be89ae",
"version": "1.11.2",
"port-version": 0
},
{
"git-tree": "ae7e310067c34beca24a055b9b25e24fe1b42190",
"version": "1.11.1",
Expand Down