drop 32-bit from some relatively large packages

Package size > 10 MiB

mingw-w64-avr-binutils/PKGBUILD

@@ -9,7 +9,7 @@ pkgver=2.41
 pkgrel=2
 pkgdesc='GNU Binutils for the AVR target (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64' 'mingw32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('spdx:GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-3.0-or-later AND LGPL-2.0-or-later')
 url='https://www.gnu.org/software/binutils/binutils.html'
 groups=("${MINGW_PACKAGE_PREFIX}-${_target}-toolchain")
@@ -30,7 +30,6 @@ prepare() {
 }
 
 build() {
-    [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
     mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
     ../${_realname}-${pkgver}/configure \

mingw-w64-avr-gcc/PKGBUILD

@@ -9,10 +9,9 @@ pkgver=12.2.0
 pkgrel=1
 pkgdesc='GNU compiler collection for AVR 8-bit and 32-bit microcontrollers (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw64' 'ucrt64' 'clang64' 'mingw32')
-license=('GPL')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='https://www.gnu.org/software/gcc/gcc.html'
-options=(!strip)
+license=('spdx:GPL-3.0-or-later')
 groups=("${MINGW_PACKAGE_PREFIX}-${_target}-toolchain")
 depends=("${MINGW_PACKAGE_PREFIX}-${_target}-binutils"
          "${MINGW_PACKAGE_PREFIX}-gmp"
@@ -23,6 +22,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-${_target}-binutils"
          "${MINGW_PACKAGE_PREFIX}-libwinpthread-git"
          "${MINGW_PACKAGE_PREFIX}-zstd")
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc")
+options=(!strip)
 source=(https://ftp.gnu.org/gnu/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.xz{,.sig})
 sha256sums=('e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff'
             'SKIP')
@@ -32,7 +32,6 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9  # bpiotrowski@archlinux.
               D3A93CAD751C2AF4F8C7AD516C35B99309B5FA62) # Jakub Jelinek <[email protected]>
 
 build() {
-    [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
     mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
     if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then

mingw-w64-cppreference-qt/PKGBUILD

@@ -7,9 +7,10 @@ pkgver=20230810
 pkgrel=1
 pkgdesc="A complete reference for the features in the C++ Standard Library, for qt help (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://en.cppreference.com/"
-license=('CCPL:cc-by-sa')
+msys2_repository_url="https://github.com/PeterFeicht/cppreference-doc"
+license=('spdx:CC-BY-3.0')
 source=("https://github.com/PeterFeicht/cppreference-doc/releases/download/v${pkgver}/qch-book-${pkgver}.tar.xz")
 sha256sums=('b992b1fa8152186370c85af90a4422cd7ecab41ebee9b6a00891bbe2a42be965')
 

mingw-w64-flecs/PKGBUILD

@@ -8,27 +8,33 @@ pkgver=3.2.10
 pkgrel=1
 pkgdesc="A fast entity component system (ECS) for C & C++ (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/SanderMertens/flecs"
-license=('MIT')
+license=('spdx:MIT')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-graphviz"
              "${MINGW_PACKAGE_PREFIX}-doxygen")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-source=("${_realname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
+source=("${url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('b799e85d47b3e5c2e631ebbd3b81cc6af4be574fccbe07099c58252182827a88')
 
 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   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} \
-    -DCMAKE_BUILD_TYPE=Release \
+    "${_extra_config[@]}" \
     ../${_realname}-${pkgver}
 
   ${MINGW_PREFIX}/bin/cmake.exe --build .

mingw-w64-jsonnet/PKGBUILD

@@ -12,12 +12,12 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/google/jsonnet"
 license=('spdx:Apache-2.0')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
-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}-nlohmann-json"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools")
-options=('staticlibs' '!strip' '!buildflags')
+options=('!strip' '!buildflags')
 source=("${_realname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
         '001-jsonnet-0.20.0-cxx17.patch'
         '002-jsonnet-0.20.0-include-nlohmann-json.patch'
@@ -57,8 +57,6 @@ prepare() {
 }
 
 build() {
-  msg "Build for ${MSYSTEM}"
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
@@ -72,7 +70,7 @@ build() {
 
   "${MINGW_PREFIX}"/bin/cmake --build ./
 
-  msg "Python build for ${MSYSTEM}"
+  msg "Python build"
   cd "${srcdir}/python-build-${MSYSTEM}"
 
   export CFLAGS="$CFLAGS -fPIC"

mingw-w64-julia/PKGBUILD

@@ -31,25 +31,21 @@ _rc=
 _sourcedir=${_realname}-${pkgver}${_rc}
 pkgdesc="High-level, high-performance, dynamic programming language for technical computing (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw64' 'mingw32')
+mingw_arch=('mingw64')
 url="https://julialang.org/"
-license=('MIT')
-depends=("p7zip"
-         "${MINGW_PACKAGE_PREFIX}-gcc-libs"
+license=('spdx:MIT')
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-suitesparse"
          "${MINGW_PACKAGE_PREFIX}-lapack"
          "${MINGW_PACKAGE_PREFIX}-openblas"
-         "${MINGW_PACKAGE_PREFIX}-libunwind")
-makedepends=("patch"
-             "make"
-             "tar"
-             "${MINGW_PACKAGE_PREFIX}-gcc-fortran"
+         "${MINGW_PACKAGE_PREFIX}-libunwind"
+         "p7zip")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-fc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-gmp"
              "${MINGW_PACKAGE_PREFIX}-diffutils"
-             "${MINGW_PACKAGE_PREFIX}-python"
-             "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-cc"
-             "perl")
+             "${MINGW_PACKAGE_PREFIX}-python")
 source=(${_sourcedir}.tar.gz::https://github.com/JuliaLang/julia/releases/download/v${pkgver}/${_realname}-${pkgver}${_rc}.tar.gz
         003-1.1.1-msys2-fix-CMAKE_GENERATOR_COMMAND-and-CMAKE_C_COMPILER.patch
         004-1.1.1-msys2-fix-base-floatfuncs.jl.patch
@@ -139,12 +135,12 @@ prepare() {
     017-1.4.1-backport-1.4.2-Add-GCC10-to-GCC-version-mappings-35849.patch \
     018-1.4.1-llvm-8.0.1-D64937-gcc10.patch
 
-  [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
+  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
   msg2 "directory copy starting"
-  cp -rp  "${srcdir}/${_sourcedir}/." "${srcdir}/build-${MINGW_CHOST}"
+  cp -rp  "${srcdir}/${_sourcedir}/." "${srcdir}/build-${MSYSTEM}"
   msg2 "directory copy finished"
 
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
   _make_user_config; # create Make.user in current directory
   if [[ "$_show_log_lockup_info" == "1" ]]; then
     tty
@@ -168,15 +164,7 @@ build() {
     msg2 "build started"
   fi
 
-  cd "${srcdir}/build-${MINGW_CHOST}"
-
-  # Per distributing.md CPUs older than Pentium 4 are not supported.
-  case "${CARCH}" in
-    i686)
-      export CFLAGS="-march=pentium4"
-      export CXXFLAGS="-march=pentium4"
-    ;;
-  esac
+  cd "${srcdir}/build-${MSYSTEM}"
 
   # option "-w" disables all warnings
   env CFLAGS="$CFLAGS -w" CXXFLAGS="$CXXFLAGS -w" \
@@ -191,11 +179,11 @@ build() {
 check() {
   msg2 "check started"
 
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   cd test
   make print-TESTS # list the tests
-  env PATH="${srcdir}/build-${MINGW_CHOST}/usr/bin:$PATH" \
+  env PATH="${srcdir}/build-${MSYSTEM}/usr/bin:$PATH" \
     ../usr/bin/julia --check-bounds=yes --startup-file=no ./runtests.jl all --skip Sockets --skip Distributed --skip LibGit2/libgit2 --skip FileWatching --skip file
   find ../stdlib \( -name \*.cov -o -name \*.mem \) -delete
   rm -r depot/compiled
@@ -208,7 +196,7 @@ check() {
 package_julia() {
   backup=("${MINGW_PREFIX:1}"/etc/julia/startup.jl)
 
-  cd "${srcdir}/build-${MINGW_CHOST}"
+  cd "${srcdir}/build-${MSYSTEM}"
 
   make DESTDIR="${pkgdir}" install \
     prefix=${MINGW_PREFIX}

mingw-w64-mecab-naist-jdic/PKGBUILD

@@ -7,9 +7,9 @@ pkgver=0.6.3b_20111013
 pkgrel=2
 pkgdesc="NAIST Japanese Dictionary (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://osdn.net/projects/naist-jdic/"
-license=('BSD')
+license=('spdx:BSD-3-Clause-Clear')
 source=("http://ja.osdn.net/projects/naist-jdic/downloads/53500/mecab-naist-jdic-${pkgver//_/-}.tar.gz"
         01-prefix.patch)
 depends=("${MINGW_PACKAGE_PREFIX}-mecab")

mingw-w64-mecab/PKGBUILD

@@ -7,21 +7,20 @@ pkgver=0.996
 pkgrel=6
 pkgdesc="Yet another Japanese morphological analyzer (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://taku910.github.io/mecab/"
-license=('GPL2' 'LGPL2' 'BSD') # licensed under triple lincense
-options=('strip' 'staticlibs')
+license=('spdx:GPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-3-Clause-Clear') # licensed under triple lincense
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools")
+depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
+         "${MINGW_PACKAGE_PREFIX}-libiconv")
+install=${_realname}-${MSYSTEM}.install
 source=("https://deb.debian.org/debian/pool/main/m/mecab/mecab_0.996.orig.tar.gz"
         "mecab-0.996.diff"
         "mecab-0.996-iconv.patch"
         "mecab-0.996-naist-jdic.patch"
         "0001-dont-ignore-flags.patch"
         "0002-fix-stdcall.patch")
-install=${_realname}-${MSYSTEM}.install
-makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
-             "${MINGW_PACKAGE_PREFIX}-autotools")
-depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
-         "${MINGW_PACKAGE_PREFIX}-libiconv")
 sha256sums=('e073325783135b72e666145c781bb48fada583d5224fb2490fb6c1403ba69c59'
             '88a56efae57e30ffcc1b117fe152f37dd7bc419368b1d0e422d5b62245dd2d5c'
             '2dff2b3ae7faec432885a804210d55e2ed68b1af03c138e8297e0c510ef48bdf'
@@ -45,7 +44,6 @@ prepare() {
 }
 
 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
   mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
 
   CXXFLAGS+=" -std=c++11"

mingw-w64-oce/PKGBUILD

@@ -5,11 +5,14 @@ pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
 pkgver=0.18.3
 pkgrel=7
-pkgdesc="Open CASCADE Community Edition: patches/improvements/experiments contributed by users over the official Open CASCADE library."
-url="https://github.com/tpaviot/oce"
+pkgdesc="Open CASCADE Community Edition: patches/improvements/experiments contributed by users over the official Open CASCADE library. (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-license=('LGPLv2.1')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/tpaviot/oce"
+msys2_references=(
+  'aur: oce'
+)
+license=('spdx:LGPL-2.1-or-later')
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-opencascade")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-cc")
 depends=("${MINGW_PACKAGE_PREFIX}-freetype")
@@ -30,8 +33,14 @@ prepare() {
 }
 
 build() {
-  [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}"
-  mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}"
+  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
 
   #flags="$flags -DOCE_MULTITHREAD_LIBRARY:STRING=TBB"
   #flags="$flags -DOCE_WITH_GL2PS=ON"
@@ -55,14 +64,16 @@ build() {
       -DCMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES=1 \
       -DCMAKE_C_RESPONSE_FILE_LINK_FLAG=@ \
       -DCMAKE_CXX_RESPONSE_FILE_LINK_FLAG=@ \
+      "${_extra_config[@]}" \
       ../oce-OCE-${pkgver}
 
-  make
+  ${MINGW_PREFIX}/bin/cmake --build .
 }
 
 package() {
-  cd build-${MINGW_CHOST}
-  make DESTDIR="${pkgdir}" install
+  cd build-${MSYSTEM}
+  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
+
   install -Dm644 ${srcdir}/oce-OCE-${pkgver}/LICENSE_LGPL_21.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE_LGPL_21.txt"
   install -Dm644 ${srcdir}/oce-OCE-${pkgver}/OCCT_LGPL_EXCEPTION.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/OCCT_LGPL_EXCEPTION.txt"