-
Notifications
You must be signed in to change notification settings - Fork 6.3k
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
[libxlsxwriter] Updated version 1.1.8 #41217
base: master
Are you sure you want to change the base?
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.
I think the port must now explicitly control interaction with PKGCONFIG when the build looks for dependencies. Disable it, or provide the program.
Still valid. |
the port generated a pkg-config file but didn't use PKGCONFIG to find deps. I've removed the generation of the pkg-config file. The only reference to PKGCONFIG is in the Makefile, that isn't used to build the library when using CMake as build system. |
This is not what was asked for. |
Hmm... It works just fine now. When I updated the version to 1.1.8 it didn't build, because the old patches didn't work.
PKGCONFIG seems to be a optional feature introduced in 1.1.8. It's not used in building the library at all. I don't think it's necessary to provide pkg-config with the lib. I'm confused |
IMO CMake is preferred when building with, and export config for, CMake. |
Ah, now I get the confusion. |
Indeed. Usually updates are very close to master. |
I see... I've readded the unofficial::minizip patch |
+ set(MINIZIP_LIBRARIES unofficial::minizip::minizip) | ||
endif() | ||
|
||
# LIBRARY | ||
diff --git a/dev/release/pkg-config.txt b/dev/release/pkg-config.txt |
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.
diff --git a/dev/release/pkg-config.txt b/dev/release/pkg-config.txt | |
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 0e855c77..b08ae8e6 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -230,8 +230,8 @@ message("zlib version: " ${ZLIB_VERSION}) | |
# MINIZIP | |
if (USE_SYSTEM_MINIZIP) | |
- find_package(MINIZIP "1.0" REQUIRED) | |
- list(APPEND LXW_PRIVATE_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) | |
+ find_package(MINIZIP NAMES unofficial-minizip REQUIRED) | |
+ set(MINIZIP_LIBRARIES unofficial::minizip::minizip) | |
endif() | |
# LIBRARY | |
diff --git a/dev/release/pkg-config.txt b/dev/release/pkg-config.txt |
I really want this (updated) chunk back in dependencies.diff. And nothing else from pkg-config.diff.
PATCHES | ||
dependencies.diff | ||
fix-zlib-ver-required.patch | ||
disable-pkgconfig.diff |
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.
disable-pkgconfig.diff |
If this PR updates an existing port, please uncomment and fill out this checklist:
"port-version"
is reset (removed fromvcpkg.json
)../vcpkg x-add-version --all
and committing the result.