Skip to content

Commit

Permalink
[tinyxml2] Update to version 10.0.0 (microsoft#39082)
Browse files Browse the repository at this point in the history
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

This PR updates tinyxml2 to version 10.0.0

---------

Co-authored-by: Kai Pastor <[email protected]>
  • Loading branch information
kadirlua and dg0yt authored Jun 6, 2024
1 parent e60b08c commit 2b99134
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 083f54b..e7319db 100644
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -106,14 +106,9 @@ distribution.
#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__CYGWIN__)
#define TIXML_FSEEK fseeko
#define TIXML_FTELL ftello
-#elif defined(__ANDROID__)
- #if __ANDROID_API__ > 24
- #define TIXML_FSEEK fseeko64
- #define TIXML_FTELL ftello64
- #else
- #define TIXML_FSEEK fseeko
- #define TIXML_FTELL ftello
- #endif
+#elif defined(__ANDROID__) && __ANDROID_API__ >= 24
+ #define TIXML_FSEEK fseeko64
+ #define TIXML_FTELL ftello64
#else
#define TIXML_FSEEK fseek
#define TIXML_FTELL ftell
5 changes: 3 additions & 2 deletions ports/tinyxml2/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO leethomason/tinyxml2
REF 9.0.0
SHA512 9C5CE8131984690DF302CA3E32314573B137180ED522C92FD631692979C942372A28F697FDB3D5E56BCF2D3DC596262B724D088153F3E1D721C9536F2A883367
REF 10.0.0
SHA512 a359d33bc12fad455b53d81011dbe12727cae0aabfaa5704f1a25807ca216dd854a571291029886c0beedeca5c3b6393dd49c4718773e18a0e008abbdb3de36a
HEAD_REF master
PATCHES
0001-fix-do-not-force-export-the-symbols-when-building-st.patch
0002-fix-check-for-TINYXML2_EXPORT-on-non-windows.patch
0003-fix-Android-SDK-below-24-does-not-support-fseeko.patch
)

vcpkg_cmake_configure(
Expand Down
3 changes: 1 addition & 2 deletions ports/tinyxml2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "tinyxml2",
"version-semver": "9.0.0",
"port-version": 2,
"version-semver": "10.0.0",
"description": "A simple, small, efficient, C++ XML parser",
"homepage": "https://github.com/leethomason/tinyxml2",
"license": "Zlib",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8765,8 +8765,8 @@
"port-version": 10
},
"tinyxml2": {
"baseline": "9.0.0",
"port-version": 2
"baseline": "10.0.0",
"port-version": 0
},
"tl-expected": {
"baseline": "1.1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/tinyxml2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e7763e8defdfa46b8d2e399756511f0c7ff00448",
"version-semver": "10.0.0",
"port-version": 0
},
{
"git-tree": "c88f30e7ca28b2de522a19a7c7b6d318664e3860",
"version-semver": "9.0.0",
Expand Down

0 comments on commit 2b99134

Please sign in to comment.