diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD index 90f60975..7b60386e 100644 --- a/filesystem/PKGBUILD +++ b/filesystem/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Alethea Rose pkgname=filesystem -pkgver=2023.02.07 -pkgrel=3 +pkgver=2024.12.18 +pkgrel=1 pkgdesc='Base filesystem' arch=('i686' 'x86_64') license=('spdx:BSD-3-Clause') @@ -31,7 +31,6 @@ source=('bash.bash_logout' 'msys2.ico' 'ucrt64.ico' 'clang64.ico' - 'clang32.ico' 'clangarm64.ico' 'msys2_shell.cmd' 'msystem' @@ -65,16 +64,15 @@ sha256sums=('742a7d66b7a5ebd2b8461728c5b44a46b2305fd2116208eecae5f45828938ea0' '793b9450a1a59a6c294e51fd0c2a47090d68c68ff2f33a25a11b45f6408c3917' '733e97cbb823773e1a08a91a41035a7692bc0ff270d3c894224911b4b091db44' '56d4080c15dff89a6263f3d5f9aa68849b2062179cabd6d78edfe0e3af6bf64a' - '58f7431d7d8d9d09ebd3185c090404682d760bf18c27f94085007b037a5889bd' '3b7af99516768485383b34d606749e6f98a250372a8191bc8d3a962d66bdfe35' - '390b7471838d14fd41f97f49616dc444454ebc90aea1da54a20799720d4f3772' - '5f7aa3a776dbdaae78a27e608bf004bf50d5aaace2c2b03581d940b771bc8582' + '0b21f70be5adddc1e0614b46d5ce694ae98c6bd1e4165953776c3f7a7793c370' + 'b0a722f7a4096f8d9a572bf6f530b53d39f2a94b4d0e1ed3f70f26ce7469bbea' '91f1f918cf13deab0124082086e990786113b0e710dbda4678d8fc14905ad94d' 'b8abe6231cd2b089d708d3e3097ef8c279af1e1594aa15c6eaab4150ed9dffdc' '6c0ca979c7b146b3750103b1296a399764f4e1b222ee091d3aa072b6da16c1a5' 'cbec90c9403826bf6d8dd1fed16240b9d8695ec15df5dcdab7e485bb46c016ab' 'a2ec65de2adb0277f51001463c1a0759f8a5bc35cf2f213fa26ee73df52c5280' - 'ad9873e18169ca87194af3413bdcbda536d9600b4f7d24fa9f7d59928309ff4a' + '14a23772ffb216d34a18012d42d6ec5edf3c3cfb6162bc46d390624a69092ae6' 'f63241cc56aa7b7ec6962d19991d211b4e1641b78ba5226835118ab493830a8b' 'e96c1f54ffff792e738aa032815c82c30821b0683806e5ed0ba2a759db2fd494' '3a4d629d72ab8ac58427097c3a8915c4e8186f819cd369c2da5eca955d08fceb' @@ -128,7 +126,6 @@ package() { install -m644 ${srcdir}/mingw64.ico mingw64.ico install -m644 ${srcdir}/ucrt64.ico ucrt64.ico install -m644 ${srcdir}/clang64.ico clang64.ico - install -m644 ${srcdir}/clang32.ico clang32.ico install -m644 ${srcdir}/clangarm64.ico clangarm64.ico install -m644 ${srcdir}/msys2.ico msys2.ico install -m755 ${srcdir}/msys2_shell.cmd msys2_shell.cmd @@ -161,7 +158,7 @@ package() { install -D -m644 ${srcdir}/redirect-config.site usr/local/etc/config.site # setup /mingw hierarchies - for m in mingw32 mingw64 clang32 clang64 clangarm64 ucrt64; do + for m in mingw32 mingw64 clang64 clangarm64 ucrt64; do install -d -m755 ${m} for d in bin etc include lib share; do install -d -m755 ${m}/${d} diff --git a/filesystem/clang32.ico b/filesystem/clang32.ico deleted file mode 100644 index 39039bab..00000000 Binary files a/filesystem/clang32.ico and /dev/null differ diff --git a/filesystem/msys2_shell.cmd b/filesystem/msys2_shell.cmd index a1608617..c9f4d3c2 100644 --- a/filesystem/msys2_shell.cmd +++ b/filesystem/msys2_shell.cmd @@ -41,7 +41,6 @@ if "x%~1" == "x-mingw32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW3 if "x%~1" == "x-mingw64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=MINGW64& goto :checkparams if "x%~1" == "x-ucrt64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=UCRT64& goto :checkparams if "x%~1" == "x-clang64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANG64& goto :checkparams -if "x%~1" == "x-clang32" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANG32& goto :checkparams if "x%~1" == "x-clangarm64" shift& set /a msys2_shiftCounter+=1& set MSYSTEM=CLANGARM64& goto :checkparams if "x%~1" == "x-mingw" shift& set /a msys2_shiftCounter+=1& (if exist "%WD%..\..\mingw64" (set MSYSTEM=MINGW64) else (set MSYSTEM=MINGW32))& goto :checkparams rem Console types @@ -110,9 +109,6 @@ if "%MSYSTEM%" == "MINGW32" ( ) else if "%MSYSTEM%" == "CLANG64" ( set "CONTITLE=MinGW Clang x64" set "CONICON=clang64.ico" -) else if "%MSYSTEM%" == "CLANG32" ( - set "CONTITLE=MinGW Clang x32" - set "CONICON=clang32.ico" ) else if "%MSYSTEM%" == "CLANGARM64" ( set "CONTITLE=MinGW Clang ARM64" set "CONICON=clangarm64.ico" @@ -206,7 +202,7 @@ echo Usage: echo %~1 [options] [login shell parameters] echo. echo Options: -echo -mingw32 ^| -mingw64 ^| -ucrt64 ^| -clang32 ^| -clang64 ^| +echo -mingw32 ^| -mingw64 ^| -ucrt64 ^| -clang64 ^| echo -msys[2] ^| -clangarm64 Set shell type echo -defterm ^| -mintty ^| -conemu Set terminal type echo -here Use current directory as working diff --git a/filesystem/msystem b/filesystem/msystem index cc09f7fd..6bcffd72 100644 --- a/filesystem/msystem +++ b/filesystem/msystem @@ -39,15 +39,6 @@ case "${MSYSTEM}" in MINGW_PACKAGE_PREFIX="mingw-w64-${MSYSTEM_CARCH}" export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX ;; - CLANG32) - MSYSTEM_PREFIX='/clang32' - MSYSTEM_CARCH='i686' - MSYSTEM_CHOST='i686-w64-mingw32' - MINGW_CHOST="${MSYSTEM_CHOST}" - MINGW_PREFIX="${MSYSTEM_PREFIX}" - MINGW_PACKAGE_PREFIX="mingw-w64-clang-${MSYSTEM_CARCH}" - export MSYSTEM_PREFIX MSYSTEM_CARCH MSYSTEM_CHOST MINGW_CHOST MINGW_PREFIX MINGW_PACKAGE_PREFIX - ;; CLANG64) MSYSTEM_PREFIX='/clang64' MSYSTEM_CARCH='x86_64' diff --git a/filesystem/shell b/filesystem/shell index ffb5ca10..2499ab24 100755 --- a/filesystem/shell +++ b/filesystem/shell @@ -36,12 +36,12 @@ fi # Argument validation -if [[ "${BASH_SOURCE}" != "${0}" && ! "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clang32|clangarm64|msys)$ ]]; then +if [[ "${BASH_SOURCE}" != "${0}" && ! "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clangarm64|msys)$ ]]; then echo "Unrecognized shell type ${1}" return 1 fi -if [[ "${BASH_SOURCE}" = "${0}" && "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clang32|clangarm64|msys)$ ]]; then +if [[ "${BASH_SOURCE}" = "${0}" && "${1}" =~ ^(mingw32|mingw64|ucrt64|clang64|clangarm64|msys)$ ]]; then echo "Cannot switch to ${1} shell without sourcing" exit 1 fi @@ -81,7 +81,6 @@ else /mingw64/*) winpty "${@}" || exit ;; /ucrt64/*) winpty "${@}" || exit ;; /clang64/*) winpty "${@}" || exit ;; - /clang32/*) winpty "${@}" || exit ;; /clangarm64/*) winpty "${@}" || exit ;; *) "${@}" || exit ;; esac