fish: drop clang32

fish/PKGBUILD

@@ -1,6 +1,8 @@
+
+
 pkgname=fish
 pkgver=3.7.1
-pkgrel=2
+pkgrel=3
 epoch=
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64')
@@ -9,8 +11,7 @@ msys2_repository_url="https://github.com/fish-shell/fish-shell"
 msys2_references=(
   "cpe: cpe:/a:fishshell:fish"
 )
-license=('GPL2')
-groups=()
+license=('spdx:GPL-2.0-only')
 depends=('gcc-libs' 'gettext' 'libpcre2_16' 'man-db' 'ncurses')
 makedepends=('gcc' 'gettext-devel' 'intltool' 'ncurses-devel' 'pcre2-devel' 'cmake')
 optdepends=('python: for manual page completion parser and web configuration tool')
@@ -21,21 +22,17 @@ source=("https://github.com/fish-shell/fish-shell/releases/download/${pkgver}/${
         msys2.fish
         msystem.fish
         perlbin.fish)
-sha512sums=('f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe'
+sha256sums=('614c9f5643cd0799df391395fa6bbc3649427bb839722ce3b114d3bbc1a3b250'
             'SKIP'
-            '817195e2a6cdec1791b96666ee95f87f76569048268645a947f9283f711906fd3f2f5f1a4908b2b1edc0b9742215e0ac1c1cdaf10f9ec50d38b115fc05ae44b7'
-            '81d0a0b436a5a9dd2973e0de932833605c9f3fc57cc71ba32a15856e29b5192fa8ab450bb17d6f53636c8724327901a2d8ecd72fecb4afe120c258dcc581129d'
-            '64777bf41ba576506d45ffe4a5d7b5c47a026f519678f71ef1b08a7fad3d678faac23f3a695cea2869743bbbea85a26c97c11df5de6eb91c65304d5e43671201'
-            'a675062ebaf7da53845ba3a005d9f4b90c514c7eea2ead0f16592246925a00862afe7fd7326a86006f8d6077e02c3c37a87358105d4bb661001161bfd1788724')
+            '983c3273e0249957ed6c40785e005739da30f31d4f029383f257f9990d38811a'
+            '8bb0d28df47b66e6785f7db00a2c4316bc15960e67bdec0daca7f811f5bf3895'
+            'b1a7b7b4238170373dd8acdc36bcbd1fc3978b3525403b877576139d6090e30d'
+            'b136a9fa94abf53e302f7a1cc28def03b58dd2326990c5f02ceb4988341a5ac6')
 validpgpkeys=('003837986104878835FA516D7A67D962D88A709A') # David Adam <zanchey@gmail.com>
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   export CXXFLAGS+=" ${CPPFLAGS}"
   cmake \
     -B build \
@@ -43,13 +40,16 @@ build() {
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
     -DCMAKE_BUILD_TYPE=None \
     -Wno-dev
+
   make -C build VERBOSE=1
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}/build"
+
   rm -rf "${srcdir}/${pkgname}-${pkgver}/build/user_doc"
   make DESTDIR="${pkgdir}" install
+
   install -D -m644 "${srcdir}/config.fish" "${pkgdir}/etc/fish/config.fish"
   install -D -m644 "${srcdir}/msys2.fish" "${pkgdir}/etc/fish/msys2.fish"
   install -D -m644 "${srcdir}/msystem.fish" "${pkgdir}/etc/fish/msystem.fish"

fish/msys2.fish

@@ -56,12 +56,6 @@ case MINGW64
   set -x PKG_CONFIG_PATH "$MINGW_MOUNT_POINT/lib/pkgconfig:$MINGW_MOUNT_POINT/share/pkgconfig"
   set ACLOCAL_PATH "$MINGW_MOUNT_POINT/share/aclocal:/usr/share/aclocal"
   set -x MANPATH $MINGW_MOUNT_POINT/local/man $MINGW_MOUNT_POINT/share/man $MANPATH
-case CLANG32
-  set MINGW_MOUNT_POINT $MINGW_PREFIX
-  set -x PATH $MINGW_MOUNT_POINT/bin $MSYS2_PATH $ORIGINAL_PATH 2>/dev/null
-  set -x PKG_CONFIG_PATH "$MINGW_MOUNT_POINT/lib/pkgconfig:$MINGW_MOUNT_POINT/share/pkgconfig"
-  set ACLOCAL_PATH "$MINGW_MOUNT_POINT/share/aclocal:/usr/share/aclocal"
-  set -x MANPATH $MINGW_MOUNT_POINT/local/man $MINGW_MOUNT_POINT/share/man $MANPATH
 case CLANG64
   set MINGW_MOUNT_POINT $MINGW_PREFIX
   set -x PATH $MINGW_MOUNT_POINT/bin $MSYS2_PATH $ORIGINAL_PATH 2>/dev/null

fish/msystem.fish

@@ -27,13 +27,6 @@ switch $MSYSTEM
     set -x MINGW_CHOST "$MSYSTEM_CHOST"
     set -x MINGW_PREFIX "$MSYSTEM_PREFIX"
     set -x MINGW_PACKAGE_PREFIX "mingw-w64-$MSYSTEM_CARCH"
-  case CLANG32
-    set -x MSYSTEM_PREFIX '/clang32'
-    set -x MSYSTEM_CARCH 'i686'
-    set -x MSYSTEM_CHOST 'i686-w64-mingw32'
-    set -x MINGW_CHOST "$MSYSTEM_CHOST"
-    set -x MINGW_PREFIX "$MSYSTEM_PREFIX"
-    set -x MINGW_PACKAGE_PREFIX "mingw-w64-clang-$MSYSTEM_CARCH"
   case CLANG64
     set -x MSYSTEM_PREFIX '/clang64'
     set -x MSYSTEM_CARCH 'x86_64'