From d4b389ae6e9f80eed22bfbf9cdfadda97808c355 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 11 Mar 2025 00:47:47 +0900 Subject: [PATCH] [tinyxml2] update to 10.1.0 --- ...SDK-below-24-does-not-support-fseeko.patch | 22 ------------------- ports/tinyxml2/portfile.cmake | 5 ++--- ports/tinyxml2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tinyxml2.json | 5 +++++ 5 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 ports/tinyxml2/0003-fix-Android-SDK-below-24-does-not-support-fseeko.patch 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 deleted file mode 100644 index 4de71c5692de2d..00000000000000 --- a/ports/tinyxml2/0003-fix-Android-SDK-below-24-does-not-support-fseeko.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 8ebf8601aeeafd..924a65e6d42274 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO leethomason/tinyxml2 - REF 10.0.0 - SHA512 a359d33bc12fad455b53d81011dbe12727cae0aabfaa5704f1a25807ca216dd854a571291029886c0beedeca5c3b6393dd49c4718773e18a0e008abbdb3de36a + REF "${VERSION}" + SHA512 acdd42c7431de65272fdcb2cdf64beb44efc97deffed45f9933453883182238a60071bec5dda2f87d166dd8455e8cd3118af6937ddd7c6abacafda2a060f6cc6 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 211f0036796079..e9d3b007e6fffe 100644 --- a/ports/tinyxml2/vcpkg.json +++ b/ports/tinyxml2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tinyxml2", - "version-semver": "10.0.0", + "version-semver": "10.1.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 5ed690f82b69a8..d98667369763e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9217,7 +9217,7 @@ "port-version": 10 }, "tinyxml2": { - "baseline": "10.0.0", + "baseline": "10.1.0", "port-version": 0 }, "tl-expected": { diff --git a/versions/t-/tinyxml2.json b/versions/t-/tinyxml2.json index e08b20464cac1c..73698f23d9787b 100644 --- a/versions/t-/tinyxml2.json +++ b/versions/t-/tinyxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eb55bba03f65245ee1f2d9f90123662cbfcb36f", + "version-semver": "10.1.0", + "port-version": 0 + }, { "git-tree": "e7763e8defdfa46b8d2e399756511f0c7ff00448", "version-semver": "10.0.0",