helix: update to 25.01

mingw-w64-helix/PKGBUILD

@@ -3,91 +3,58 @@
 _realname=helix
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=24.07
-pkgrel=5
+pkgver=25.01
+pkgrel=1
 pkgdesc="A post-modern modal text editor (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/helix-editor/helix"
 license=('spdx:MPL-2.0')
 makedepends=("${MINGW_PACKAGE_PREFIX}-rust"
              "${MINGW_PACKAGE_PREFIX}-mdbook"
-             "git")
+             'git')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 optdepends=("${MINGW_PACKAGE_PREFIX}-rust-analyzer: Rust LSP"
             "${MINGW_PACKAGE_PREFIX}-clang-tools-extra: for clangd"
             "${MINGW_PACKAGE_PREFIX}-lldb: for lldb-dap")
-source=("$url/archive/$pkgver/${_realname}-${pkgver}.tar.gz"
+source=("${url}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
         'icon.patch'
-        'fix-runtime-dir.patch'
-        'disable-vendoring-and-bump-cc.patch')
+        'fix-runtime-dir.patch')
 noextract=("${_realname}-${pkgver}.tar.gz")
-sha256sums=('0f466ed2de039a7eca6faf29fc0db712c92e1a59d0bdc7e8916c717ceee8b3b3'
+sha256sums=('3d23d45adefe2daba877b05921e99d205683528814acb6a0d549a62b0f633548'
             'f45f0656cb1ceb5c90925c80b093335622f9ad3f64d4e2c8a3a0ea0ab43d900e'
-            'f071538f25e12ca0898c61daa3a2fbf9416a5be4f014682942dcf34dfb0f1335'
-            '6a0a2ee91f7a81959a732561ff5899e113e29ca3085121fda1c559d815a4616b')
+            '42a2f6bb28ee9d21459e3925be1e91cea21f3ceba9d6b730055ff0aa62d5fece')
 
 prepare() {
-  tar xf "${_realname}-${pkgver}.tar.gz" \
-    --exclude=contrib/themes
-
+  tar xf "${_realname}-${pkgver}.tar.gz" --exclude=contrib/themes
   cd "${_realname}-${pkgver}"
-  cp -a "runtime/themes" "contrib/themes"
-
-  cargo vendor \
-    --locked \
-    --versioned-dirs
-
-  mkdir -p .cargo
-  cat >> .cargo/config.toml <<END
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
-END
 
-
-  sed -i -e 's/"cfg(all(target_arch = \\"\([^\\]\+\)\\", target_env = \\"gnu\\", target_abi = \\"llvm\\", not(windows_raw_dylib)))"/"\1-pc-windows-gnullvm"/g' \
-    "vendor/windows-targets-0.48.0/Cargo.toml"
-  sed -i -e 's/\("Cargo.toml":\)"[^"]\+"/\1"'"$(sha256sum "vendor/windows-targets-0.48.0/Cargo.toml" | cut -d' ' -f1)"'"/' \
-    "vendor/windows-targets-0.48.0/.cargo-checksum.json"
+  cp -a "runtime/themes" "contrib/themes"
 
   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
+  cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
 }
 
 build() {
-  rm -rf "build-${MSYSTEM}"
-  cp -r "${_realname}-${pkgver}" "build-${MSYSTEM}"
-  cd "build-${MSYSTEM}"
+  cd "${_realname}-${pkgver}"
 
-  CXXFLAGS+=" -Wno-implicit-int"
-  cargo build \
-    --locked \
-    --release
+  cargo build --frozen --release
 
-  msg "Build documentation"
   cd book
 
   mdbook build
 }
 
 check() {
-  cd "${srcdir}/build-${MSYSTEM}"
+  cd "${_realname}-${pkgver}"
 
-  cargo test \
-    --locked \
-    --release
+  cargo test --frozen --release
 }
 
 package() {
-  cd "${srcdir}/build-${MSYSTEM}"
+  cd "${_realname}-${pkgver}"
 
   install -Dm755 "target/release/hx.exe" "${pkgdir}${MINGW_PREFIX}/bin/hx.exe"
 

mingw-w64-helix/fix-runtime-dir.patch

@@ -1,13 +1,13 @@
 diff --git a/helix-loader/src/lib.rs b/helix-loader/src/lib.rs
-index 0e7c134..e3bbdd8 100644
+index 0e7c134d..2b2f0728 100644
 --- a/helix-loader/src/lib.rs
 +++ b/helix-loader/src/lib.rs
-@@ -70,7 +70,7 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
-     let exe_rt_dir = std::env::current_exe()
-         .ok()
-         .and_then(|path| std::fs::canonicalize(path).ok())
--        .and_then(|path| path.parent().map(|path| path.to_path_buf().join(RT_DIR)))
-+        .and_then(|path| path.parent().map(|path| path.to_path_buf().join("../lib/helix/runtime")))
-         .unwrap();
-     rt_dirs.push(exe_rt_dir);
-     rt_dirs
+@@ -39,7 +39,7 @@ pub fn initialize_log_file(specified_file: Option<PathBuf>) {
+ ///
+ /// Postcondition: returns at least two paths (they might not exist).
+ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
+-    const RT_DIR: &str = "runtime";
++    const RT_DIR: &str = "../lib/helix/runtime";
+     // Adding higher priority first
+     let mut rt_dirs = Vec::new();
+     if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {