From db368b493dfceabc358c9f5d908537a1b830decd Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:11:06 +0800
Subject: [PATCH 01/11] [7zip] restore missing sources in CMakeLists.txt

Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
---
 ports/7zip/CMakeLists.txt | 24 ++++++++++--------------
 ports/7zip/vcpkg.json     |  1 +
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/ports/7zip/CMakeLists.txt b/ports/7zip/CMakeLists.txt
index afb454293c66b4..e7a8e08962bea1 100644
--- a/ports/7zip/CMakeLists.txt
+++ b/ports/7zip/CMakeLists.txt
@@ -179,6 +179,16 @@ target_sources(7zip PRIVATE
     CPP/7zip/Common/UniqBlocks.cpp
     CPP/7zip/Common/VirtThread.cpp
 
+    CPP/Windows/FileDir.cpp
+    CPP/Windows/FileFind.cpp
+    CPP/Windows/FileIO.cpp
+    CPP/Windows/FileName.cpp
+    CPP/Windows/PropVariant.cpp
+    CPP/Windows/PropVariantUtils.cpp
+    CPP/Windows/Synchronization.cpp
+    CPP/Windows/System.cpp
+    CPP/Windows/TimeUtils.cpp
+
     CPP/7zip/Archive/ApmHandler.cpp
     CPP/7zip/Archive/ArHandler.cpp
     CPP/7zip/Archive/ArjHandler.cpp
@@ -300,20 +310,6 @@ target_sources(7zip PRIVATE
     C/Util/LzmaLib/LzmaLib.def
 )
 
-if(WIN32)
-    target_sources(7zip PRIVATE
-        CPP/Windows/FileDir.cpp
-        CPP/Windows/FileFind.cpp
-        CPP/Windows/FileIO.cpp
-        CPP/Windows/FileName.cpp
-        CPP/Windows/PropVariant.cpp
-        CPP/Windows/PropVariantUtils.cpp
-        CPP/Windows/Synchronization.cpp
-        CPP/Windows/System.cpp
-        CPP/Windows/TimeUtils.cpp
-    )
-endif()
-
 # 7zCrcOpt
 if(VCPKG_TARGET_IS_WINDOWS)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
index 06b0d3b8e8c3e8..a68bbe21e0dd48 100644
--- a/ports/7zip/vcpkg.json
+++ b/ports/7zip/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "7zip",
   "version-string": "24.09",
+  "port-version": 1,
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",

From 256579048ad6cdabee0cbdd5ab3ba51b9b97bb63 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:11:19 +0800
Subject: [PATCH 02/11] Update versions

Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
---
 versions/7-/7zip.json  | 5 +++++
 versions/baseline.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json
index fb74f0fefda986..ea6af183d5db92 100644
--- a/versions/7-/7zip.json
+++ b/versions/7-/7zip.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e45c7adcc2c515eb76c4729d44e4d2d271535774",
+      "version-string": "24.09",
+      "port-version": 1
+    },
     {
       "git-tree": "29a42acc927078e1dc58fbbf354d1c59e01d0a03",
       "version-string": "24.09",
diff --git a/versions/baseline.json b/versions/baseline.json
index fd13fea6c4b5a1..5ac2fe24f673c6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6,7 +6,7 @@
     },
     "7zip": {
       "baseline": "24.09",
-      "port-version": 0
+      "port-version": 1
     },
     "ableton": {
       "baseline": "3.0.6",

From d0472beda443c6f0f4e156a8fdf95b2156b18596 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:47:38 +0800
Subject: [PATCH 03/11] Disable TIME_UTC for android

---
 ports/7zip/portfile.cmake | 11 +++++++++++
 ports/7zip/vcpkg.json     |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
index fc9776c9acf918..79188737b397ce 100644
--- a/ports/7zip/portfile.cmake
+++ b/ports/7zip/portfile.cmake
@@ -9,6 +9,17 @@ vcpkg_from_github(
 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/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
index a68bbe21e0dd48..83f84ba38fc0ef 100644
--- a/ports/7zip/vcpkg.json
+++ b/ports/7zip/vcpkg.json
@@ -14,6 +14,10 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
+    },
+    {
+      "name": "vcpkg-cmake-get-vars",
+      "host": true
     }
   ]
 }

From 5f47b65251d8f068cce127334d8458a65ae95a75 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Wed, 25 Dec 2024 15:48:34 +0800
Subject: [PATCH 04/11] Fix versions

---
 versions/7-/7zip.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json
index ea6af183d5db92..93afac70e59ae4 100644
--- a/versions/7-/7zip.json
+++ b/versions/7-/7zip.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e45c7adcc2c515eb76c4729d44e4d2d271535774",
+      "git-tree": "8ed8294e7f88b2298a05eef56cdd6f8361aa1509",
       "version-string": "24.09",
       "port-version": 1
     },

From 60e84ee0a752fd29922dfcbbc347a024f719c2a3 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:30:18 +0800
Subject: [PATCH 05/11] Update ports/7zip/vcpkg.json

Co-authored-by: Kai Pastor <dg0yt@darc.de>
---
 ports/7zip/vcpkg.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json
