From 7a8cad313223790ef594394d59fcf3e02f10b20f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= <mati865@gmail.com>
Date: Sun, 8 Dec 2024 18:30:59 +0100
Subject: [PATCH] helix: fix build on clang envs

---
 mingw-w64-helix/PKGBUILD                      | 11 ++++-
 .../disable-vendoring-and-bump-cc.patch       | 44 +++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 mingw-w64-helix/disable-vendoring-and-bump-cc.patch

diff --git a/mingw-w64-helix/PKGBUILD b/mingw-w64-helix/PKGBUILD
index d8ee6cd8682b3..42082bfdeba68 100644
--- a/mingw-w64-helix/PKGBUILD
+++ b/mingw-w64-helix/PKGBUILD
@@ -19,11 +19,13 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-rust-analyzer: Rust LSP"
             "${MINGW_PACKAGE_PREFIX}-lldb: for lldb-dap")
 source=("$url/archive/$pkgver/${_realname}-${pkgver}.tar.gz"
         'icon.patch'
-        'fix-runtime-dir.patch')
+        'fix-runtime-dir.patch'
+        'disable-vendoring-and-bump-cc.patch')
 noextract=("${_realname}-${pkgver}.tar.gz")
 sha256sums=('0f466ed2de039a7eca6faf29fc0db712c92e1a59d0bdc7e8916c717ceee8b3b3'
             'f45f0656cb1ceb5c90925c80b093335622f9ad3f64d4e2c8a3a0ea0ab43d900e'
-            'f071538f25e12ca0898c61daa3a2fbf9416a5be4f014682942dcf34dfb0f1335')
+            'f071538f25e12ca0898c61daa3a2fbf9416a5be4f014682942dcf34dfb0f1335'
+            '6a0a2ee91f7a81959a732561ff5899e113e29ca3085121fda1c559d815a4616b')
 
 prepare() {
   tar xf "${_realname}-${pkgver}.tar.gz" \
@@ -53,6 +55,11 @@ END
 
   patch -Np1 -i ../icon.patch
   patch -Np1 -i ../fix-runtime-dir.patch
+
+  # pull in https://github.com/rust-lang/cc-rs/pull/1176
+  if [[ "${MSYSTEM}" == *"CLANG"* ]]; then
+    patch -Np1 -i ../disable-vendoring-and-bump-cc.patch
+  fi
 }
 
 build() {
diff --git a/mingw-w64-helix/disable-vendoring-and-bump-cc.patch b/mingw-w64-helix/disable-vendoring-and-bump-cc.patch
new file mode 100644
index 0000000000000..2045fb300ba7b
--- /dev/null
+++ b/mingw-w64-helix/disable-vendoring-and-bump-cc.patch
@@ -0,0 +1,44 @@
+diff -ruN helix-24.07.orig/.cargo/config.toml helix-24.07/.cargo/config.toml
+--- helix-24.07.orig/.cargo/config.toml	2024-12-08 18:03:22.524729200 +0100
++++ helix-24.07/.cargo/config.toml	2024-12-08 18:17:52.970280500 +0100
+@@ -14,9 +14,3 @@
+ [alias]
+ xtask = "run --package xtask --"
+ integration-test = "test --features integration --profile integration --workspace --test integration"
+-
+-[source.crates-io]
+-replace-with = "vendored-sources"
+-
+-[source.vendored-sources]
+-directory = "vendor"
+diff -ruN helix-24.07.orig/Cargo.lock helix-24.07/Cargo.lock
+--- helix-24.07.orig/Cargo.lock	2024-12-08 18:03:29.415843800 +0100
++++ helix-24.07/Cargo.lock	2024-12-08 18:17:06.038135300 +0100
+@@ -136,9 +136,12 @@
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.106"
++version = "1.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2"
++checksum = "27f657647bcff5394bf56c7317665bbf790a137a50eaaa5c6bfbb9e27a518f2d"
++dependencies = [
++ "shlex",
++]
+ 
+ [[package]]
+ name = "cfg-if"
+@@ -2181,6 +2184,12 @@
+ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+ 
+ [[package]]
++name = "shlex"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
++
++[[package]]
+ name = "signal-hook"
+ version = "0.3.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"