From 1acb36a0cf0bddf9023e573fc74aa97fb3b99d29 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Wed, 7 Aug 2024 19:24:24 +0200
Subject: [PATCH 1/9] Test with android NDK r28 beta

---
 scripts/azure-pipelines/azure-pipelines.yml     |  2 +-
 scripts/azure-pipelines/test-modified-ports.ps1 | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index c26aa30e373f23..13af0f379d1798 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -12,7 +12,7 @@ parameters:
   - name: tripletPattern
     displayName: 'Enable triplets which contain this substring'
     type: string
-    default: '-'
+    default: 'android'
 
 jobs:
 - template: windows/azure-pipelines.yml
diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
index 3978ce0d3f90ec..7be193fd84231a 100755
--- a/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -120,6 +120,18 @@ if ($IsWindows) {
     rmdir empty
 }
 
+if ($IsLinux -and $Triplet -match 'android' -and $true)
+{
+    $override_ndk = 'r28-beta1'
+    $override_ndk_sha512 = '32804ae60d9e9b5e86bcd6bbfddcbd626ea49466587023fe2d183cf9fb34e142fb39655ea96c871d03194aba0f8d8ed94171dd9f72f4f64b4b687914f0de8520'
+    Write-Host "Downloading Android NDK $override_ndk"
+    & "./vcpkg" x-download android-ndk-$override_ndk-linux.zip "--sha512=$override_ndk_sha512" "--url=https://dl.google.com/android/repository/android-ndk-$override_ndk-linux.zip" @cachingArgs
+    Write-Host "Unpacking"
+    & unzip -q android-ndk-$override_ndk-linux.zip
+    $env:ANDROID_NDK_HOME = Join-Path $Pwd "android-ndk-$override_ndk"
+    $NoParentHashes = $true
+}
+
 & "./vcpkg$executableExtension" x-ci-clean @commonArgs
 $lastLastExitCode = $LASTEXITCODE
 if ($lastLastExitCode -ne 0)

From 51c44eee0c6f4e9eb36c2ab477e2bf1897fa992b Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Thu, 3 Oct 2024 17:54:16 +0200
Subject: [PATCH 2/9] [libiconv] Fix for NDK r28 API level < 23

---
 ports/libiconv/portfile.cmake         |  1 +
 ports/libiconv/rename-gl-mempcpy.diff | 43 +++++++++++++++++++++++++++
 ports/libiconv/vcpkg.json             |  2 +-
 versions/baseline.json                |  2 +-
 versions/l-/libiconv.json             |  5 ++++
 5 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 ports/libiconv/rename-gl-mempcpy.diff

diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake
index 03c2cd5317079b..1f80e7851e01aa 100644
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@@ -19,6 +19,7 @@ vcpkg_extract_source_archive(SOURCE_PATH
         0003-Add-export.patch
         0004-ModuleFileName.patch
         clang-fortify.patch # ported from https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=522aea1093a598246346b3e1c426505c344fe19a
+        rename-gl-mempcpy.diff # for Android NDK r28 with API level < 23
 )
 
 vcpkg_list(SET OPTIONS)