index 83f84ba38fc0ef..a68bbe21e0dd48 100644
--- a/ports/7zip/vcpkg.json
+++ b/ports/7zip/vcpkg.json
@@ -14,10 +14,6 @@
     {
       "name": "vcpkg-cmake-config",
       "host": true
-    },
-    {
-      "name": "vcpkg-cmake-get-vars",
-      "host": true
     }
   ]
 }

From 6b9bb9537a3a3d53564cee0431a13096705ff835 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:30:33 +0800
Subject: [PATCH 06/11] Update ports/7zip/portfile.cmake

Co-authored-by: Kai Pastor <dg0yt@darc.de>
---
 ports/7zip/portfile.cmake | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
index 79188737b397ce..24b5fcdc4917f4 100644
--- a/ports/7zip/portfile.cmake
+++ b/ports/7zip/portfile.cmake
@@ -9,9 +9,6 @@ vcpkg_from_github(
 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"

From 5dab6c5e220684fe4b077e6055e5fab5821dfb33 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Tue, 31 Dec 2024 16:31:59 +0800
Subject: [PATCH 07/11] Remove VCPKG_TARGET_IS_ANDROID section

Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
---
 ports/7zip/portfile.cmake | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
index 24b5fcdc4917f4..fc9776c9acf918 100644
--- a/ports/7zip/portfile.cmake
+++ b/ports/7zip/portfile.cmake
@@ -9,14 +9,6 @@ vcpkg_from_github(
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/7zip-config.cmake.in" DESTINATION "${SOURCE_PATH}")
 
-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}"
 )

From a5878a2105355eeca14db6cf87839fbc14e447c3 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Tue, 31 Dec 2024 17:21:15 +0800
Subject: [PATCH 08/11] Patch for android

Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
---
 ports/7zip/fix_timespec_get_broken_on_android.patch | 13 +++++++++++++
 ports/7zip/portfile.cmake                           |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 ports/7zip/fix_timespec_get_broken_on_android.patch

diff --git a/ports/7zip/fix_timespec_get_broken_on_android.patch b/ports/7zip/fix_timespec_get_broken_on_android.patch
new file mode 100644
index 00000000000000..ba1e817afe8deb
--- /dev/null
+++ b/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__ < 18)
+ #define ZIP7_USE_timespec_get
+ // #pragma message("ZIP7_USE_timespec_get")
+ #elif defined(CLOCK_REALTIME)
diff --git a/ports/7zip/portfile.cmake b/ports/7zip/portfile.cmake
index fc9776c9acf918..083b4578f9eae5 100644
--- a/ports/7zip/portfile.cmake
+++ b/ports/7zip/portfile.cmake
@@ -4,6 +4,8 @@ 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}")

From f70ce5c5fee66063a6ee7d2e9bb24aba0ec6f128 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Tue, 31 Dec 2024 17:21:26 +0800
Subject: [PATCH 09/11] Fix versions

Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
---
 versions/7-/7zip.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json
index 93afac70e59ae4..68df84706c1435 100644
--- a/versions/7-/7zip.json
+++ b/versions/7-/7zip.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "8ed8294e7f88b2298a05eef56cdd6f8361aa1509",
+      "git-tree": "5ad1af60bfd9198f2f12a029c3e54b3f615cb439",
       "version-string": "24.09",
       "port-version": 1
     },

From 27fc98160755e5b04b1cfcb686577ed0ef181ed0 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Tue, 31 Dec 2024 19:09:53 +0800
Subject: [PATCH 10/11] Update
 ports/7zip/fix_timespec_get_broken_on_android.patch

Co-authored-by: Kai Pastor <dg0yt@darc.de>
---
 ports/7zip/fix_timespec_get_broken_on_android.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/7zip/fix_timespec_get_broken_on_android.patch b/ports/7zip/fix_timespec_get_broken_on_android.patch
index ba1e817afe8deb..87c2d99acd911e 100644
--- a/ports/7zip/fix_timespec_get_broken_on_android.patch
+++ b/ports/7zip/fix_timespec_get_broken_on_android.patch
@@ -7,7 +7,7 @@ index bbd79ba..8df3ea3 100644
        Cygwin 2.9, mingw, MSVC 14, Android 9.0.
  */
 -#if defined(TIME_UTC)
-+#if defined(TIME_UTC) && (!defined(__ANDROID__) || __ANDROID_API__ < 18)
++#if defined(TIME_UTC) && (!defined(__ANDROID__) || __ANDROID_API__ >= 29)
  #define ZIP7_USE_timespec_get
  // #pragma message("ZIP7_USE_timespec_get")
  #elif defined(CLOCK_REALTIME)

From 17eb7895ae9b68cb63d87635dcb8c01173ec05a6 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Tue, 31 Dec 2024 19:46:33 +0800
Subject: [PATCH 11/11] Fix versions

---
 versions/7-/7zip.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json
index 68df84706c1435..d8b4ec5b6bb9d7 100644
--- a/versions/7-/7zip.json
+++ b/versions/7-/7zip.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "5ad1af60bfd9198f2f12a029c3e54b3f615cb439",
+      "git-tree": "68564a79f07645b24c9267fef692229c7a888559",
       "version-string": "24.09",
       "port-version": 1
     },