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.

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

[freexl] Update to 1.0.6 #20520

Merged
merged 7 commits into from
Oct 7, 2021
Merged

[freexl] Update to 1.0.6 #20520

merged 7 commits into from
Oct 7, 2021

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Oct 4, 2021

  • What does your PR fix?

    Updates freexl to 1.0.6.
    Revises the portfile and patches.
    Fixes building for uwp, removing the "skip" from CI baseline.
    Installs a pc file for windows (to be used in libspatialite etc.)

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    all, yes (uwp builds now)

  • 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

Copy link

@github-actions github-actions bot left a 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: Local changes detected for freexl but no changes to version or port version.
-- Version: 1.0.4#12
-- Old SHA: 26e9d42e555e69bf1ea1747739daf3d6551bb46b
-- New SHA: b147ad1f2e7da37785c2f235d5ddea623bee96e9
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link

@github-actions github-actions bot left a 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: Local changes detected for freexl but no changes to version or port version.
-- Version: 1.0.4#12
-- Old SHA: 26e9d42e555e69bf1ea1747739daf3d6551bb46b
-- New SHA: c2a1d4b9513b6eed6778cb0a0e6beba1852a6823
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link

@github-actions github-actions bot left a 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: Local changes detected for freexl but no changes to version or port version.
-- Version: 1.0.4#12
-- Old SHA: 26e9d42e555e69bf1ea1747739daf3d6551bb46b
-- New SHA: 6ff7feabc38d94d5570d79e3c3634bf2692e2a2d
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link

@github-actions github-actions bot left a 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: Local changes detected for freexl but no changes to version or port version.
-- Version: 1.0.4#12
-- Old SHA: 26e9d42e555e69bf1ea1747739daf3d6551bb46b
-- New SHA: bf561b6dfbbba099cd2f5a96c99ecb0bbeea0c87
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link

@github-actions github-actions bot left a 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: Local changes detected for freexl but no changes to version or port version.
-- Version: 1.0.4#12
-- Old SHA: 26e9d42e555e69bf1ea1747739daf3d6551bb46b
-- New SHA: 78d9fd132d19da7ea256fbfb529e10e4fb392ed3
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

Copy link

@github-actions github-actions bot left a 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: Local changes detected for freexl but no changes to version or port version.
-- Version: 1.0.4#12
-- Old SHA: 26e9d42e555e69bf1ea1747739daf3d6551bb46b
-- New SHA: 67ce68fbeaf8202a27546a613a67cf54d2933987
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***

@dg0yt dg0yt force-pushed the freexl branch 3 times, most recently from da814e8 to 58953a8 Compare October 5, 2021 06:41
@dg0yt dg0yt changed the title [freexl] Update [freexl] Update to 1.0.6 Oct 5, 2021
@dg0yt dg0yt marked this pull request as ready for review October 5, 2021 06:52
@dg0yt
Copy link
Contributor Author

dg0yt commented Oct 5, 2021

If someone builds this on Windows, please check the contents of the pc file.

@ras0219-msft
Copy link
Contributor

Tada:

PS C:\src\vcpkg> gc .\installed\x86-windows\lib\pkgconfig\freexl.pc
prefix=${pcfiledir}/../..
# Package Information for pkg-config

exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/include

Name: freexl
Description: a simple library extracting data from .xls (Excel BIFF) files
Version: 1.0.6
Libs: -L"${libdir}" -lfreexl
Cflags: -I"${includedir}"
Libs.private: -liconv -lcharset
PS C:\src\vcpkg> gc .\installed\x86-windows\debug\lib\pkgconfig\freexl.pc
prefix=${pcfiledir}/../..
# Package Information for pkg-config

exec_prefix=${prefix}
libdir=${prefix}/lib
includedir=${prefix}/../include

Name: freexl
Description: a simple library extracting data from .xls (Excel BIFF) files
Version: 1.0.6
Libs: -L"${libdir}" -lfreexl
Cflags: -I"${includedir}"
Libs.private: -liconv -lcharset

Copy link
Contributor

@ras0219-msft ras0219-msft left a comment

Choose a reason for hiding this comment

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

LGTM, give me a thumbs up if you're happy with the .pc files and it's ready to merge.

\"${CURRENT_INSTALLED_DIR}/lib/charset.lib\""
)

set(OPTFLAGS "/nologo /fp:precise /W3 /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT")
Copy link
Contributor

Choose a reason for hiding this comment

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

