Fix runtime dependencies (12/n)

Author: MehdiChinoune

mingw-w64-adol-c/PKGBUILD

@@ -4,13 +4,13 @@ _realname=adol-c
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.7.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Automatic Differentiation of Algorithms written in C/C++ (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
-depends=("${MINGW_PACKAGE_PREFIX}-boost")
+depends=("${MINGW_PACKAGE_PREFIX}-boost"
+         $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp"))
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp")
              "${MINGW_PACKAGE_PREFIX}-cc")
 license=('EPL')
 url='https://github.com/coin-or/ADOL-C'

mingw-w64-bsdfprocessor/PKGBUILD

@@ -4,20 +4,22 @@ _realname=bsdfprocessor
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 epoch=
 pkgdesc="Application for displaying and editing of BSDF files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
 url='https://github.com/KimuraRyo/BSDFProcessor'
 license=('MPL2')
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-eigen3"
              "${MINGW_PACKAGE_PREFIX}-libbsdf")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-OpenSceneGraph"
-         "${MINGW_PACKAGE_PREFIX}-osgQt")
+         "${MINGW_PACKAGE_PREFIX}-osgQt"
+         $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp"))
 source=(${_realname}-${pkgver}.tar.gz::"https://github.com/KimuraRyo/${_realname}/archive/v${pkgver}.tar.gz"
         'optimisations-CMakeLists.txt.patch')
 sha256sums=('5f9325fa887d275453bddbb18c4b794fe0ce83bb439fa486f687c468bf27c4f4'
@@ -34,11 +36,11 @@ build() {
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake \
-    -G"MSYS Makefiles" \
+    -G"Ninja" \
     -DCMAKE_BUILD_TYPE=Release \
     -DEIGEN3_INCLUDE_DIR=${MINGW_PREFIX}/include/eigen3 \
     -DLIBBSDF_DIR=${MINGW_PREFIX}/include/libbsdf \
-    -DCMAKE_CXX_FLAGS=-std=c++11 \
+    -DCMAKE_CXX_STANDARD=11 \
     ../${_realname}-${pkgver}
 
   cmake --build .

mingw-w64-graphicsmagick/PKGBUILD

@@ -4,7 +4,7 @@ _realname=graphicsmagick
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.3.37
-pkgrel=1
+pkgrel=2
 pkgdesc="An image viewing/manipulation program (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -32,7 +32,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
          "${MINGW_PACKAGE_PREFIX}-xz"
          "${MINGW_PACKAGE_PREFIX}-zlib"
-         "${MINGW_PACKAGE_PREFIX}-zstd")
+         "${MINGW_PACKAGE_PREFIX}-zstd"
+         $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp"))
          #"${MINGW_PACKAGE_PREFIX}-perl"
 optdepends=("${MINGW_PACKAGE_PREFIX}-ghostscript: for Ghostscript support")
 options=('staticlibs' 'strip' 'libtool')
@@ -72,11 +73,10 @@ prepare() {
 }
 
 build() {
+  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+
   export lt_cv_deplibs_check_method='pass_all'
-  cd GraphicsMagick-${pkgver}
-  [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
-  mkdir -p ${srcdir}/build-${MINGW_CHOST}
-  cd ${srcdir}/build-${MINGW_CHOST}
 
   ../GraphicsMagick-${pkgver}/configure \
     --prefix=${MINGW_PREFIX} \
@@ -100,7 +100,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   make -j1 DESTDIR="${pkgdir}" install
   local PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX})
   # fix path references in some files.

mingw-w64-imagemagick/PKGBUILD

@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _basever=7.0.10
 _rc=-11
 pkgver=${_basever}${_rc//-/.} # pkgver doesn't have "," "/", "-" and space.
-pkgrel=6
+pkgrel=7
 pkgdesc="An image viewing/manipulation program (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -49,6 +49,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-xz"
          "${MINGW_PACKAGE_PREFIX}-zlib"
          "${MINGW_PACKAGE_PREFIX}-zstd"
+         $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp")
         )
 optdepends=("${MINGW_PACKAGE_PREFIX}-ghostscript: for Ghostscript support"
             "${MINGW_PACKAGE_PREFIX}-openexr: for OpenEXR support"
@@ -107,8 +108,8 @@ build() {
   [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
   [[ $CARCH = "x86_64" ]] && EXTRAOPTS="" #EXTRAOPTS="--with-gcc-arch=x86-64"
 
-  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
+  [[ -d build-${MSYSTEM} ]] && rm -rf build-${MSYSTEM}
+  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
 
   #--with-lcms2, --with-opencl, --without-ltdl
   ../ImageMagick-${_basever}${_rc}/configure \
@@ -156,7 +157,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
+  cd ${srcdir}/build-${MSYSTEM}
   if check_option "debug" "y"; then
     MAKE_VERBOSE="V=1"
   fi

mingw-w64-libbotan/PKGBUILD

@@ -4,7 +4,7 @@ _realname=libbotan
 pkgbase="mingw-w64-${_realname}"
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.18.2
-pkgrel=1
+pkgrel=2
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url='https://botan.randombit.net/'
@@ -14,7 +14,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-bzip2"
          "${MINGW_PACKAGE_PREFIX}-sqlite3"
          "${MINGW_PACKAGE_PREFIX}-zlib"
-         "${MINGW_PACKAGE_PREFIX}-xz")
+         "${MINGW_PACKAGE_PREFIX}-xz"
+         $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp"))
 makedepends=("${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-python-sphinx"
              "${MINGW_PACKAGE_PREFIX}-python-imagesize"
@@ -46,9 +47,8 @@ prepare() {
 }
 
 build() {
-  rm -rf build-${MINGW_CHOST}
-  cp -rf Botan-${pkgver} build-${MINGW_CHOST}
-  cd build-${MINGW_CHOST}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  cp -rf "${srcdir}"/Botan-${pkgver} "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   local BUILD_TYPE_FLAGS=''
   if check_option 'debug' 'y'; then
@@ -80,12 +80,12 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   ./botan-test
 }
 
 package() {
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--libdir=;--bindir=" \
   DESTDIR="${pkgdir}" \
   make install

mingw-w64-libosmscout/PKGBUILD

@@ -4,7 +4,7 @@ _realname=libosmscout
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A Library for offline map rendering, routing and location lookup based on OpenStreetMap data"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -24,7 +24,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-cairo"
          "${MINGW_PACKAGE_PREFIX}-qt5-declarative"
          "${MINGW_PACKAGE_PREFIX}-qt5-svg"
          "${MINGW_PACKAGE_PREFIX}-qt5-location"
-         "${MINGW_PACKAGE_PREFIX}-zlib")
+         "${MINGW_PACKAGE_PREFIX}-zlib"
+         $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp"))
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
@@ -37,7 +38,7 @@ sha256sums=('d104bffdfee7a056c86ff962865f5b69f3331be242b5d6a2aa4ccf6b04d2bfd5')
 
 build() {
   [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
-  mkdir ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+  mkdir "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   if check_option "debug" "y"; then
     _build_type="Debug"

mingw-w64-libsoxr/PKGBUILD

@@ -4,7 +4,7 @@ _realname=libsoxr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="The SoX Resampler library that aims to give fast and high quality results for any constant resampling ratio (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -13,8 +13,10 @@ license=("LGPL")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
              "git")
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp"))
 source=("git+https://git.code.sf.net/p/soxr/code#commit=945b592b70470e29f917f4de89b4281fbbd540c0"
         "0001-libsoxr-fix-pc-file-installation.patch"
         "0002-libsoxr-fix-documentation-installation.patch"
@@ -32,55 +34,55 @@ prepare() {
 
 build() {
   # Build shared
-  [[ -d "build-${MINGW_CHOST}-shared" ]] && rm -rf "build-${MINGW_CHOST}-shared"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-shared"
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
+  [[ -d "build-${MSYSTEM}-shared" ]] && rm -rf "build-${MSYSTEM}-shared"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
-  -G"MSYS Makefiles" \
+  ${MINGW_PREFIX}/bin/cmake -Wno-dev \
+  -G"Ninja" \
   -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
   -DCMAKE_BUILD_TYPE=Release \
   -DBUILD_EXAMPLES=OFF \
+  -DBUILD_TESTS=OFF \
   -DBUILD_SHARED_LIBS=ON \
   -DWITH_AVFFT=OFF \
   -DWITH_LSR_BINDINGS=ON \
   -DWITH_OPENMP=ON \
   -DWITH_PFFFT=ON \
   ../code
-  
-  make
-  
+
+  ${MINGW_PREFIX}/bin/cmake --build .
+
   # Build static
-  [[ -d "build-${MINGW_CHOST}-static" ]] && rm -rf "build-${MINGW_CHOST}-static"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}-static"
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
+  [[ -d "build-${MSYSTEM}-static" ]] && rm -rf "build-${MSYSTEM}-static"
+  mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
-  ${MINGW_PREFIX}/bin/cmake \
-  -G"MSYS Makefiles" \
+  ${MINGW_PREFIX}/bin/cmake -Wno-dev \
+  -G"Ninja" \
   -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
   -DCMAKE_BUILD_TYPE=Release \
   -DBUILD_EXAMPLES=OFF \
+  -DBUILD_TESTS=OFF \
   -DBUILD_SHARED_LIBS=OFF \
   -DWITH_AVFFT=OFF \
   -DWITH_LSR_BINDINGS=ON \
   -DWITH_OPENMP=ON \
   -DWITH_PFFFT=ON \
   ../code
-  
-  make
+
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
   # Install shared
-  cd "${srcdir}/build-${MINGW_CHOST}-shared"
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build-${MSYSTEM}-static"
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
 
   # Install static
-  cd "${srcdir}/build-${MINGW_CHOST}-static"
-  make DESTDIR=${pkgdir} install
-  
+  cd "${srcdir}/build-${MSYSTEM}-shared"
+  DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install .
+
   # License
   install -Dm644 ${srcdir}/code/LICENCE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
   install -Dm644 ${srcdir}/code/COPYING.LGPL ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/

mingw-w64-ngspice/PKGBUILD

@@ -12,7 +12,7 @@ _realname=ngspice
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=35
-pkgrel=2
+pkgrel=3
 pkgdesc="Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Cider1b1, and Xspice (mingw-w64)"
 url='https://ngspice.sourceforge.io/'
 license=('BSD')
@@ -23,6 +23,7 @@ conflicts=(${MINGW_PACKAGE_PREFIX}-${_realname}-git)
 replaces=(${MINGW_PACKAGE_PREFIX}-${_realname}-git)
 depends=(
   "${MINGW_PACKAGE_PREFIX}-gcc-libs"
+  $([[ ${MINGW_PACKAGE_PREFIX} != *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-openmp")
 )
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-autotools"
@@ -46,8 +47,8 @@ prepare() {
 }
 
 build() {
-  [[ -d "${srcdir}/build-shared-${CARCH}" ]] && rm -rf "${srcdir}/build-shared-${CARCH}"
-  mkdir -p "${srcdir}/build-shared-${CARCH}" && cd "${srcdir}/build-shared-${CARCH}"
+  [[ -d "${srcdir}/build-shared-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-shared-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-shared-${MSYSTEM}" && cd "${srcdir}/build-shared-${MSYSTEM}"
 
   # FS#45230, create so lib
   # shared lib sets flags and modifies headers, needs dedicated pass
@@ -67,8 +68,8 @@ build() {
   make
 
   cd "${srcdir}/${_realname}-${pkgver}"
-  [[ -d "${srcdir}/build-static-${CARCH}" ]] && rm -rf "${srcdir}/build-static-${CARCH}"
-  mkdir -p "${srcdir}/build-static-${CARCH}" && cd "${srcdir}/build-static-${CARCH}"
+  [[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}"
+  mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}"
 
   # gcc is being weird
   LDFLAGS+=" -lgdi32"
@@ -85,10 +86,10 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/build-static-${CARCH}"
+  cd "${srcdir}/build-static-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
-  cd "${srcdir}/build-shared-${CARCH}"
+  cd "${srcdir}/build-shared-${MSYSTEM}"
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"