build(deps): sync bit7z and 7zip from vcpkg (#29)

Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
msclock · Jan 4, 2025 · b72dbac · b72dbac
1 parent e98be63
commit b72dbac
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 180 deletions.
diff --git a/cmake/vcpkg/ports/7zip/fix_timespec_get_broken_on_android.patch b/cmake/vcpkg/ports/7zip/fix_timespec_get_broken_on_android.patch
@@ -0,0 +1,13 @@
+diff --git a/CPP/Windows/TimeUtils.cpp b/CPP/Windows/TimeUtils.cpp
+index bbd79ba..8df3ea3 100644
+--- a/CPP/Windows/TimeUtils.cpp
++++ b/CPP/Windows/TimeUtils.cpp
+@@ -259,7 +259,7 @@ bool GetSecondsSince1601(unsigned year, unsigned month, unsigned day,
+       Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.3,
+       Cygwin 2.9, mingw, MSVC 14, Android 9.0.
+ */
+-#if defined(TIME_UTC)
++#if defined(TIME_UTC) && (!defined(__ANDROID__) || __ANDROID_API__ >= 29)
+ #define ZIP7_USE_timespec_get
+ // #pragma message("ZIP7_USE_timespec_get")
+ #elif defined(CLOCK_REALTIME)
diff --git a/cmake/vcpkg/ports/7zip/portfile.cmake b/cmake/vcpkg/ports/7zip/portfile.cmake
@@ -6,22 +6,13 @@ vcpkg_from_github(
     REF "${VERSION}"
     SHA512 dc0241ed96907965445550912d1171fe32230a52997b089558a4cc73a662fc6a17940db8dcb0794b805268964899d9e5a48ddb444e92b56fd243bbaa17c20a1c
     HEAD_REF main
+    PATCHES
+        fix_timespec_get_broken_on_android.patch
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/7zip-config.cmake.in" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_cmake_get_vars(cmake_vars_file)
-include("${cmake_vars_file}")
-
-if(VCPKG_TARGET_IS_ANDROID)
-    message(STATUS "Disable TIME_UTC on android")
-    vcpkg_replace_string("${SOURCE_PATH}/CPP/Windows/TimeUtils.cpp"
-        [[if defined(TIME_UTC)]]
-        [[if defined(TIME_UTC) && !defined(__ANDROID__)]]
-    )
-endif()
-
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
 )

diff --git a/cmake/vcpkg/ports/7zip/vcpkg.json b/cmake/vcpkg/ports/7zip/vcpkg.json
@@ -14,10 +14,6 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-get-vars",
-      "host": true
     }
   ]
 }
diff --git a/cmake/vcpkg/ports/bit7z/fix_compile_options.patch b/cmake/vcpkg/ports/bit7z/fix_compile_options.patch
diff --git a/cmake/vcpkg/ports/bit7z/fix_dependency.patch b/cmake/vcpkg/ports/bit7z/fix_dependency.patch
diff --git a/cmake/vcpkg/ports/bit7z/fix_install.patch b/cmake/vcpkg/ports/bit7z/fix_install.patch
diff --git a/cmake/vcpkg/ports/bit7z/portfile.cmake b/cmake/vcpkg/ports/bit7z/portfile.cmake
diff --git a/cmake/vcpkg/ports/bit7z/unofficial-bit7z-config.cmake.in b/cmake/vcpkg/ports/bit7z/unofficial-bit7z-config.cmake.in
diff --git a/cmake/vcpkg/ports/bit7z/vcpkg.json b/cmake/vcpkg/ports/bit7z/vcpkg.json