I look forward to the day that we have vcpkg_get_cmake_vars as an official stable helper port

Copy link
Contributor Author

Choose a reason for hiding this comment

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

vcpkg_build_nmake already passes CMAKE_CXX_FLAGS (+debug/relase) from (directly including!) scripts/toolchains/windows.cmake (or chainload override) via ENV{CL}. It does not use vcpkg_get_cmake_vars.

However, it doesn't add /LIBPATH:..., and I wonder if it should. There are also other quirks. I considered creating a vcpkg-nmake port...

@dg0yt
Copy link
Contributor Author

dg0yt commented Oct 6, 2021

@ras0219-msft Thumbs up, ready to merge.

@ras0219-msft ras0219-msft merged commit ac030b4 into microsoft:master Oct 7, 2021
@ras0219-msft
Copy link
Contributor

Thanks as always!

yurybura pushed a commit to yurybura/vcpkg that referenced this pull request Oct 7, 2021
* Reformat portfile

* Minimize makefiles patch

* Update to 1.0.6

* Fix uwp builds, remove skip from baseline

* Install pc file for windows

* Update versions

Co-authored-by: Billy Robert O'Neal III <[email protected]>
BillyONeal added a commit that referenced this pull request Oct 12, 2021
* [scripts/boost] fix issue #20417
[boost-iostreams] replace explicit dependencies with default-features, allow to disable compression filters

* add versions

* [scripts/boost] update port version after #20421

* [boost-odeint] move boost-mpi dependency to the feature

* add version

* [boost-modular-build-helper] rework user-config generation

* [boost-python] move python3 from explicit dependency to default feature

* [boost-modular-build-helper] update version

* add verions

* [boost-modular-build-helper] fix empty flags

* update version

* Fix compilation on Emscripten / WebAssembly (#20551)

* [opencv4,opencv3] Control exported protobuf dependency (#20550)

* Control exported protobuf dependency

* Update versions

* Control exported protobuf dependency

* Update versions

* [OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (#20422)

* [OpenMVS] restore deprecated cmake scripts

* [OpenMVS] fix references

* switch back to vcpkg_cmake_*

Co-authored-by: nicole mazzuca <[email protected]>

* [libffi] Don't replace string in file that doesn't exist. (#20554)

* Don't replace string in file that doesn't exist.

* Update per bot.

* Update per bot again.

* Address comments.

* [json-dto] Update to 0.2.14 (#20570)

* json-dto updated to v.0.2.14.

* json-dto-0.2.14 added to baseline.

* Change deprecated commands.

* Update baseline for fresh json-dto-0.2.14.

* [sail] Update to 0.9.0-pre17 (#20562)

* [sail] Update to 0.9.0-pre17

* [sail] vcpkg x-add-version --all --overwrite-version

* [sail] Update pre17 hash

* [sail] vcpkg x-add-version --all --overwrite-version

* [freexl] Update to 1.0.6 (#20520)

* Reformat portfile

* Minimize makefiles patch

* Update to 1.0.6

* Fix uwp builds, remove skip from baseline

* Install pc file for windows

* Update versions

Co-authored-by: Billy Robert O'Neal III <[email protected]>

* [dartsim] Update to 6.11.0 (#20566)

* Update dartsim

* Use newer vcpkg functions

* Update version number

* Update ports/dartsim/portfile.cmake

Co-authored-by: Robert Schumacher <[email protected]>

* Update versions

Co-authored-by: Robert Schumacher <[email protected]>

* [scripts/boost] update Boost version in boost-modular-build.cmake to avoid manual changes

* update version

* [boost-modular-build-helper] fix USER_CONFIG_EXTRA_LINES variable name and rename generated files

* update version

* Resolve differences from rerunning generate-ports.ps1.

Co-authored-by: Billy Robert O'Neal III <[email protected]>
Co-authored-by: Tobias Markus <[email protected]>
Co-authored-by: Kai Pastor <[email protected]>
Co-authored-by: Stefano Sinigardi <[email protected]>
Co-authored-by: nicole mazzuca <[email protected]>
Co-authored-by: Lars Glud <[email protected]>
Co-authored-by: eao197 <[email protected]>
Co-authored-by: Dmitry Baryshev <[email protected]>
Co-authored-by: Akash <[email protected]>
Co-authored-by: Robert Schumacher <[email protected]>
@dg0yt dg0yt deleted the freexl branch November 19, 2021 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants