From 17ae406223bc0620a2e9a4b21f8e4c3df48bd9f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Fri, 3 May 2024 09:05:51 +0100
Subject: [PATCH] Revert rebuilding HDF5 dependent packages

---
 mingw-w64-adios2/PKGBUILD      | 13 +++++++------
 mingw-w64-alembic/PKGBUILD     | 12 ++++++------
 mingw-w64-armadillo/PKGBUILD   | 14 ++++----------
 mingw-w64-cgns/PKGBUILD        |  3 +--
 mingw-w64-highfive/PKGBUILD    | 17 ++++++-----------
 mingw-w64-itk/PKGBUILD         |  2 +-
 mingw-w64-libexodus/PKGBUILD   | 16 +++++++---------
 mingw-w64-mathgl/PKGBUILD      |  6 +++---
 mingw-w64-matio/PKGBUILD       | 12 +++++++-----
 mingw-w64-med/PKGBUILD         | 19 ++++++++++---------
 mingw-w64-netcdf-cxx/PKGBUILD  |  7 +++----
 mingw-w64-netcdf/PKGBUILD      |  5 ++---
 mingw-w64-octave/PKGBUILD      |  2 +-
 mingw-w64-opencv/PKGBUILD      |  2 +-
 mingw-w64-openturns/PKGBUILD   |  2 +-
 mingw-w64-paraview/PKGBUILD    |  3 +--
 mingw-w64-pdal/PKGBUILD        |  2 +-
 mingw-w64-python-h5py/PKGBUILD |  2 +-
 mingw-w64-qgis/PKGBUILD        |  2 +-
 mingw-w64-seacas/PKGBUILD      | 15 +++++++--------
 mingw-w64-starpu/PKGBUILD      |  2 +-
 mingw-w64-trilinos/PKGBUILD    | 12 +++++-------
 mingw-w64-vigra/PKGBUILD       |  5 ++---
 mingw-w64-vtk/PKGBUILD         |  2 +-
 24 files changed, 80 insertions(+), 97 deletions(-)

diff --git a/mingw-w64-adios2/PKGBUILD b/mingw-w64-adios2/PKGBUILD
index 1996508d47cc8..6572309036a9e 100644
--- a/mingw-w64-adios2/PKGBUILD
+++ b/mingw-w64-adios2/PKGBUILD
@@ -4,15 +4,15 @@ _realname=ADIOS2
 pkgbase=mingw-w64-${_realname,,}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname,,}")
 pkgver=2.9.2
-pkgrel=2
+pkgrel=1
 pkgdesc="The Adaptable Input/Output System version 2 (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://adios2.readthedocs.io/en/latest/"
-msys2_repository_url="https://github.com/ornladios/ADIOS2/"
 msys2_references=(
   'archlinux: adios2'
 )
+msys2_repository_url="https://github.com/ornladios/ADIOS2/"
+url="https://adios2.readthedocs.io/en/latest/"
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-blosc2"
          "${MINGW_PACKAGE_PREFIX}-bzip2"
@@ -62,13 +62,14 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  LDFLAGS+=" -Wl,--export-all-symbols" \
-  CXXFLAGS+=" -Wno-narrowing" \
+  LDFLAGS+=" -Wl,--export-all-symbols"
+  CXXFLAGS+=" -Wno-narrowing"
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    "${extra_config[@]}" \
+    ${extra_config[@]} \
     -DCMAKE_C_FLAGS=-Duint="\"unsigned int\"" \
     -DBUILD_SHARED_LIBS=ON \
     -DADIOS2_USE_EXTERNAL_DEPENDENCIES=ON \
diff --git a/mingw-w64-alembic/PKGBUILD b/mingw-w64-alembic/PKGBUILD
index 3eef90d00a801..e95741b4b010e 100644
--- a/mingw-w64-alembic/PKGBUILD
+++ b/mingw-w64-alembic/PKGBUILD
@@ -4,21 +4,21 @@ _realname=alembic
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.8.5
-pkgrel=2
+pkgrel=1
 pkgdesc="A open framework for storing and sharing scene data (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.alembic.io/"
