diff --git a/ports/tinyxml2/0003-fix-Android-SDK-below-24-does-not-support-fseeko.patch b/ports/tinyxml2/0003-fix-Android-SDK-below-24-does-not-support-fseeko.patch new file mode 100644 index 00000000000000..4de71c5692de2d --- /dev/null +++ b/ports/tinyxml2/0003-fix-Android-SDK-below-24-does-not-support-fseeko.patch @@ -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 diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index dad9b50f8e1a04..8ebf8601aeeafd 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -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( diff --git a/ports/tinyxml2/vcpkg.json b/ports/tinyxml2/vcpkg.json index 0bd7fdd5305f10..211f0036796079 100644 --- a/ports/tinyxml2/vcpkg.json +++ b/ports/tinyxml2/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index b97c7e6cf28de1..00c374d5f750cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/t-/tinyxml2.json b/versions/t-/tinyxml2.json index 608b7bebe8ecfc..e08b20464cac1c 100644 --- a/versions/t-/tinyxml2.json +++ b/versions/t-/tinyxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7763e8defdfa46b8d2e399756511f0c7ff00448", + "version-semver": "10.0.0", + "port-version": 0 + }, { "git-tree": "c88f30e7ca28b2de522a19a7c7b6d318664e3860", "version-semver": "9.0.0",