diff --git a/ports/libiconv/rename-gl-mempcpy.diff b/ports/libiconv/rename-gl-mempcpy.diff
new file mode 100644
index 00000000000000..7f8a6f2f1ea0f9
--- /dev/null
+++ b/ports/libiconv/rename-gl-mempcpy.diff
@@ -0,0 +1,43 @@
+diff --git a/srclib/canonicalize-lgpl.c b/srclib/canonicalize-lgpl.c
+index a7fa7fe..8199b35 100644
+--- a/srclib/canonicalize-lgpl.c
++++ b/srclib/canonicalize-lgpl.c
+@@ -71,6 +71,10 @@
+ #  define __getcwd(buf, max) getwd (buf)
+ # endif
+ # define __mempcpy mempcpy
++#if defined(__ANDROID_API__) && __ANDROID_API__ < 23
++# undef __mempcpy
++# define __mempcpy rpl_mempcpy
++#endif
+ # define __pathconf pathconf
+ # define __rawmemchr rawmemchr
+ # define __readlink readlink
+diff --git a/srclib/mempcpy.c b/srclib/mempcpy.c
+index 9aae418..c24f58e 100644
+--- a/srclib/mempcpy.c
++++ b/srclib/mempcpy.c
+@@ -21,6 +21,9 @@
+ 
+ /* A function definition is only needed if HAVE_MEMPCPY is not defined.  */
+ #if !HAVE_MEMPCPY
++#if defined(__ANDROID_API__) && __ANDROID_API__ < 23
++# define mempcpy rpl_mempcpy
++#endif
+ 
+ /* Copy N bytes of SRC to DEST, return pointer to bytes after the
+    last written byte.  */
+diff --git a/srclib/stdlib.in.h b/srclib/stdlib.in.h
+index a86643c..92dff31 100644
+--- a/srclib/stdlib.in.h
++++ b/srclib/stdlib.in.h
+@@ -1553,6 +1553,9 @@ _GL_CXXALIASWARN (wctomb);
+ # endif
+ #endif
+ 
++#if defined(__ANDROID_API__) && __ANDROID_API__ < 23
++_GL_FUNCDECL_RPL (mempcpy, void *, (void *, const void *, size_t));
++#endif
+ 
+ #endif /* _@GUARD_PREFIX@_STDLIB_H */
+ #endif /* _@GUARD_PREFIX@_STDLIB_H */
diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json
index 8f59bf93968c46..b80eb4153cd2ee 100644
--- a/ports/libiconv/vcpkg.json
+++ b/ports/libiconv/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libiconv",
   "version": "1.17",
-  "port-version": 4,
+  "port-version": 5,
   "description": "GNU Unicode text conversion",
   "homepage": "https://www.gnu.org/software/libiconv/",
   "license": null
