cmake: update to 3.28.4

msys2 · Mar 20, 2024 · cfc98ce · cfc98ce
1 parent 27cf748
commit cfc98ce
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/mingw-w64-cmake/PKGBUILD b/mingw-w64-cmake/PKGBUILD
@@ -11,10 +11,10 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
            "${MINGW_PACKAGE_PREFIX}-${_realname}-cmcldeps" \
            "${MINGW_PACKAGE_PREFIX}-${_realname}-gui" \
            "${MINGW_PACKAGE_PREFIX}-${_realname}-docs"))
-pkgver=3.28.3
+pkgver=3.28.4
 _rc=""
 _pkgver=${pkgver}${_rc}
-pkgrel=2
+pkgrel=1
 pkgdesc="A cross-platform open-source make system (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -34,10 +34,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-xz"
              "${MINGW_PACKAGE_PREFIX}-zstd"
              $([[ ${CARCH} == i686 ]] || echo \
+               "${MINGW_PACKAGE_PREFIX}-emacs" \
+               "${MINGW_PACKAGE_PREFIX}-fc" \
                "${MINGW_PACKAGE_PREFIX}-qt6-base" \
-               "${MINGW_PACKAGE_PREFIX}-qt6-tools")
-             $([[ ${CARCH} != x86_64 ]] || echo "${MINGW_PACKAGE_PREFIX}-emacs")
-             $([[ ${CARCH} == i686 ]] || echo "${MINGW_PACKAGE_PREFIX}-fc"))
+               "${MINGW_PACKAGE_PREFIX}-qt6-tools"))
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-pkgconf"
          "${MINGW_PACKAGE_PREFIX}-curl"
@@ -54,7 +54,7 @@ source=("https://github.com/Kitware/CMake/releases/download/v${_pkgver}/${_realn
         "0003-Support-OBJC-and-OBJCXX-on-MinGW-w64.patch"
         "0004-Output-line-numbers-in-callstacks.patch"
         "0005-Default-to-ninja-generator.patch")
-sha256sums=('72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1'
+sha256sums=('eb9c787e078848dc493f4f83f8a4bbec857cd1f38ab6425ce8d2776a9f6aa6fb'
             '25793edcbac05bb6d17fa9947b52ace4a6b5ccccf7758e22ae9ae022ed089061'
             'f6cf6a6f2729db2b9427679acd09520af2cd79fc26900b19a49cead05a55cd1a'
             '4178ae7889667a8160ebfbd6ffec380b91e8649fa44d39baa7b92744422f98a7'
@@ -166,7 +166,7 @@ check() {
 }
 
 package_cmake() {
-  if [[ ${CARCH} == x86_64 ]]; then
+  if [[ ${CARCH} != i686 ]]; then
     optdepends=("${MINGW_PACKAGE_PREFIX}-emacs: for cmake emacs mode")
   fi
 
@@ -183,7 +183,7 @@ package_cmake() {
     DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install . --component Unspecified
   fi
 
-  if [[ ${CARCH} == x86_64 ]]; then
+  if [[ ${CARCH} != i686 ]]; then
     install -d "${pkgdir}${MINGW_PREFIX}"/share/emacs/site-lisp/
     ${MINGW_PREFIX}/bin/emacs -batch -f batch-byte-compile \
       "${pkgdir}${MINGW_PREFIX}"/share/emacs/site-lisp/cmake-mode.el