diff --git a/mingw-w64-lammps/003-fix-install-dll.patch b/mingw-w64-lammps/003-fix-install-dll.patch deleted file mode 100644 index 48d2b47325..0000000000 --- a/mingw-w64-lammps/003-fix-install-dll.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -805,7 +805,7 @@ - set(LAMMPS_API_DEFINES "${LAMMPS_API_DEFINES} -D${_DEF}") - endforeach() - if(BUILD_SHARED_LIBS) -- install(TARGETS lammps EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(TARGETS lammps EXPORT LAMMPS_Targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(NOT BUILD_MPI) - install(TARGETS mpi_stubs EXPORT LAMMPS_Targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() diff --git a/mingw-w64-lammps/PKGBUILD b/mingw-w64-lammps/PKGBUILD index 6263466b6d..4cc3d04679 100644 --- a/mingw-w64-lammps/PKGBUILD +++ b/mingw-w64-lammps/PKGBUILD @@ -3,12 +3,14 @@ _realname=lammps pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=20240829.2 -_tag=stable_${pkgver:6:2}$(i=${pkgver:4:2}; LC_ALL=C date -d ${i}/01 +%b)${pkgver:0:4} +pkgver=20250722 +_pkgver=${pkgver:6:2}$(i=${pkgver:4:2}; LC_ALL=C date -d ${i}/01 +%b)${pkgver:0:4} if [[ ${pkgver:9} != "" ]]; then - _tag=${_tag}_update${pkgver:9} + _tag=stable_${_pkgver}_update${pkgver:9} +else + _tag=stable_${_pkgver} fi -pkgrel=2 +pkgrel=1 pkgdesc="Large-scale Atomic/Molecular Massively Parallel Simulator. (mingw-w64)" arch=('any') mingw_arch=('ucrt64' 'clang64' 'clangarm64') @@ -36,17 +38,15 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" #"${MINGW_PACKAGE_PREFIX}-msmpi") optdepends=("${MINGW_PACKAGE_PREFIX}-ffmpeg: Support generating movies" "${MINGW_PACKAGE_PREFIX}-qt6-charts: For lammps-gui") -source=("https://github.com/lammps/lammps/archive/${_tag}/${_realname}-${pkgver}.tar.gz" +source=("https://github.com/lammps/lammps/releases/download/${_tag}/lammps-src-${_pkgver}.tar.gz" "001-undef-ABSOLUTE.patch" "002-fix-pkgconfig-file.patch" - "003-fix-install-dll.patch" "004-fix-executables-extension.patch") -sha256sums=('f8ca3f021a819ced8658055f7750e235c51b4937ddb621cf1bd7bee08e0b6266' +sha256sums=('5f5df1535065ffc0c7229a31f32f7f68ffd8deb31e7bd8f3770413890c46ad57' '2ab7d4e2158b953f1694ec955d993c461f151c4a6bded8edb576689d72b210a7' '320df126e7ca5a0c85eed2ca762e5a48a2c22c656571c0f054c514a0a7067c43' - 'b976476424badf991fc984df45780bf1a5ce2b01701626222d1c47bb34f3a705' '50ed7acd3e81a4af0e529e2c9d56a00e591feec44ff080ef177da0dfdf9081ec') -noextract=("${_realname}-${pkgver}.tar.gz") +noextract=("lammps-src-${_pkgver}.tar.gz") apply_patch_with_msg() { for _patch in "$@" @@ -57,15 +57,14 @@ apply_patch_with_msg() { } prepare() { - echo "Extracting ${_realname}-${pkgver}.tar.gz..." - tar -xzf ${_realname}-${pkgver}.tar.gz || true + echo "Extracting lammps-src-${_pkgver}.tar.gz..." + tar -xzf lammps-src-${_pkgver}.tar.gz || true - cd "${srcdir}"/${_realname}-${_tag} + cd "${srcdir}"/${_realname}-${_pkgver} apply_patch_with_msg \ 001-undef-ABSOLUTE.patch \ 002-fix-pkgconfig-file.patch \ - 003-fix-install-dll.patch \ 004-fix-executables-extension.patch } @@ -98,7 +97,7 @@ build() { -DFFT=FFTW3 \ -DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \ -DENABLE_TESTING=OFF \ - -S "${_realname}-${_tag}"/cmake \ + -S "${_realname}-${_pkgver}"/cmake \ -B "build-${MSYSTEM}" "${MINGW_PREFIX}"/bin/cmake.exe --build "build-${MSYSTEM}" @@ -109,6 +108,6 @@ package() { cp build-${MSYSTEM}/lammps-gui.exe "${pkgdir}"${MINGW_PREFIX}/bin/ - install -Dm644 "${srcdir}"/${_realname}-${_tag}/LICENSE \ + install -Dm644 "${srcdir}"/${_realname}-${_pkgver}/LICENSE \ "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }