-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
[poco] update to 1.12.4 #27288
Conversation
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.
You have modified or added at least one portfile where deprecated functions are used.
If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake
-> vcpkg_cmake_install
(from port vcpkg-cmake
)
vcpkg_build_cmake
-> vcpkg_cmake_build
(from port vcpkg-cmake
)
vcpkg_configure_cmake
-> vcpkg_cmake_configure
(Please remove the option PREFER_NINJA
) (from port vcpkg-cmake
)
vcpkg_fixup_cmake_targets
-> vcpkg_cmake_config_fixup
(from port vcpkg-cmake-config
)
In the ports that use the new function, you have to add the corresponding dependencies:
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
The following files are affected:
ports/poco/portfile.cmake
Thanks for your PR. Please get failure logs here. Please ping me if you need any help. |
@russelltg Old Name: You removed the following patch for the three files that changed targetName from Lines 148-204:
|
ports/poco/0001-static-pcre.patch
Outdated
From 95bc246eb7f5233df2f2604a0ce3d2d8f70d622e Mon Sep 17 00:00:00 2001 | ||
From: Russell Greene <[email protected]> | ||
Date: Tue, 18 Oct 2022 09:05:46 -0500 | ||
Subject: [PATCH 1/7] static-pcre | ||
|
||
--- | ||
Foundation/CMakeLists.txt | 17 +++++++++++++++++ | ||
1 file changed, 17 insertions(+) | ||
|
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.
vcpkg doesn't want these headers.
ports/poco/portfile.cmake
Outdated
@@ -48,7 +56,7 @@ vcpkg_cmake_configure( | |||
# force to use dependencies as external | |||
-DPOCO_UNBUNDLED=ON | |||
# Define linking feature | |||
-DPOCO_STATIC=${POCO_STATIC} | |||
-DBUILD_SHARED_LIBS=${POCO_SHARED} |
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.
BUILD_SHARED_LIBS
is a standard CMake variable and automatical set by vcpkg_cmake_configure
.
(Maybe all the POCO_SHARED
/POCO_STATIC
is obsolete now?)
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.
Yes, POCO_STATIC is deprecated. I'll remove this
From b4b26e94920a3c6000277d16ddb6911ec3ca641e Mon Sep 17 00:00:00 2001 | ||
From: Russell Greene <[email protected]> | ||
Date: Tue, 18 Oct 2022 09:07:27 -0500 | ||
Subject: [PATCH 6/7] fix-install-data-mysql | ||
|
||
--- | ||
Data/CMakeLists.txt | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt | ||
index 9d0a85c..4f1ae21 100644 | ||
index 692fd2f..ec82d76 100644 | ||
--- a/Data/CMakeLists.txt | ||
+++ b/Data/CMakeLists.txt | ||
@@ -45,7 +45,7 @@ else(ENABLE_DATA_SQLITE) |
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.
This file shouldn't change at all?
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.
yeah the FROM...TO did change but I can revert that to clean up the diff (I'm going to keep the rename though if that's okay)
+ 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 | ||
+ ) |
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_definitions
acts 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.
Adds definitions to the compiler command line for targets in the current directory, whether added before or after this command is invoked, and for the ones in sub-directories added after
https://cmake.org/cmake/help/latest/command/add_definitions.html
It only affects the current and child tress, so should be equivalent to a target_compile_definitions.
@MonicaLiu0311 Great question, this is because Poco 1.12 moves from PCRE to PCRE2. There is no PCRE2Config.cmake that gets installed with the PCRE2 vcpkg package, so I'm just using their internal FindPCRE2.cmake (that gets installed into share/poco) with some modifications |
f1f488b
to
9191037
Compare
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.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json
or CONTROL
must be modified.
error: checked-in files for poco have changed but the version was not updated
version: 1.12.2
old SHA: 3c19b18886b438f08bd1e093beb3d6c1f178a613
new SHA: c610ac035d217e5e7700730c0a0b026bce7008fc
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
I see, thank you very much for your detailed answer. |
e1160c3
I just noticed that there is already 1.12.3 now. |
Retagging this with reviewed to ensure I check again on Monday |
1.12.4 is up which contains security fixes, might want to update again. |
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.
I am not a fan of the "-D
hack" but that was already there. Thanks for the update!
Agreed, I'll file an issue with upstream, as I consider it a proper bug. And they can do a much better solution (there's a single define they can set that does the same thing but for all pcre2 symbols) |
…0-17, he started applying use of the "embedded VERSION" feature microsoft/vcpkg-tool#717 to PRs on merge. @dg0yt points out that this use should be accompanied by a call to vcpkg_minimum_required, in https://github.com/microsoft/vcpkg/pull/27594/files#r1010641672 This is an audit of everything merged in that time and whether it needs to gain that. microsoft#27561 No VERSION microsoft#27525 No VERSION microsoft#27554 Already has vcpkg_minimum_required microsoft#27536 No VERSION microsoft#27562 No VERSION microsoft#24914 Fixed here microsoft#27547 No VERSION microsoft#27502 No VERSION microsoft#27497 No VERSION microsoft#27317 No VERSION microsoft#27288 No VERSION microsoft#27509 No VERSION microsoft#27504 No VERSION microsoft#27514 No VERSION microsoft#27501 No VERSION microsoft#27495 No VERSION microsoft#27488 No VERSION microsoft#27499 No VERSION microsoft#27378 No VERSION microsoft#27376 Fixed here microsoft#27373 No VERSION microsoft#27045 No VERSION microsoft#27521 No VERSION microsoft#27453 No VERSION microsoft#27481 No VERSION microsoft#27511 No VERSION microsoft#27490 No VERSION microsoft#27510 No VERSION microsoft#27496 No VERSION microsoft#27503 No VERSION microsoft#27485 No VERSION microsoft#27484 No VERSION microsoft#27483 No VERSION microsoft#27459 No VERSION microsoft#27369 No VERSION microsoft#27489 No VERSION microsoft#26594 No VERSION microsoft#27465 No VERSION microsoft#27456 No VERSION microsoft#27425 No VERSION microsoft#27464 Fixed here microsoft#27406 No VERSION microsoft#27398 No VERSION microsoft#27240 No VERSION microsoft#27450 No VERSION microsoft#27463 No VERSION microsoft#27462 No VERSION microsoft#27448 No VERSION microsoft#27440 No VERSION microsoft#27435 No VERSION microsoft#27424 No VERSION microsoft#27414 No VERSION microsoft#27412 No VERSION microsoft#27380 No VERSION microsoft#27343 No VERSION microsoft#27342 No VERSION microsoft#27367 No VERSION microsoft#27226 No VERSION microsoft#27320 No VERSION microsoft#26923 No VERSION microsoft#27284 No VERSION microsoft#27433 No VERSION microsoft#27314 VERSION got *removed* microsoft#27335 No VERSION microsoft#27370 No VERSION microsoft#27324 No VERSION microsoft#27391 No VERSION microsoft#27388 No VERSION microsoft#27396 No VERSION microsoft#27404 No VERSION microsoft#27413 No VERSION microsoft#27417 No VERSION microsoft#27427 No VERSION microsoft#27428 No VERSION microsoft#27368 No VERSION microsoft#27307 No VERSION microsoft#27415 Fixed here. microsoft#27371 Fixed here. microsoft#27323 No VERSION microsoft#27352 No VERSION microsoft#27347 No VERSION microsoft#27366 No VERSION microsoft#27361 No VERSION microsoft#27359 No VERSION microsoft#27358 No VERSION microsoft#27355 No VERSION microsoft#27331 No VERSION microsoft#24615 No VERSION microsoft#27325 No VERSION microsoft#24861 No VERSION microsoft#27354 No VERSION microsoft#27346 No VERSION microsoft#27345 No VERSION microsoft#27218 No VERSION microsoft#27329 No VERSION microsoft#27326 No VERSION microsoft#27321 No VERSION microsoft#27312 No VERSION microsoft#27297 No VERSION microsoft#27336 No VERSION microsoft#27225 No VERSION microsoft#27339 No VERSION microsoft#27302 No VERSION microsoft#27295 No VERSION microsoft#27233 No VERSION microsoft#27313 No VERSION microsoft#27237 No VERSION microsoft#27250 No VERSION microsoft#27263 No VERSION microsoft#27266 No VERSION microsoft#27272 No VERSION microsoft#27287 No VERSION microsoft#27282 No VERSION microsoft#27294 No VERSION microsoft#27228 No VERSION microsoft#27163 No VERSION microsoft#26817 No VERSION microsoft#27286 No VERSION microsoft#27274 No VERSION microsoft#27276 No VERSION microsoft#27232 No VERSION microsoft#27221 No VERSION microsoft#27215 No VERSION microsoft#27166 No VERSION microsoft#27239 No VERSION microsoft#27246 No VERSION microsoft#27268 No VERSION microsoft#27259 No VERSION microsoft#27238 No VERSION microsoft#27224 No VERSION microsoft#27203 No VERSION microsoft#27124 No VERSION
* When @BillyONeal started being the on-call vcpkg maintainer on 2022-10-17, he started applying use of the "embedded VERSION" feature microsoft/vcpkg-tool#717 to PRs on merge. @dg0yt points out that this use should be accompanied by a call to vcpkg_minimum_required, in https://github.com/microsoft/vcpkg/pull/27594/files#r1010641672 This is an audit of everything merged in that time and whether it needs to gain that. #27561 No VERSION #27525 No VERSION #27554 Already has vcpkg_minimum_required #27536 No VERSION #27562 No VERSION #24914 Fixed here #27547 No VERSION #27502 No VERSION #27497 No VERSION #27317 No VERSION #27288 No VERSION #27509 No VERSION #27504 No VERSION #27514 No VERSION #27501 No VERSION #27495 No VERSION #27488 No VERSION #27499 No VERSION #27378 No VERSION #27376 Fixed here #27373 No VERSION #27045 No VERSION #27521 No VERSION #27453 No VERSION #27481 No VERSION #27511 No VERSION #27490 No VERSION #27510 No VERSION #27496 No VERSION #27503 No VERSION #27485 No VERSION #27484 No VERSION #27483 No VERSION #27459 No VERSION #27369 No VERSION #27489 No VERSION #26594 No VERSION #27465 No VERSION #27456 No VERSION #27425 No VERSION #27464 Fixed here #27406 No VERSION #27398 No VERSION #27240 No VERSION #27450 No VERSION #27463 No VERSION #27462 No VERSION #27448 No VERSION #27440 No VERSION #27435 No VERSION #27424 No VERSION #27414 No VERSION #27412 No VERSION #27380 No VERSION #27343 No VERSION #27342 No VERSION #27367 No VERSION #27226 No VERSION #27320 No VERSION #26923 No VERSION #27284 No VERSION #27433 No VERSION #27314 VERSION got *removed* #27335 No VERSION #27370 No VERSION #27324 No VERSION #27391 No VERSION #27388 No VERSION #27396 No VERSION #27404 No VERSION #27413 No VERSION #27417 No VERSION #27427 No VERSION #27428 No VERSION #27368 No VERSION #27307 No VERSION #27415 Fixed here. #27371 Fixed here. #27323 No VERSION #27352 No VERSION #27347 No VERSION #27366 No VERSION #27361 No VERSION #27359 No VERSION #27358 No VERSION #27355 No VERSION #27331 No VERSION #24615 No VERSION #27325 No VERSION #24861 No VERSION #27354 No VERSION #27346 No VERSION #27345 No VERSION #27218 No VERSION #27329 No VERSION #27326 No VERSION #27321 No VERSION #27312 No VERSION #27297 No VERSION #27336 No VERSION #27225 No VERSION #27339 No VERSION #27302 No VERSION #27295 No VERSION #27233 No VERSION #27313 No VERSION #27237 No VERSION #27250 No VERSION #27263 No VERSION #27266 No VERSION #27272 No VERSION #27287 No VERSION #27282 No VERSION #27294 No VERSION #27228 No VERSION #27163 No VERSION #26817 No VERSION #27286 No VERSION #27274 No VERSION #27276 No VERSION #27232 No VERSION #27221 No VERSION #27215 No VERSION #27166 No VERSION #27239 No VERSION #27246 No VERSION #27268 No VERSION #27259 No VERSION #27238 No VERSION #27224 No VERSION #27203 No VERSION #27124 No VERSION * Also add libcanberra
Update poco to 1.12.2
Fixes #25928
Which triplets are supported/not supported? Have you updated the CI baseline?
all
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --all
and committed the result?Yes, but there may be issues with this PR still