-msys2_repository_url="https://github.com/alembic/alembic"
 license=('spdx:BSD-3-Clause')
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-imath"
-         "${MINGW_PACKAGE_PREFIX}-hdf5")
+depends=("${MINGW_PACKAGE_PREFIX}-imath"
+         "${MINGW_PACKAGE_PREFIX}-boost"
+         "${MINGW_PACKAGE_PREFIX}-hdf5"
+         "${MINGW_PACKAGE_PREFIX}-zlib")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-boost")
-source=("https://github.com/alembic/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz"
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/alembic/${_realname}/archive/${pkgver}.tar.gz"
         "0001-alembic-1.7.9-fix-windows-build.patch"
         "0002-alembic-1.7.9-remove-msc_ver-and-fix-builtins-and-includes.patch")
 sha256sums=('180a12f08d391cd89f021f279dbe3b5423b1db751a9898540c8059a45825c2e9'
diff --git a/mingw-w64-armadillo/PKGBUILD b/mingw-w64-armadillo/PKGBUILD
index 3e688e36d8a2c..ec60f96848af7 100644
--- a/mingw-w64-armadillo/PKGBUILD
+++ b/mingw-w64-armadillo/PKGBUILD
@@ -4,16 +4,17 @@ _realname=armadillo
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=12.6.4
-pkgrel=2
+pkgrel=1
 pkgdesc="Fast C++ matrix library with syntax similar to MATLAB and Octave (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://arma.sourceforge.io/"
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-hdf5"
          "${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-superlu"
-         "${MINGW_PACKAGE_PREFIX}-arpack"
+         $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-i686* ]] || echo "${MINGW_PACKAGE_PREFIX}-arpack")
          )
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
@@ -46,18 +47,11 @@ prepare() {
 build() {
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
-  declare -a _extra_config
-  if check_option "debug" "n"; then
-    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
-  else
-    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
-  fi
-
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   "${MINGW_PREFIX}"/bin/cmake.exe \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-    "${_extra_config[@]}" \
+    -DCMAKE_BUILD_TYPE=Release \
     -DOPENBLAS_PROVIDES_LAPACK=ON \
     ../${_realname}-${pkgver}
 
diff --git a/mingw-w64-cgns/PKGBUILD b/mingw-w64-cgns/PKGBUILD
index b080a8d5140ae..1fc381f981530 100644
--- a/mingw-w64-cgns/PKGBUILD
+++ b/mingw-w64-cgns/PKGBUILD
@@ -4,12 +4,11 @@ _realname=cgns
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.4.0
-pkgrel=2
+pkgrel=1
 pkgdesc="CFD General Notation System library and tools (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://cgns.github.io"
-msys2_repository_url="https://github.com/CGNS/CGNS"
 license=('spdx:Zlib')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
diff --git a/mingw-w64-highfive/PKGBUILD b/mingw-w64-highfive/PKGBUILD
index b1fbc4f06cee1..b3e400d6d16fb 100644
--- a/mingw-w64-highfive/PKGBUILD
+++ b/mingw-w64-highfive/PKGBUILD
@@ -4,7 +4,7 @@ _realname=highfive
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.9.0
-pkgrel=2
+pkgrel=1
 pkgdesc='Modern header-only C++11 friendly interface for libhdf5 (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -29,21 +29,17 @@ source=("https://github.com/BlueBrain/HighFive/archive/v${pkgver}/${_realname}-$
 sha256sums=('6301def8ceb9f4d7a595988612db288b448a3c0546f6c83417dab38c64994d7e')
 
 build() {
-  declare -a _extra_config
-  if check_option "debug" "n"; then
-    _extra_config+=("-DCMAKE_BUILD_TYPE=Release")
-  else
-    _extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
-  fi
+  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   # HIGHFIVE_* options only affect tests (at package-build time),
   # not what is installed
   # (xtensor is not packaged, thus OFF)
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    "${_extra_config[@]}" \
+    -DCMAKE_BUILD_TYPE=Release \
     -DHIGHFIVE_USE_BOOST=ON \
     -DHIGHFIVE_USE_EIGEN=ON \
     -DHIGHFIVE_USE_XTENSOR=OFF \
@@ -52,10 +48,9 @@ build() {
     -DHIGHFIVE_PARALLEL_HDF5=OFF \
     -DHIGHFIVE_BUILD_DOCS=OFF \
     -DCMAKE_RUNTIME_OUTPUT_DIRECTORY="${srcdir}/build-${MSYSTEM}" \
-    -S HighFive-${pkgver} \
-    -B build-${MSYSTEM}
+    -S ../HighFive-${pkgver} -B .
 
-  ${MINGW_PREFIX}/bin/cmake --build build-${MSYSTEM}
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 check() {
diff --git a/mingw-w64-itk/PKGBUILD b/mingw-w64-itk/PKGBUILD
index b13b3b68ad962..c801c3be242c0 100644
--- a/mingw-w64-itk/PKGBUILD
+++ b/mingw-w64-itk/PKGBUILD
@@ -4,7 +4,7 @@ _realname=itk
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=5.3.0
-pkgrel=9
+pkgrel=8
 pkgdesc='An open-source C++ toolkit for medical image processing (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
diff --git a/mingw-w64-libexodus/PKGBUILD b/mingw-w64-libexodus/PKGBUILD
index bfe0bc93a77a2..8545803b0dfbd 100644
--- a/mingw-w64-libexodus/PKGBUILD
+++ b/mingw-w64-libexodus/PKGBUILD
@@ -6,32 +6,30 @@ _releases=2023-02-03
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=8.19
-pkgrel=2
+pkgrel=1
 pkgdesc="EXODUS is a model developed to store and retrieve data for finite element analyses (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
-url="https://sandialabs.github.io/seacas-docs"
-msys2_repository_url="https://github.com/sandialabs/seacas"
-license=('spdx:BSD-3-Clause-Clear')
 conflicts=("${MINGW_PACKAGE_PREFIX}-seacas"
            "${MINGW_PACKAGE_PREFIX}-trilinos")
 depends=($([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
-         "${MINGW_PACKAGE_PREFIX}-hdf5"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
          "${MINGW_PACKAGE_PREFIX}-netcdf")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-fc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=("https://github.com/sandialabs/seacas/archive/v${_releases}/${_realname}-${pkgver}.tar.gz"
+url="https://sandialabs.github.io/seacas-docs"
+license=('BSD')
+source=("https://github.com/sandialabs/seacas/archive/v${_releases}.tar.gz"
         "cmake-fix.patch")
 sha256sums=('8076d8efc064ef261bb64bd1d064088586d9197b94cbfb0bba199a78243ca9e8'
             '3f9f345dd0474e1e5831fc0ae69fe6fe3ab86eb2a90c52f96fd5c2babe05519f')
-noextract=("${_realname}-${pkgver}.tar.gz")
+noextract=("v${_releases}.tar.gz")
 
 prepare() {
-  echo "Extracting ${_realname}-${pkgver}.tar.gz ..."
-  tar -xzf ${_realname}-${pkgver}.tar.gz || true
+  echo "Extracting v${_releases}.tar.gz ..."
+  tar -xzf v${_releases}.tar.gz || true
 
   cd "${srcdir}"/${_realname2}-${_releases}
   sed -i 's:-pedantic::g' cmake-exodus
diff --git a/mingw-w64-mathgl/PKGBUILD b/mingw-w64-mathgl/PKGBUILD
index 5708e9f495e50..287f7578ae641 100644
--- a/mingw-w64-mathgl/PKGBUILD
+++ b/mingw-w64-mathgl/PKGBUILD
@@ -4,7 +4,7 @@ _realname=mathgl
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=8.0.1
-pkgrel=5
+pkgrel=4
 pkgdesc="Library for high-quality scientific graphics (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
@@ -50,8 +50,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G "Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    "${extra_config[@]}" \
-    -DCMAKE_CXX_STANDARD=14 \
+    ${extra_config[@]} \
     -Denable-all-widgets=OFF \
     -Denable-double=ON \
     -Denable-fltk=ON \
@@ -65,6 +64,7 @@ build() {
     -Denable-png=ON \
     -Denable-qt5=ON \
     -Denable-openmp=OFF \
+    -DGLUT_glut_LIBRARY_RELEASE=${MINGW_PREFIX}/lib/libfreeglut.dll.a \
     "../${_realname}-${pkgver}"
 
     # -Denable-pdf=ON
diff --git a/mingw-w64-matio/PKGBUILD b/mingw-w64-matio/PKGBUILD
index b1e7ef67e8b7e..2f953899e41ea 100644
--- a/mingw-w64-matio/PKGBUILD
+++ b/mingw-w64-matio/PKGBUILD
@@ -4,22 +4,21 @@ _realname=matio
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.5.27
-pkgrel=2
+pkgrel=1
 pkgdesc="C library for reading and writing MATLAB MAT files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url='https://sourceforge.net/projects/matio/'
-msys2_repository_url='https://github.com/tbeu/matio/'
 msys2_references=(
   'archlinux: libmatio'
   "cpe: cpe:/a:matio_project:matio"
 )
+msys2_repository_url='https://github.com/tbeu/matio/'
+url='https://sourceforge.net/projects/matio/'
 license=('spdx:BSD-2-Clause')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-hdf5")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-autotools")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
 source=(https://github.com/tbeu/matio/releases/download/v${pkgver}/matio-${pkgver}.tar.gz)
 sha256sums=('0a6aa00b18c4512b63a8d27906b079c8c6ed41d4b2844f7a4ae598e18d22d3b3')
 
@@ -36,6 +35,9 @@ build() {
 
   ./configure \
     --prefix=${MINGW_PREFIX} \
+    --build=${MINGW_CHOST} \
+    --host=${MINGW_CHOST} \
+    --target=${MINGW_CHOST} \
     --enable-shared \
     --with-hdf5
 
diff --git a/mingw-w64-med/PKGBUILD b/mingw-w64-med/PKGBUILD
index ff443930586a0..1ab861de4538f 100644
--- a/mingw-w64-med/PKGBUILD
+++ b/mingw-w64-med/PKGBUILD
@@ -8,7 +8,7 @@ _realname=med
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=4.1.1
-pkgrel=10
+pkgrel=9
 pkgdesc="Generic pre- and post-processing platform for numerical simulation (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -18,13 +18,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-hdf5"
          $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] && echo "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran")
          "${MINGW_PACKAGE_PREFIX}-tk")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-fc"
+             $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* && ${MSYSTEM} != *64 ]] || echo \
+               "${MINGW_PACKAGE_PREFIX}-fc")
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
-source=("https://github.com/chennes/med/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
+source=("http://files.salome-platform.org/Salome/other/${_realname}-${pkgver}.tar.gz"
         "hdf5-1.14.patch"
         "bin-dest.patch")
-sha256sums=('ee8b3b6d46bfee25c1d289308b16c7f248d1339161fd5448339382125e6119ad'
+sha256sums=('dc2b5d54ebf0666e3ff2e974041d2ab0da906061323537023ab165d573389dd0'
             'd2d711adc32083041c85906e84592873b1ab6c54b02670b57678a33edce10fa9'
             '75f078af79b58d41ccc6f4a2ccf1a0ab4aa50365600d279ef2466456a3bfa67f')
 
@@ -39,7 +40,7 @@ apply_patch_with_msg() {
 # =========================================== #
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/${_realname}-${pkgver}_SRC"
   apply_patch_with_msg \
     hdf5-1.14.patch \
     bin-dest.patch
@@ -69,7 +70,7 @@ build() {
     -DMEDFILE_BUILD_PYTHON=OFF \
     -DMEDFILE_BUILD_TESTS=OFF \
     -DMEDFILE_INSTALL_DOC=OFF \
-    ../${_realname}-${pkgver}
+    ../${_realname}-${pkgver}_SRC
   "${MINGW_PREFIX}"/bin/cmake --build .
 
   # Shared Build
@@ -84,7 +85,7 @@ build() {
     -DMEDFILE_BUILD_PYTHON=OFF \
     -DMEDFILE_BUILD_TESTS=OFF \
     -DMEDFILE_INSTALL_DOC=OFF \
-    ../${_realname}-${pkgver}
+    ../${_realname}-${pkgver}_SRC
   "${MINGW_PREFIX}"/bin/cmake --build .
 }
 
@@ -97,6 +98,6 @@ package() {
   cd "${srcdir}/build-${MSYSTEM}-shared"
   DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install .
 
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
-  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LESSER" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LESSER"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}_SRC/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}_SRC/COPYING.LESSER" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LESSER"
 }
diff --git a/mingw-w64-netcdf-cxx/PKGBUILD b/mingw-w64-netcdf-cxx/PKGBUILD
index d02f50c3ce1a2..73defe86a5cf5 100644
--- a/mingw-w64-netcdf-cxx/PKGBUILD
+++ b/mingw-w64-netcdf-cxx/PKGBUILD
@@ -3,15 +3,14 @@ _realname=netcdf-cxx
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=4.3.1
-pkgrel=6
+pkgrel=5
 pkgdesc="NetCDF C++ bindings (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/Unidata/netcdf-cxx4/"
 license=(custom)
 depends=(
-  "${MINGW_PACKAGE_PREFIX}-hdf5"
-  "${MINGW_PACKAGE_PREFIX}-netcdf"
+  "${MINGW_PACKAGE_PREFIX}-netcdf>=4.6.0"
   'sed'     # for ncxx4-config
   )
 makedepends=(
@@ -32,7 +31,7 @@ prepare() {
 }
 
 build() {
-  mkdir -p "build-${MSYSTEM}" && cd "build-${MSYSTEM}"
+  mkdir -p "build-${MSYSTEM}" && cd "build--${MSYSTEM}"
 
   ../${_realname}${pkgver/.*/}-${pkgver}/configure -C \
     --prefix="${MINGW_PREFIX}"
diff --git a/mingw-w64-netcdf/PKGBUILD b/mingw-w64-netcdf/PKGBUILD
index 3a0e5d74fa706..59c62ab219057 100644
--- a/mingw-w64-netcdf/PKGBUILD
+++ b/mingw-w64-netcdf/PKGBUILD
@@ -4,13 +4,12 @@ _realname=netcdf
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=4.9.2
-pkgrel=5
+pkgrel=4
 pkgdesc="Interface for scientific data access to large binary data (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://www.unidata.ucar.edu/software/netcdf/"
-msys2_repository_url="https://github.com/Unidata/netcdf-c"
 license=('spdx:BSD-3-Clause')
+url="https://www.unidata.ucar.edu/software/netcdf/"
 depends=("${MINGW_PACKAGE_PREFIX}-blosc"
          "${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-curl"
diff --git a/mingw-w64-octave/PKGBUILD b/mingw-w64-octave/PKGBUILD
index bab7d1518f360..b80c35fa5b0ad 100644
--- a/mingw-w64-octave/PKGBUILD
+++ b/mingw-w64-octave/PKGBUILD
@@ -4,7 +4,7 @@ _realname=octave
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=9.1.0
-pkgrel=6
+pkgrel=4
 pkgdesc="GNU Octave: Interactive programming environment for numerical computations (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64')
diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD
index d2e9d0110ed32..cf3427eb8af54 100644
--- a/mingw-w64-opencv/PKGBUILD
+++ b/mingw-w64-opencv/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
          "${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 pkgver=4.9.0
-pkgrel=7
+pkgrel=6
 pkgdesc="Open Source Computer Vision Library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
diff --git a/mingw-w64-openturns/PKGBUILD b/mingw-w64-openturns/PKGBUILD
index 35e366a051d5b..ce913de477c07 100644
--- a/mingw-w64-openturns/PKGBUILD
+++ b/mingw-w64-openturns/PKGBUILD
@@ -4,7 +4,7 @@ _realname=openturns
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.22
-pkgrel=4
+pkgrel=3
 pkgdesc="Uncertainty treatment library (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
diff --git a/mingw-w64-paraview/PKGBUILD b/mingw-w64-paraview/PKGBUILD
index 470ee47c690af..187cb635dc78d 100644
--- a/mingw-w64-paraview/PKGBUILD
+++ b/mingw-w64-paraview/PKGBUILD
@@ -4,7 +4,7 @@ _realname=paraview
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=5.12.0
-pkgrel=3
+pkgrel=2
 pkgdesc="Parallel Data Analysis and Visualization Application based on VTK. (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -22,7 +22,6 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-gdal"
          "${MINGW_PACKAGE_PREFIX}-gl2ps"
          "${MINGW_PACKAGE_PREFIX}-glew"
-         "${MINGW_PACKAGE_PREFIX}-hdf5"
          "${MINGW_PACKAGE_PREFIX}-jsoncpp"
          "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo"
          "${MINGW_PACKAGE_PREFIX}-libogg"
diff --git a/mingw-w64-pdal/PKGBUILD b/mingw-w64-pdal/PKGBUILD
index 87c8e60c8f531..bfa23be3fda86 100644
--- a/mingw-w64-pdal/PKGBUILD
+++ b/mingw-w64-pdal/PKGBUILD
@@ -4,7 +4,7 @@ _realname=pdal
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.7.1
-pkgrel=2
+pkgrel=1
 pkgdesc="A C++ library for translating and manipulating point cloud data (mingw-w64)"
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
diff --git a/mingw-w64-python-h5py/PKGBUILD b/mingw-w64-python-h5py/PKGBUILD
index cf6660bb42d81..87a8c77710a4d 100644
--- a/mingw-w64-python-h5py/PKGBUILD
+++ b/mingw-w64-python-h5py/PKGBUILD
@@ -7,7 +7,7 @@ provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.10.0
-pkgrel=3
+pkgrel=2
 pkgdesc="General-purpose Python bindings for the HDF5 library (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
diff --git a/mingw-w64-qgis/PKGBUILD b/mingw-w64-qgis/PKGBUILD
index b2455a2581116..b92ef5e4b0eba 100644
--- a/mingw-w64-qgis/PKGBUILD
+++ b/mingw-w64-qgis/PKGBUILD
@@ -4,7 +4,7 @@ _realname=qgis
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=3.36.2
-pkgrel=2
+pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
diff --git a/mingw-w64-seacas/PKGBUILD b/mingw-w64-seacas/PKGBUILD
index 4c0901cccc22e..52d2f555dd10c 100644
--- a/mingw-w64-seacas/PKGBUILD
+++ b/mingw-w64-seacas/PKGBUILD
@@ -5,13 +5,10 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2024.04.03
 _releases=${pkgver//./-}
-pkgrel=2
+pkgrel=1
 pkgdesc="The Sandia Engineering Analysis Code Access System (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
-url="https://gsjaardema.github.io/seacas/"
-msys2_repository_url="https://github.com/sandialabs/seacas"
-license=('spdx:BSD-3-Clause')
 conflicts=("${MINGW_PACKAGE_PREFIX}-libexodus")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-hdf5"
@@ -24,17 +21,19 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-python")
-source=("https://github.com/sandialabs/seacas/archive/v${_releases}/${_realname}-${pkgver}.tar.gz"
+url="https://gsjaardema.github.io/seacas/"
+license=('spdx:BSD-3-Clause')
+source=("https://github.com/gsjaardema/seacas/archive/v${_releases}.tar.gz"
         "0001-cmake-add-libs.patch"
         "0002-cmake-findHDF5.patch")
 sha256sums=('EDF1AACBDE87212B10737D3037107DBA5CF7E2CCE167863E2EBB200DC1A3FBB5'
             'a3561756bfdeb942fc62add0aefa542b0e689b76a7f0d2d357e299465ee344d2'
             '09c4406d57c5ca18b0d2f16161dd6f5e2c5d56f0f73e83bd77272d876569d5cc')
-noextract=(${_realname}-${pkgver}.tar.gz)
+noextract=(v${_releases}.tar.gz)
 
 prepare() {
-  plain "Extract ${_realname}-${pkgver}.tar.gz"
-  tar -xzf ${_realname}-${pkgver}.tar.gz || true
+  plain "Extract v${_releases}.tar.gz"
+  tar -xzf v${_releases}.tar.gz || true
 
   cd "${srcdir}/${_realname}-${_releases}"
   patch -p1 -i "${srcdir}/0001-cmake-add-libs.patch"
diff --git a/mingw-w64-starpu/PKGBUILD b/mingw-w64-starpu/PKGBUILD
index 00e46da290ef6..f6f882d8d2a84 100644
--- a/mingw-w64-starpu/PKGBUILD
+++ b/mingw-w64-starpu/PKGBUILD
@@ -4,7 +4,7 @@ _realname=starpu
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.4.5
-pkgrel=3
+pkgrel=2
 pkgdesc='StarPU is a task programming library for hybrid architectures (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
diff --git a/mingw-w64-trilinos/PKGBUILD b/mingw-w64-trilinos/PKGBUILD
index 46c860aa0c083..039c4acce7310 100644
--- a/mingw-w64-trilinos/PKGBUILD
+++ b/mingw-w64-trilinos/PKGBUILD
@@ -10,7 +10,7 @@ pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=15.1.1
 _pkgver=${pkgver//./-}
-pkgrel=3
+pkgrel=1
 pkgdesc='Algorithms for the solution of large-scale scientific problems" (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
@@ -21,13 +21,13 @@ depends=("${MINGW_PACKAGE_PREFIX}-python"
          "${MINGW_PACKAGE_PREFIX}-openblas"
          "${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-netcdf"
-         "${MINGW_PACKAGE_PREFIX}-matio")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-cmake"
+         "${MINGW_PACKAGE_PREFIX}-matio"
+         "${MINGW_PACKAGE_PREFIX}-hdf5"
+         "${MINGW_PACKAGE_PREFIX}-msmpi")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-perl"
              "${MINGW_PACKAGE_PREFIX}-fc"
-             "${MINGW_PACKAGE_PREFIX}-msmpi"
              "${MINGW_PACKAGE_PREFIX}-bc"
              "${MINGW_PACKAGE_PREFIX}-python-numpy"
              "unzip")
@@ -73,9 +73,7 @@ build() {
 
 package() {
   cd "${srcdir}/build-${MSYSTEM}"
-
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
-
   install -Dm644 "${srcdir}"/Trilinos-${_realname}-release-${_pkgver}/LICENSE "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
 
   # Remove conflict with seacas package
diff --git a/mingw-w64-vigra/PKGBUILD b/mingw-w64-vigra/PKGBUILD
index 460058be4bae0..a48d93af8ee7a 100644
--- a/mingw-w64-vigra/PKGBUILD
+++ b/mingw-w64-vigra/PKGBUILD
@@ -5,12 +5,11 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.11.1
 _pkgver=${pkgver//./-}
-pkgrel=14
+pkgrel=13
 pkgdesc="vigra - Generic Programming for Computer Vision (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64')
 url='https://ukoethe.github.io/vigra/'
-msys2_repository_url="https://github.com/ukoethe/vigra"
 license=('spdx:X11')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-boost"
@@ -27,7 +26,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-doxygen"
              "${MINGW_PACKAGE_PREFIX}-python-nose"
              "${MINGW_PACKAGE_PREFIX}-python-sphinx")
-source=(https://github.com/ukoethe/vigra/releases/download/Version-${_pkgver}/${_realname}-${pkgver}-src.tar.gz
+source=(${_realname}-${pkgver}.tar.gz::https://github.com/ukoethe/vigra/releases/download/Version-${_pkgver}/${_realname}-${pkgver}-src.tar.gz
         0001-vigra-numpy-detection.patch
         0002-doc-destination.patch
         0003-vigra-cmath-std-namespace.patch
diff --git a/mingw-w64-vtk/PKGBUILD b/mingw-w64-vtk/PKGBUILD
index fa4cc7550b8b3..31610293a6d61 100644
--- a/mingw-w64-vtk/PKGBUILD
+++ b/mingw-w64-vtk/PKGBUILD
@@ -5,7 +5,7 @@ _realname=vtk
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=9.3.0
-pkgrel=9
+pkgrel=8
 pkgdesc="A software system for 3D computer graphics, image processing and visualization (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')