diff --git a/mingw-w64-cvise/002-make-relocatable.patch b/mingw-w64-cvise/002-make-relocatable.patch index 635426375b..33dac3ac57 100644 --- a/mingw-w64-cvise/002-make-relocatable.patch +++ b/mingw-w64-cvise/002-make-relocatable.patch @@ -1,6 +1,6 @@ ---- cvise-2.11.0/cvise.py.orig 2024-11-10 10:58:12.000000000 +0100 -+++ cvise-2.11.0/cvise.py 2025-05-12 08:28:14.438651100 +0200 -@@ -17,7 +17,7 @@ +--- a/cvise.py ++++ b/cvise.py +@@ -15,7 +15,7 @@ # add the known install location to the path destdir = os.getenv('DESTDIR', '') if importlib.util.find_spec('cvise') is None: @@ -9,7 +9,7 @@ sys.path.append(destdir + '@CMAKE_INSTALL_FULL_DATADIR@') import chardet # noqa: E402 -@@ -44,7 +44,7 @@ +@@ -43,7 +43,7 @@ def get_share_dir(): # Test all known locations for the cvise directory share_dirs = [ @@ -18,7 +18,9 @@ destdir + os.path.join('@CMAKE_INSTALL_FULL_DATADIR@', '@cvise_PACKAGE@'), os.path.join(script_path, 'cvise'), ] -@@ -79,7 +79,7 @@ +--- a/cvise/utils/externalprograms.py ++++ b/cvise/utils/externalprograms.py +@@ -29,7 +29,7 @@ path = shutil.which(prog, path=local_folder) if not path: @@ -26,8 +28,8 @@ + search = os.path.join(sys.prefix, 'lib', '@cvise_PACKAGE@') path = shutil.which(prog, path=search) if not path: - search = destdir + os.path.join('@CMAKE_INSTALL_FULL_LIBEXECDIR@', '@cvise_PACKAGE@') -@@ -92,7 +92,7 @@ + search = DESTDIR + os.path.join('@CMAKE_INSTALL_FULL_LIBEXECDIR@', '@cvise_PACKAGE@') +@@ -42,6 +42,6 @@ programs[prog] = path # Special case for clang-format @@ -35,4 +37,3 @@ + programs['clang-format'] = shutil.which(os.path.basename('@CLANG_FORMAT_PATH@')) return programs - diff --git a/mingw-w64-cvise/PKGBUILD b/mingw-w64-cvise/PKGBUILD index 6981b7de6f..da0acd7c15 100644 --- a/mingw-w64-cvise/PKGBUILD +++ b/mingw-w64-cvise/PKGBUILD @@ -3,8 +3,8 @@ _realname=cvise pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.11.0 -pkgrel=7 +pkgver=2.12.0 +pkgrel=1 pkgdesc="Super-parallel Python port of the C-Reduce (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -34,14 +34,12 @@ makedepends=( checkdepends=("${MINGW_PACKAGE_PREFIX}-python-pytest") optdepends=("colordiff") source=("https://github.com/marxin/cvise/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz" - "001-fix-build-with-llvm-20.patch::https://github.com/marxin/cvise/commit/29fc072f.patch" "002-make-relocatable.patch" "003-fix-cvise-delta.patch" "004-add-basic-bash-support.patch" "005-fix-build-with-llvm-21.patch::https://github.com/marxin/cvise/commit/68262f7d.patch") -sha256sums=('7e3e473843aa79afb98f581d2e100efa47db80df3a961565b691d7b4a4ebd14b' - '99271cc615968178fc6edefb3cd50656bf513b2e7a6294f104fa5536d0b8a6ae' - 'a0ecb4e04bc2315f62545c2b001ed4e9c8c4d74a5f31dfae3319ac05bc76e5c8' +sha256sums=('7eb3b2ec4e64e3033cb47e35363336f50b1313a34a106609ad1110c532389779' + 'b37883a30063e45f29b41425a660014aaf302578202df6bf0b293ec9afe1ffb0' '2544e65b5100f72961066e314d0ee0ccded1241e2c48c0d85e8157c932a6966b' 'f2ad4266b9d3d43c44320725f97f4b6f94172a77dd2e38917ada20ffc25dc637' 'd12cde7a8e7327df06db7adfb4c52f623c758048ede8ff77b9ec504c41ce1e4a') @@ -57,7 +55,6 @@ apply_patch_with_msg() { prepare() { cd ${_realname}-${pkgver} apply_patch_with_msg \ - 001-fix-build-with-llvm-20.patch \ 002-make-relocatable.patch \ 003-fix-cvise-delta.patch \ 004-add-basic-bash-support.patch \