diff --git a/versions/baseline.json b/versions/baseline.json
index f195e362d5bdbf..644f9eb81194ca 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4630,7 +4630,7 @@
     },
     "libiconv": {
       "baseline": "1.17",
-      "port-version": 4
+      "port-version": 5
     },
     "libics": {
       "baseline": "1.6.6",
diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json
index fa1297f4221131..e9530868fa6c14 100644
--- a/versions/l-/libiconv.json
+++ b/versions/l-/libiconv.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "50c14f093f27eccf755ddff4da37cff1d13d62a8",
+      "version": "1.17",
+      "port-version": 5
+    },
     {
       "git-tree": "6549f7452c383df31d471692b339f985d0000a88",
       "version": "1.17",

From d6416640737cacf139d1a5561c42853b50b50ad1 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 2 Nov 2024 07:36:30 +0100
Subject: [PATCH 3/9] Test NDK canary build

For https://github.com/android/ndk/issues/2081#issuecomment-2452465479.
---
 scripts/azure-pipelines/test-modified-ports.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
index 7be193fd84231a..08afc65a8b8923 100755
--- a/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -122,10 +122,10 @@ if ($IsWindows) {
 
 if ($IsLinux -and $Triplet -match 'android' -and $true)
 {
-    $override_ndk = 'r28-beta1'
-    $override_ndk_sha512 = '32804ae60d9e9b5e86bcd6bbfddcbd626ea49466587023fe2d183cf9fb34e142fb39655ea96c871d03194aba0f8d8ed94171dd9f72f4f64b4b687914f0de8520'
+    $override_ndk = 'r29-canary'
+    $override_ndk_sha512 = '911e1e4522535e7ef7125966830ef5cfdf323384900424966855f5c75587823eb167862484ea5b6ac426b23423dc796ad533ae1f93e65540f3415225641b5b7a'
     Write-Host "Downloading Android NDK $override_ndk"
-    & "./vcpkg" x-download android-ndk-$override_ndk-linux.zip "--sha512=$override_ndk_sha512" "--url=https://dl.google.com/android/repository/android-ndk-$override_ndk-linux.zip" @cachingArgs
+    & "./vcpkg" x-download android-ndk-$override_ndk-linux.zip "--sha512=$override_ndk_sha512" "--url=https://storage.googleapis.com/android-build/builds/aosp-master-ndk-linux-linux/12591196/dbc88c586169c387853d25d5211542057b9174a568ef500640f5147fffac0871/android-ndk-12591196-linux-x86_64.zip?GoogleAccessId=gcs-sign%40android-builds-project.google.com.iam.gserviceaccount.com&Expires=1730528306&Signature=S6ms6JUpSo9q3rl%2FhSHHgW19FKWBwJd9LbDtbAC5HPQ52rYEXp4m%2FXt7xuk5cgOf3CGRCdQGqn9hyE7T3rPhyVqsWzATodEu%2BxTJ7WrAYq7o9o3DSjvFkwwbd4Zq2ShePkokzthnQkaYl5uC9T8Pz8jHvOg6lfaaMknROqgs4SdqNSQS7IZZq30tfrSZaMrLTe75SOpOEaIxXVglanjAdzK3SD6n7pcPAN5dJ7ZL11GbXk4t7Pv9%2BjwvKi52oq2xjl17Yv7KN4UsuC8ydbnSXHIh4AX%2FST4V8HOaFM2mmwkRHDP3XSHrOk5R0S7wCY%2BI%2BgLyMnuLWxFEDoPse7YmMg%3D%3D&response-content-disposition=attachment" @cachingArgs
     Write-Host "Unpacking"
     & unzip -q android-ndk-$override_ndk-linux.zip
     $env:ANDROID_NDK_HOME = Join-Path $Pwd "android-ndk-$override_ndk"

From e145f58fc2e53745d4d564009e7844f954f2878f Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Sat, 2 Nov 2024 07:38:07 +0100
Subject: [PATCH 4/9] Revert "[libiconv] Fix for NDK r28 API level < 23"

This reverts commit 51c44eee0c6f4e9eb36c2ab477e2bf1897fa992b.
---
 ports/libiconv/portfile.cmake         |  1 -
 ports/libiconv/rename-gl-mempcpy.diff | 43 ---------------------------
 ports/libiconv/vcpkg.json             |  2 +-
 versions/baseline.json                |  2 +-
 versions/l-/libiconv.json             |  5 ----
 5 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 ports/libiconv/rename-gl-mempcpy.diff

diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake
index 1f80e7851e01aa..03c2cd5317079b 100644
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@@ -19,7 +19,6 @@ vcpkg_extract_source_archive(SOURCE_PATH
         0003-Add-export.patch
         0004-ModuleFileName.patch
         clang-fortify.patch # ported from https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=522aea1093a598246346b3e1c426505c344fe19a
-        rename-gl-mempcpy.diff # for Android NDK r28 with API level < 23
 )
 
 vcpkg_list(SET OPTIONS)
diff --git a/ports/libiconv/rename-gl-mempcpy.diff b/ports/libiconv/rename-gl-mempcpy.diff
deleted file mode 100644
index 7f8a6f2f1ea0f9..00000000000000
--- a/ports/libiconv/rename-gl-mempcpy.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/srclib/canonicalize-lgpl.c b/srclib/canonicalize-lgpl.c
-index a7fa7fe..8199b35 100644
---- a/srclib/canonicalize-lgpl.c
-+++ b/srclib/canonicalize-lgpl.c
-@@ -71,6 +71,10 @@
- #  define __getcwd(buf, max) getwd (buf)
- # endif
- # define __mempcpy mempcpy
-+#if defined(__ANDROID_API__) && __ANDROID_API__ < 23
-+# undef __mempcpy
-+# define __mempcpy rpl_mempcpy
-+#endif
- # define __pathconf pathconf
- # define __rawmemchr rawmemchr
- # define __readlink readlink
-diff --git a/srclib/mempcpy.c b/srclib/mempcpy.c
-index 9aae418..c24f58e 100644
---- a/srclib/mempcpy.c
-+++ b/srclib/mempcpy.c
-@@ -21,6 +21,9 @@
- 
- /* A function definition is only needed if HAVE_MEMPCPY is not defined.  */
- #if !HAVE_MEMPCPY
-+#if defined(__ANDROID_API__) && __ANDROID_API__ < 23
-+# define mempcpy rpl_mempcpy
-+#endif
- 
- /* Copy N bytes of SRC to DEST, return pointer to bytes after the
-    last written byte.  */
-diff --git a/srclib/stdlib.in.h b/srclib/stdlib.in.h
-index a86643c..92dff31 100644
---- a/srclib/stdlib.in.h
-+++ b/srclib/stdlib.in.h
-@@ -1553,6 +1553,9 @@ _GL_CXXALIASWARN (wctomb);
- # endif
- #endif
- 
-+#if defined(__ANDROID_API__) && __ANDROID_API__ < 23
-+_GL_FUNCDECL_RPL (mempcpy, void *, (void *, const void *, size_t));
-+#endif
- 
- #endif /* _@GUARD_PREFIX@_STDLIB_H */
- #endif /* _@GUARD_PREFIX@_STDLIB_H */
diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json
index b80eb4153cd2ee..8f59bf93968c46 100644
--- a/ports/libiconv/vcpkg.json
+++ b/ports/libiconv/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libiconv",
   "version": "1.17",
-  "port-version": 5,
+  "port-version": 4,
   "description": "GNU Unicode text conversion",
   "homepage": "https://www.gnu.org/software/libiconv/",
   "license": null
diff --git a/versions/baseline.json b/versions/baseline.json
index 644f9eb81194ca..f195e362d5bdbf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4630,7 +4630,7 @@
     },
     "libiconv": {
       "baseline": "1.17",
-      "port-version": 5
+      "port-version": 4
     },
     "libics": {
       "baseline": "1.6.6",
diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json
index e9530868fa6c14..fa1297f4221131 100644
--- a/versions/l-/libiconv.json
+++ b/versions/l-/libiconv.json
@@ -1,10 +1,5 @@
 {
   "versions": [
-    {
-      "git-tree": "50c14f093f27eccf755ddff4da37cff1d13d62a8",
-      "version": "1.17",
-      "port-version": 5
-    },
     {
       "git-tree": "6549f7452c383df31d471692b339f985d0000a88",
       "version": "1.17",

From 9da24176c0f7b96cca4b433021318644a47c9b87 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Wed, 6 Nov 2024 08:04:32 +0100
Subject: [PATCH 5/9] Test NDK canary build

---
 scripts/azure-pipelines/test-modified-ports.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
index 08afc65a8b8923..bc2b411ba2ca73 100755
--- a/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -123,9 +123,10 @@ if ($IsWindows) {
 if ($IsLinux -and $Triplet -match 'android' -and $true)
 {
     $override_ndk = 'r29-canary'
+    $override_ndk_url = 'https://androidbuildinternal.googleapis.com/android/internal/build/v3/builds/12591196/linux/attempts/latest/artifacts/android-ndk-12591196-linux-x86_64.zip/url'
     $override_ndk_sha512 = '911e1e4522535e7ef7125966830ef5cfdf323384900424966855f5c75587823eb167862484ea5b6ac426b23423dc796ad533ae1f93e65540f3415225641b5b7a'
     Write-Host "Downloading Android NDK $override_ndk"
-    & "./vcpkg" x-download android-ndk-$override_ndk-linux.zip "--sha512=$override_ndk_sha512" "--url=https://storage.googleapis.com/android-build/builds/aosp-master-ndk-linux-linux/12591196/dbc88c586169c387853d25d5211542057b9174a568ef500640f5147fffac0871/android-ndk-12591196-linux-x86_64.zip?GoogleAccessId=gcs-sign%40android-builds-project.google.com.iam.gserviceaccount.com&Expires=1730528306&Signature=S6ms6JUpSo9q3rl%2FhSHHgW19FKWBwJd9LbDtbAC5HPQ52rYEXp4m%2FXt7xuk5cgOf3CGRCdQGqn9hyE7T3rPhyVqsWzATodEu%2BxTJ7WrAYq7o9o3DSjvFkwwbd4Zq2ShePkokzthnQkaYl5uC9T8Pz8jHvOg6lfaaMknROqgs4SdqNSQS7IZZq30tfrSZaMrLTe75SOpOEaIxXVglanjAdzK3SD6n7pcPAN5dJ7ZL11GbXk4t7Pv9%2BjwvKi52oq2xjl17Yv7KN4UsuC8ydbnSXHIh4AX%2FST4V8HOaFM2mmwkRHDP3XSHrOk5R0S7wCY%2BI%2BgLyMnuLWxFEDoPse7YmMg%3D%3D&response-content-disposition=attachment" @cachingArgs
+    & "./vcpkg" x-download android-ndk-$override_ndk-linux.zip "--sha512=$override_ndk_sha512" "--url=$override_ndk_url" @cachingArgs
     Write-Host "Unpacking"
     & unzip -q android-ndk-$override_ndk-linux.zip
     $env:ANDROID_NDK_HOME = Join-Path $Pwd "android-ndk-$override_ndk"

From 4488e8896f792837def11b1af5c578e8919ce20b Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 8 Nov 2024 05:49:52 +0100
Subject: [PATCH 6/9] [libpq] Rename pthread polyfill

---
 ports/libpq/portfile.cmake               |  1 +
 ports/libpq/rename-pthread-polyfill.diff | 13 +++++++++++++
 ports/libpq/vcpkg.json                   |  1 +
 versions/baseline.json                   |  2 +-
 versions/l-/libpq.json                   |  5 +++++
 5 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 ports/libpq/rename-pthread-polyfill.diff

diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 35c436a89f8e34..ae2326e96992b7 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -20,6 +20,7 @@ vcpkg_extract_source_archive(
         windows/msbuild.patch
         windows/spin_delay.patch
         android/unversioned_so.patch
+        rename-pthread-polyfill.diff
 )
 
 file(GLOB _py3_include_path "${CURRENT_HOST_INSTALLED_DIR}/include/python3*")
diff --git a/ports/libpq/rename-pthread-polyfill.diff b/ports/libpq/rename-pthread-polyfill.diff
new file mode 100644
index 00000000000000..025a48f8bc96b2
--- /dev/null
+++ b/ports/libpq/rename-pthread-polyfill.diff
@@ -0,0 +1,13 @@
+diff --git a/src/include/port/pg_pthread.h b/src/include/port/pg_pthread.h
+index d102ce9..9adb1d0 100644
+--- a/src/include/port/pg_pthread.h
++++ b/src/include/port/pg_pthread.h
+@@ -21,6 +21,8 @@
+ #define PTHREAD_BARRIER_SERIAL_THREAD (-1)
+ #endif
+ 
++#define pthread_barrier_t pg_pthread_barrier_t
++
+ typedef struct pg_pthread_barrier
+ {
+ 	bool		sense;			/* we only need a one bit phase */
diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json
index 7fbbd7716a9e9a..9905533e51c95d 100644
--- a/ports/libpq/vcpkg.json
+++ b/ports/libpq/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "libpq",
   "version": "16.4",
+  "port-version": 1,
   "description": "The official database access API of postgresql",
   "homepage": "https://www.postgresql.org/",
   "license": "PostgreSQL",
diff --git a/versions/baseline.json b/versions/baseline.json
index f195e362d5bdbf..19db049ff0b7a0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4942,7 +4942,7 @@
     },
     "libpq": {
       "baseline": "16.4",
-      "port-version": 0
+      "port-version": 1
     },
     "libpqxx": {
       "baseline": "7.9.2",
diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json
index 72e2dc2919d5c0..2cd189fd925338 100644
--- a/versions/l-/libpq.json
+++ b/versions/l-/libpq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "804532b695717e46f5fce56f9495d632849d23fb",
+      "version": "16.4",
+      "port-version": 1
+    },
     {
       "git-tree": "dcaa1ec8552b8ef987d6d80f708b8828bcd795eb",
       "version": "16.4",

From 6ee317cdc6df57c3f08223c247bfa07b124b520b Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 8 Nov 2024 20:57:29 +0100
Subject: [PATCH 7/9] [argtable2] Fix EOVERFLOW clash

---
 ports/argtable2/portfile.cmake       |  1 +
 ports/argtable2/undef-eoverflow.diff | 14 ++++++++++++++
 ports/argtable2/vcpkg.json           |  2 +-
 versions/a-/argtable2.json           |  5 +++++
 versions/baseline.json               |  2 +-
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 ports/argtable2/undef-eoverflow.diff

diff --git a/ports/argtable2/portfile.cmake b/ports/argtable2/portfile.cmake
index 9fc7186e3c0232..c3dfa8f1fea9d3 100644
--- a/ports/argtable2/portfile.cmake
+++ b/ports/argtable2/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_sourceforge(
         0001-fix-install-dirs.patch
         0002-include-correct-headers.patch
         0003-add-dependence-getopt.patch
+        undef-eoverflow.diff
 )
 
 set(HAVE_GETOPT_H "")
diff --git a/ports/argtable2/undef-eoverflow.diff b/ports/argtable2/undef-eoverflow.diff
new file mode 100644
index 00000000000000..a12b5dfb91b7fa
--- /dev/null
+++ b/ports/argtable2/undef-eoverflow.diff
@@ -0,0 +1,14 @@
+diff --git a/src/arg_int.c b/src/arg_int.c
+index bc10012..ffcd408 100644
+--- a/src/arg_int.c
++++ b/src/arg_int.c
+@@ -33,6 +33,9 @@ USA.
+ #include <ctype.h>
+ 
+ /* local error codes */
++#ifdef EOVERFLOW
++#undef EOVERFLOW
++#endif
+ enum {EMINCOUNT=1,EMAXCOUNT,EBADINT,EOVERFLOW};
+ 
+ static void resetfn(struct arg_int *parent)
diff --git a/ports/argtable2/vcpkg.json b/ports/argtable2/vcpkg.json
index 4d87c74c328868..6d1a52520dd785 100644
--- a/ports/argtable2/vcpkg.json
+++ b/ports/argtable2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "argtable2",
   "version": "2.13",
-  "port-version": 10,
+  "port-version": 11,
   "description": "Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.",
   "homepage": "http://argtable.sourceforge.net",
   "license": "LGPL-2.0-only",
diff --git a/versions/a-/argtable2.json b/versions/a-/argtable2.json
index d30fba4471fd69..e93cc11f1a2437 100644
--- a/versions/a-/argtable2.json
+++ b/versions/a-/argtable2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cd58801d3074f08b7d3145cd25d63ad72cbdbf6b",
+      "version": "2.13",
+      "port-version": 11
+    },
     {
       "git-tree": "931507f46135a9267c3d15ed5064235aac6154f4",
       "version": "2.13",
diff --git a/versions/baseline.json b/versions/baseline.json
index 19db049ff0b7a0..9cb026ef015a8e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -218,7 +218,7 @@
     },
     "argtable2": {
       "baseline": "2.13",
-      "port-version": 10
+      "port-version": 11
     },
     "argtable3": {
       "baseline": "3.2.2.f25c624",

From 774020d5b1d16eb5dd0249e4792ca4417bbe49fd Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 8 Nov 2024 21:19:32 +0100
Subject: [PATCH 8/9] [hidapi] Rename pthread polyfill

---
 ports/hidapi/portfile.cmake               |  2 ++
 ports/hidapi/rename-pthread-polyfill.diff | 12 ++++++++++++
 ports/hidapi/vcpkg.json                   |  2 +-
 versions/baseline.json                    |  2 +-
 versions/h-/hidapi.json                   |  5 +++++
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 ports/hidapi/rename-pthread-polyfill.diff

diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake
index 729d2088ba7620..de933c2e93bbfc 100644
--- a/ports/hidapi/portfile.cmake
+++ b/ports/hidapi/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF hidapi-${VERSION}
     SHA512 66a045144f90b41438898b82f0398e80223323ebfe6e4f197d2713696bb3ae60f36aea5a37a9999b34b12294783fd7e4c28c6e785462559cbe21276009da1eac
     HEAD_REF master
+    PATCHES
+        rename-pthread-polyfill.diff
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/hidapi/rename-pthread-polyfill.diff b/ports/hidapi/rename-pthread-polyfill.diff
new file mode 100644
index 00000000000000..b7dd7916051f2e
--- /dev/null
+++ b/ports/hidapi/rename-pthread-polyfill.diff
@@ -0,0 +1,12 @@
+diff --git a/libusb/hid.c b/libusb/hid.c
+index 188e536..910966e 100644
+--- a/libusb/hid.c
++++ b/libusb/hid.c
+@@ -53,6 +53,7 @@
+ 
+ #if defined(__ANDROID__) && __ANDROID_API__ < __ANDROID_API_N__
+ 
++#define pthread_barrier_t hidapi_pthread_barrier_t
+ /* Barrier implementation because Android/Bionic don't have pthread_barrier.
+    This implementation came from Brent Priddy and was posted on
+    StackOverflow. It is used with his permission. */
diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json
index a23064c2ad9b05..971d664423e86b 100644
--- a/ports/hidapi/vcpkg.json
+++ b/ports/hidapi/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "hidapi",
   "version-semver": "0.14.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.",
   "homepage": "https://github.com/libusb/hidapi",
   "license": "BSD-3-Clause-Clear",
diff --git a/versions/baseline.json b/versions/baseline.json
index 9cb026ef015a8e..4818ab073485b3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3466,7 +3466,7 @@
     },
     "hidapi": {
       "baseline": "0.14.0",
-      "port-version": 1
+      "port-version": 2
     },
     "highfive": {
       "baseline": "2.10.0",
diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json
index 10bbefae606b2a..58650ab6e80044 100644
--- a/versions/h-/hidapi.json
+++ b/versions/h-/hidapi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3a032b90b0b2b6fa14a7335a15d9f55e1a151702",
+      "version-semver": "0.14.0",
+      "port-version": 2
+    },
     {
       "git-tree": "92cd0a67a5ca42dd33ec36fb8d9a41b24b5b1909",
       "version-semver": "0.14.0",

From 419f22c6a61f01e949e08dc685aafc7359f431e9 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 8 Nov 2024 22:05:59 +0100
Subject: [PATCH 9/9] Backport NDK inline fix

---
 scripts/azure-pipelines/test-modified-ports.ps1 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1
index bc2b411ba2ca73..5e8cbc21908d1a 100755
--- a/scripts/azure-pipelines/test-modified-ports.ps1
+++ b/scripts/azure-pipelines/test-modified-ports.ps1
@@ -131,6 +131,12 @@ if ($IsLinux -and $Triplet -match 'android' -and $true)
     & unzip -q android-ndk-$override_ndk-linux.zip
     $env:ANDROID_NDK_HOME = Join-Path $Pwd "android-ndk-$override_ndk"
     $NoParentHashes = $true
+
+    # https://android-review.googlesource.com/c/platform/bionic/+/3343442/1/libc/include/ctype.h
+    $ndk_ctype_path = "$env:ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/ctype.h"
+    $ndk_ctype = Get-Content $ndk_ctype_path -Raw
+    $ndk_ctype = $ndk_ctype.Replace('static inline int __bionic_ctype_in_range', '__BIONIC_CTYPE_INLINE int __bionic_ctype_in_range')
+    Set-Content -Path $ndk_ctype_path -Value $ndk_ctype
 }
 
 & "./vcpkg$executableExtension" x-ci-clean @commonArgs