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

Jump to bottom

[expat] Update to 2.5.0 #27547

Merged
merged 1 commit into from
Oct 31, 2022
Merged

[expat] Update to 2.5.0 #27547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions ports/expat/mingw_static_fix.patch
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ports/expat/pkgconfig_fix.patch
View file
Open in desktop

This file was deleted.

10 changes: 2 additions & 8 deletions ports/expat/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
file(READ ${CMAKE_CURRENT_LIST_DIR}/vcpkg.json vcpkg_json)
string(JSON VERSION GET "${vcpkg_json}" "version")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libexpat/libexpat
REF R_2_4_9
SHA512 6bf92516ce2642b2cdcbc586aaac0f706f125394fa428670f9b8b042a1f393e3b9dda1a24e58e6c8ad8b4ff3303cb5a8700628c6c04a881a06251c08be3759d3
REF R_2_5_0
SHA512 779f0d0f3f2d8b33db0fd044864ab5ab1a40f20501f792fe90ad0d18de536c4765c3749f120e21fec11a0e6c89af1dc576d1fe261c871ca44a594f7b61fd1d9e
HEAD_REF master
PATCHES
"pkgconfig_fix.patch" # https://github.com/libexpat/libexpat/pull/656
"mingw_static_fix.patch" # https://github.com/libexpat/libexpat/pull/658
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" EXPAT_LINKAGE)
Expand Down
3 changes: 1 addition & 2 deletions ports/expat/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "expat",
"version": "2.4.9",
"port-version": 1,
"version": "2.5.0",
"description": "XML parser library written in C",
"homepage": "https://github.com/libexpat/libexpat",
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2193,8 +2193,8 @@
"port-version": 2
},
"expat": {
"baseline": "2.4.9",
"port-version": 1
"baseline": "2.5.0",
"port-version": 0
},
"expected-lite": {
"baseline": "0.6.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/expat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "59123c85dfc30e456d0bc5894befd6d461d35d7c",
"version": "2.5.0",
"port-version": 0
},
{
"git-tree": "755ce6df1ddbca1c1fcb0d2fe7cbd2b5bd074121",
"version": "2.4.9",
Expand Down